fix(fresh/plugin-vite): fix staticFiles path encode ([#3657](#3657)),

LY1806620741 · LY1806620741 · commit 671206765f37 · 2025-12-24T12:48:24.000Z
diff --git a/deno.lock b/deno.lock
diff --git a/packages/fresh/src/dev/dev_build_cache.ts b/packages/fresh/src/dev/dev_build_cache.ts
@@ -528,6 +528,23 @@ ${serializedFsRoutes}
 `.replaceAll(/\n[\n]+/g, "\n\n");
 }
 
+export function systemPathToUrlEncoded(systemPath: string) {
+  const normalizedPath = systemPath.replaceAll(WINDOWS_SEPARATOR, "/");
+
+  const pathComponents = normalizedPath.split("/").filter((comp) => comp);
+
+  const encodedComponents = pathComponents.map((comp) =>
+    encodeURIComponent(comp)
+  );
+
+  const encodePath = "/" + encodedComponents.join("/");
+
+  return new URL(
+    encodePath,
+    "http://localhost",
+  ).pathname;
+}
+
 export async function prepareStaticFile(
   item: PendingStaticFile,
   outDir: string,
@@ -536,10 +553,11 @@ export async function prepareStaticFile(
 > {
   const file = await Deno.open(item.filePath);
   const hash = item.hash ? item.hash : await hashContent(file.readable);
-  const url = new URL(item.pathname, "http://localhost");
+  // fix issues[#3657]: system path convert to uri path, only new URL will convert `test %20encodeUri` to `test%20%20encodeUri`
+  const urlEncodePath = systemPathToUrlEncoded(item.pathname);
 
   return {
-    name: url.pathname,
+    name: urlEncodePath,
     hash,
     filePath: path.isAbsolute(item.filePath)
       ? path.relative(outDir, item.filePath)
diff --git a/packages/fresh/src/middlewares/static_files.ts b/packages/fresh/src/middlewares/static_files.ts
@@ -18,7 +18,8 @@ export function staticFiles<T>(): Middleware<T> {
     const buildCache = getBuildCache(ctx);
     if (buildCache === null) return await ctx.next();
 
-    let pathname = decodeURIComponent(url.pathname);
+    // fix issues[#3657]: because build staticFiles use Url encode the path
+    let pathname = url.pathname;
     if (config.basePath) {
       pathname = pathname !== config.basePath
         ? pathname.slice(config.basePath.length)
diff --git a/packages/fresh/src/middlewares/static_files_test.ts b/packages/fresh/src/middlewares/static_files_test.ts
@@ -6,7 +6,10 @@ import { ASSET_CACHE_BUST_KEY } from "../constants.ts";
 import { BUILD_ID } from "@fresh/build-id";
 import type { Command } from "../commands.ts";
 import type { ServerIslandRegistry } from "../context.ts";
-import { getContentType } from "../dev/dev_build_cache.ts";
+import {
+  getContentType,
+  systemPathToUrlEncoded,
+} from "../dev/dev_build_cache.ts";
 
 class MockBuildCache implements BuildCache {
   root = "";
@@ -224,11 +227,25 @@ Deno.test("static files - enables caching in production", async () => {
 });
 
 Deno.test("static files - decoded pathname", async () => {
-  const buildCache = new MockBuildCache({
-    "C#.svg": { content: "body {}", hash: null },
-    "西安市.png": { content: "body {}", hash: null },
-    "인천.avif": { content: "body {}", hash: null },
-  });
+  const fileKeys = [
+    "C#.svg",
+    "西安市.png",
+    "인천.avif",
+    "/开头分隔符",
+    "\\windows\\EndSplit\\",
+  ];
+
+  // Simulate build
+  const entries = await Promise.all(
+    fileKeys.map((key) => {
+      const encodedKey = systemPathToUrlEncoded(key);
+      return [encodedKey, { content: "body {}", hash: null }];
+    }),
+  );
+
+  const buildCache = new MockBuildCache(
+    Object.fromEntries(entries),
+  );
   const server = serveMiddleware(
     staticFiles(),
     { buildCache },
@@ -239,6 +256,8 @@ Deno.test("static files - decoded pathname", async () => {
       "C%23.svg",
       "%E8%A5%BF%E5%AE%89%E5%B8%82.png",
       "%EC%9D%B8%EC%B2%9C.avif",
+      "%E5%BC%80%E5%A4%B4%E5%88%86%E9%9A%94%E7%AC%A6",
+      "windows/EndSplit",
     ]
   ) {
     const res = await server.get("/" + path);
diff --git a/packages/plugin-vite/demo/static/test %20encodeUri/foo %20encodeUri.txt b/packages/plugin-vite/demo/static/test %20encodeUri/foo %20encodeUri.txt
@@ -0,0 +1 @@
+space it works
diff --git a/packages/plugin-vite/demo/static/test %20encodeUri/index.html b/packages/plugin-vite/demo/static/test %20encodeUri/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Document</title>
+  </head>
+  <body>
+    <h1>ok</h1>
+  </body>
+</html>
diff --git a/packages/plugin-vite/src/plugins/dev_server.ts b/packages/plugin-vite/src/plugins/dev_server.ts
@@ -43,8 +43,15 @@ export function devServer(): Plugin[] {
             return next();
           }
 
+          const decodePathName: string = decodeURIComponent(
+            url.pathname.slice(1),
+          );
+
           // Check if it's a static file first
-          const staticFilePath = path.join(publicDir, url.pathname.slice(1));
+          const staticFilePath = path.join(
+            publicDir,
+            decodePathName,
+          );
           try {
             const stat = await Deno.stat(staticFilePath);
             if (stat.isFile) {
@@ -57,7 +64,7 @@ export function devServer(): Plugin[] {
           // Check if it's a static/index.html file
           const staticFilePathIndex = path.join(
             publicDir,
-            url.pathname.slice(1),
+            decodePathName,
             "index.html",
           );
           try {
diff --git a/packages/plugin-vite/tests/build_test.ts b/packages/plugin-vite/tests/build_test.ts
@@ -53,6 +53,13 @@ Deno.test({
         const res = await fetch(`${address}/test_static/foo.txt`);
         const text = await res.text();
         expect(text).toEqual("it works");
+
+        // test space
+        const resWithSpace = await fetch(
+          `${address}/test%20%2520encodeUri/foo%20%2520encodeUri.txt`,
+        );
+        const textWithSpace = await resWithSpace.text();
+        expect(textWithSpace).toEqual("space it works");
       },
     );
   },
@@ -482,6 +489,11 @@ Deno.test({
         const res = await fetch(`${address}/test_static/foo`);
         const text = await res.text();
         expect(text).toContain("<h1>ok</h1>");
+
+        //test encodeUri
+        const resWithSpace = await fetch(`${address}/test%20%2520encodeUri`);
+        const textWithSpace = await resWithSpace.text();
+        expect(textWithSpace).toContain("<h1>ok</h1>");
       },
     );
   },
diff --git a/packages/plugin-vite/tests/dev_server_test.ts b/packages/plugin-vite/tests/dev_server_test.ts
@@ -37,6 +37,13 @@ Deno.test({
     const res = await fetch(`${demoServer.address()}/test_static/foo.txt`);
     const text = await res.text();
     expect(text).toContain("it works");
+
+    // test space
+    const resWithSpace = await fetch(
+      `${demoServer.address()}/test%20%2520encodeUri/foo%20%2520encodeUri.txt`,
+    );
+    const textWithSpace = await resWithSpace.text();
+    expect(textWithSpace).toContain("space it works");
   },
   sanitizeResources: false,
   sanitizeOps: false,
@@ -481,6 +488,12 @@ Deno.test({
     const res = await fetch(`${demoServer.address()}/test_static/foo`);
     const text = await res.text();
     expect(text).toContain("<h1>ok</h1>");
+
+    const resWithSpace = await fetch(
+      `${demoServer.address()}/test%20%2520encodeUri/`,
+    );
+    const textWithSpace = await resWithSpace.text();
+    expect(textWithSpace).toContain("<h1>ok</h1>");
   },
   sanitizeOps: false,
   sanitizeResources: false,
