@chidchanun/bcp 0.1.6 → 0.1.8

package/packages/server/src/standalone-production-runtime-v2.ts

@@ -49,6 +49,11 @@ import {
     type MetadataSource,
 } from "./metadata.js";
 
+import {
+    applyResponseCookies,
+    runWithRequestContext,
+} from "./request-context.ts";
+
 import {
     getContentType,
     readPublicAsset,
@@ -1405,7 +1410,8 @@ async function handleApiRoute(
 
     if (
         !handler &&
-        method === "HEAD"
+        method ===
+        "HEAD"
     ) {
         handler =
             getApiHandler(
@@ -1434,23 +1440,48 @@ async function handleApiRoute(
         return;
     }
 
+    const request =
+        await createWebRequest(
+            req,
+            requestUrl
+        );
+
     const response =
-        await handler(
-            await createWebRequest(
-                req,
-                requestUrl
-            ),
+        await runWithRequestContext(
+            request,
+
+            async () => {
+                const result =
+                    await handler(
+                        request,
+                        {
+                            params,
+                        }
+                    );
+
+                if (
+                    !(
+                        result instanceof
+                        Response
+                    )
+                ) {
+                    throw new Error(
+                        `API handler "${method} ${definition.pathname}" must return a Response object.`
+                    );
+                }
+
+                return applyResponseCookies(
+                    result
+                );
+            },
             {
-                params,
+                remoteAddress:
+                    req.socket
+                        .remoteAddress ??
+                    null,
             }
         );
 
-    if (!(response instanceof Response)) {
-        throw new Error(
-            `API handler "${method} ${definition.pathname}" must return a Response object.`
-        );
-    }
-
     await sendWebResponse(
         req,
         res,