fix: cache key should use final canonized url

esroyo · Feb 22, 2024 · e4e787d · e4e787d
1 parent a822aab
commit e4e787d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 32 deletions.
diff --git a/src/sjs-request-handler.ts b/src/sjs-request-handler.ts
@@ -25,35 +25,6 @@ export async function sjsRequestHandler(
     const HOMEPAGE = Deno.env.get('HOMEPAGE');
     const OUTPUT_BANNER = Deno.env.get('OUTPUT_BANNER');
     const buildTarget = getBuildTargetFromUA(req.headers.get('user-agent'));
-    if (CACHE) {
-        performance.mark('cache-read');
-        const value = await retrieveCache(denoKv, [
-            req.url,
-            buildTarget,
-        ]);
-        performance.measure('cache-read', 'cache-read');
-        if (value) {
-            performance.measure('cache-hit', { start: performance.now() });
-            const response = await createFinalResponse(
-                {
-                    ...value,
-                    headers: new Headers(value.headers),
-                },
-                performance,
-                buildTarget,
-                false,
-            );
-            if (CACHE_CLIENT_REDIRECT && isRedirect(response.status)) {
-                return createFastPathResponse(
-                    response,
-                    performance,
-                    buildTarget,
-                );
-            }
-            return response;
-        }
-        performance.measure('cache-miss', { start: performance.now() });
-    }
     const selfUrl = new URL(req.url);
     const basePath = `/${BASE_PATH}/`.replace(/\/+/g, '/');
     const upstreamOrigin = `${UPSTREAM_ORIGIN}/`.replace(/\/+$/, '/');
@@ -94,6 +65,36 @@ export async function sjsRequestHandler(
         pair[0],
         typeof pair[1] === 'string' ? replaceOrigin(pair[1]) : pair[1],
     ] as [string, string]);
+    const canonicalUrl = replaceOrigin(req.url);
+    if (CACHE) {
+        performance.mark('cache-read');
+        const value = await retrieveCache(denoKv, [
+            canonicalUrl,
+            buildTarget,
+        ]);
+        performance.measure('cache-read', 'cache-read');
+        if (value) {
+            performance.measure('cache-hit', { start: performance.now() });
+            const response = await createFinalResponse(
+                {
+                    ...value,
+                    headers: new Headers(value.headers),
+                },
+                performance,
+                buildTarget,
+                false,
+            );
+            if (CACHE_CLIENT_REDIRECT && isRedirect(response.status)) {
+                return createFastPathResponse(
+                    response,
+                    performance,
+                    buildTarget,
+                );
+            }
+            return response;
+        }
+        performance.measure('cache-miss', { start: performance.now() });
+    }
     performance.mark('upstream');
     const upstreamResponse = await _internals.fetch(upstreamUrl.toString(), {
         headers: cloneHeaders(req.headers, denyHeaders),
@@ -108,7 +109,7 @@ export async function sjsRequestHandler(
     }
     const response = await createFinalResponse(
         {
-            url: req.url,
+            url: canonicalUrl,
             body,
             headers: cloneHeaders(
                 upstreamResponse.headers,

diff --git a/src/utils.ts b/src/utils.ts
@@ -230,8 +230,6 @@ export const createFastPathResponse = async (
 
     const rebuildedHeaders = cloneHeaders(response.headers);
 
-    rebuildedHeaders.set('x-debug-redirect-cache-miss', JSON.stringify({ redirectLocation, buildTarget }));
-
     performance.clearMeasures('total');
     performance.measure('total', 'total');