@chidchanun/bcp 0.1.6 → 0.1.7

package/packages/server/src/index.ts

@@ -41,6 +41,8 @@ import {
     DevHmrServer,
 } from "./dev-hmr.js";
 
+import { runWithRequestContext, applyResponseCookies } from "./request-context.ts";
+
 /*
  * =====================================
  * Constants
@@ -1441,24 +1443,41 @@ async function handleApiRoute(
         );
 
     const response =
-        await handler(
+        await runWithRequestContext(
             request,
+
+            async () => {
+                const result =
+                    await handler(
+                        request,
+                        {
+                            params,
+                        }
+                    );
+
+                if (
+                    !(
+                        result instanceof
+                        Response
+                    )
+                ) {
+                    throw new Error(
+                        `API handler "${method} ${route.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} ${route.pathname}" must return a Response object.`
-        );
-    }
-
     await sendWebResponse(
         res,
         response,