decode path params in cache interceptor

Nicolas Dorseuil · Nicolas Dorseuil · commit 13dcdc38a95b · 2025-05-19T10:26:28.000+02:00
diff --git a/.changeset/fast-clouds-shout.md b/.changeset/fast-clouds-shout.md
@@ -0,0 +1,5 @@
+---
+"@opennextjs/aws": patch
+---
+
+decode path params in cache interceptor
diff --git a/packages/open-next/src/core/routing/cacheInterceptor.ts b/packages/open-next/src/core/routing/cacheInterceptor.ts
@@ -129,6 +129,28 @@ async function generateResult(
     },
   };
 }
+/**
+ *
+ * SSG cache key needs to be decoded, but some characters needs to be properly escaped
+ * https://github.com/vercel/next.js/blob/34039551d2e5f611c0abde31a197d9985918adaf/packages/next/src/server/lib/router-utils/decode-path-params.ts#L11-L26
+ */
+function decodePathParams(pathname: string): string {
+  return pathname
+    .split("/")
+    .map((segment) => {
+      try {
+        // https://github.com/vercel/next.js/blob/34039551d2e5f611c0abde31a197d9985918adaf/packages/next/src/shared/lib/router/utils/escape-path-delimiters.ts#L2-L10
+        return decodeURIComponent(segment).replace(
+          /([\/#?]|%(2f|23|3f|5c))/gi,
+          (char: string) => encodeURIComponent(char),
+        );
+      } catch (e) {
+        // If decodeURIComponent fails, we return the original segment
+        return segment;
+      }
+    })
+    .join("/");
+}
 
 export async function cacheInterceptor(
   event: InternalEvent,
@@ -147,6 +169,9 @@ export async function cacheInterceptor(
   // We also need to remove trailing slash
   localizedPath = localizedPath.replace(/\/$/, "");
 
+  // Then we decode the path params
+  localizedPath = decodePathParams(localizedPath);
+
   debug("Checking cache for", localizedPath, PrerenderManifest);
 
   const isISR =

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@opennextjs/aws": patch
 +---
++
 +decode path params in cache interceptor