fix: propagate waitUntil from edge runtime sandbox

vercel · Jul 4, 2024 · 2fb843f · 2fb843f
1 parent 849df1c
commit 2fb843f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/packages/next/src/server/base-server.ts b/packages/next/src/server/base-server.ts
@@ -1680,7 +1680,7 @@ export default abstract class Server<
     )
   }
 
-  private getWaitUntil(): WaitUntil | undefined {
+  protected getWaitUntil(): WaitUntil | undefined {
     const builtinRequestContext = getBuiltinRequestContext()
     if (builtinRequestContext) {
       // the platform provided a request context.

diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -980,7 +980,12 @@ export default class NextNodeServer extends BaseServer<
         })
 
         // If we handled the request, we can return early.
-        if (handled) return true
+        if (handled) {
+          const waitUntil = this.getWaitUntil()
+          waitUntil?.(handled.waitUntil)
+
+          return true
+        }
       }
 
       // If the route was detected as being a Pages API route, then handle
@@ -1931,6 +1936,11 @@ export default class NextNodeServer extends BaseServer<
       }
     })
 
+    const waitUntil = this.getWaitUntil()
+    if (waitUntil) {
+      waitUntil(result.waitUntil)
+    }
+
     const { originalResponse } = params.res
     if (result.response.body) {
       await pipeToNodeResponse(result.response.body, originalResponse)