fix: Only call onGlobalAfterResponse once

aklinker1 · aklinker1 · commit 85723740602f · 2026-02-01T10:00:32.000-06:00
diff --git a/src/internal/__tests__/compile-fetch-function.test.ts b/src/internal/__tests__/compile-fetch-function.test.ts
@@ -147,6 +147,7 @@ describe("compileFetchFunction", () => {
         "(request) => {
           const path = utils.getRawPathname(request);
           const ctx = new utils.Context(request, path, utils.origin);
+          let handlerReturnedPromise = false;
 
           try {
             const matchedRoute = utils.getRoute(request.method, path);
@@ -162,6 +163,7 @@ describe("compileFetchFunction", () => {
             ctx.response = matchedRoute.data.compiledHandler(request, ctx);
             if (typeof ctx.response.then !== utils.FUNCTION) return ctx.response;
 
+            handlerReturnedPromise = true;
             return ctx.response.catch(error => {
               const status =
                 error instanceof utils.HttpError
@@ -190,9 +192,11 @@ describe("compileFetchFunction", () => {
               )
             );
           } finally {
-            setTimeout(() => {
-              utils.hooks.onGlobalAfterResponse[0].callback(ctx);
-            })
+            if (!handlerReturnedPromise) {
+              setTimeout(() => {
+                utils.hooks.onGlobalAfterResponse[0].callback(ctx);
+              })
+            }
           }
 
         }"
diff --git a/src/internal/compile-fetch-function.ts b/src/internal/compile-fetch-function.ts
@@ -19,6 +19,7 @@ export function compileFetchFunction(options: CompileOptions): ServerSideFetch {
 return (request) => {
   const path = utils.getRawPathname(request);
   const ctx = new utils.Context(request, path, utils.origin);
+  ${onGlobalAfterResponseCount ? "let handlerReturnedPromise = false;" : ""}
 
   try {
 ${onGlobalRequestCount ? compileOnGlobalRequestHook(onGlobalRequestCount) : ""}
@@ -36,6 +37,7 @@ ${onGlobalRequestCount ? compileOnGlobalRequestHook(onGlobalRequestCount) : ""}
     ctx.response = matchedRoute.data.compiledHandler(request, ctx);
     if (typeof ctx.response.then !== utils.FUNCTION) return ctx.response;
 
+    ${onGlobalAfterResponseCount ? "handlerReturnedPromise = true;" : ""}
     return ctx.response.catch(error => {
 ${onGlobalErrorCount ? compileOnGlobalErrorHook(onGlobalErrorCount, 3) : ""}
 
@@ -105,7 +107,9 @@ function compileOnGlobalAfterResponseFinally(
 ): string {
   const indent = "  ".repeat(tabs);
   return `finally {
-${compileOnGlobalAfterResponseHook(hookCount, tabs + 1)}
+${indent}  if (!handlerReturnedPromise) {
+${compileOnGlobalAfterResponseHook(hookCount, tabs + 2)}
+${indent}  }
 ${indent}}
 `;
 }
