make sure edge function entries are properly awaited (#704)

opennextjs · Jan 20, 2025 · e5678b3 · e5678b3
1 parent 1981a47
commit e5678b3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.changeset/smart-carrots-build.md b/.changeset/smart-carrots-build.md
@@ -0,0 +1,5 @@
+---
+"@opennextjs/aws": patch
+---
+
+fix: make sure edge function entries are properly awaited
diff --git a/packages/open-next/src/core/edgeFunctionHandler.ts b/packages/open-next/src/core/edgeFunctionHandler.ts
@@ -17,9 +17,9 @@ export default async function edgeFunctionHandler(
     throw new Error(`No route found for ${request.url}`);
   }
 
-  const result = await self._ENTRIES[
-    `middleware_${correspondingRoute.name}`
-  ].default({
+  const entry = await self._ENTRIES[`middleware_${correspondingRoute.name}`];
+
+  const result = await entry.default({
     page: correspondingRoute.page,
     request: {
       ...request,

diff --git a/packages/open-next/src/types/global.ts b/packages/open-next/src/types/global.ts
@@ -37,13 +37,15 @@ export interface RequestData {
   signal: AbortSignal;
 }
 
+interface Entry {
+  default: (props: { page: string; request: RequestData }) => Promise<{
+    response: Response;
+    waitUntil: Promise<void>;
+  }>;
+}
+
 interface Entries {
-  [k: string]: {
-    default: (props: { page: string; request: RequestData }) => Promise<{
-      response: Response;
-      waitUntil: Promise<void>;
-    }>;
-  };
+  [k: string]: Entry | Promise<Entry>;
 }
 
 export interface EdgeRoute {