fix: ensure clearing of performance is done after response is created

esroyo · Feb 27, 2024 · 2346ab3 · 2346ab3
1 parent 3078dcb
commit 2346ab3
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/src/sjs-request-handler.ts b/src/sjs-request-handler.ts
@@ -16,6 +16,10 @@ export async function sjsRequestHandler(
     req: Request,
 ): Promise<Response> {
     const performance = new ScopedPerformance();
+    const clearPerformance = () => {
+        performance.clearMarks();
+        performance.clearMeasures();
+    };
     performance.mark('total');
     const BASE_PATH = Deno.env.get('BASE_PATH');
     const CACHE = Deno.env.get('CACHE') === 'true';
@@ -29,6 +33,7 @@ export async function sjsRequestHandler(
     const basePath = `/${BASE_PATH}/`.replace(/\/+/g, '/');
     const upstreamOrigin = `${UPSTREAM_ORIGIN}/`.replace(/\/+$/, '/');
     if ([`${basePath}`, '/', ''].includes(selfUrl.pathname)) {
+        clearPerformance();
         return Response.redirect(HOMEPAGE || upstreamOrigin, 302);
     }
     const finalOriginUrl = new URL(req.headers.get('x-real-origin') ?? selfUrl);
@@ -88,12 +93,15 @@ export async function sjsRequestHandler(
                 false,
             );
             if (CACHE_CLIENT_REDIRECT && isRedirect(response.status)) {
-                return createFastPathResponse(
+                const fastResponse = await createFastPathResponse(
                     response,
                     performance,
                     buildTarget,
                 );
+                clearPerformance();
+                return fastResponse;
             }
+            clearPerformance();
             return response;
         }
         performance.measure('cache-miss', { start: performance.now() });
@@ -127,7 +135,14 @@ export async function sjsRequestHandler(
         CACHE,
     );
     if (CACHE && CACHE_CLIENT_REDIRECT && isRedirect(response.status)) {
-        return createFastPathResponse(response, performance, buildTarget);
+        const fastResponse = await createFastPathResponse(
+            response,
+            performance,
+            buildTarget,
+        );
+        clearPerformance();
+        return fastResponse;
     }
+    clearPerformance();
     return response;
 }
diff --git a/src/utils.ts b/src/utils.ts
@@ -138,21 +138,13 @@ export const saveCache = async (
     //settledKv.close();
 };
 
-const buildDebugPerformance = (
-    performance: Performance,
-    shouldClear = true,
-): string => {
-    const serverTiming = performance.getEntriesByType('measure')
+const buildDebugPerformance = (performance: Performance): string => (
+    performance.getEntriesByType('measure')
         .map(({ name, duration }) =>
             `${name}${duration ? `;dur=${duration}` : ''}`
         )
-        .join(',');
-    if (shouldClear) {
-        performance.clearMarks();
-        performance.clearMeasures();
-    }
-    return serverTiming;
-};
+        .join(',')
+);
 
 export const createFinalResponse = async (
     responseProps: ResponseProps,
@@ -200,7 +192,7 @@ export const createFinalResponse = async (
     performance.measure('total', 'total');
     headers.set(
         'server-timing',
-        buildDebugPerformance(performance, !isFastPathRedirect),
+        buildDebugPerformance(performance),
     );
 
     const response = new Response(body, {