@chidchanun/bcp 0.1.5 → 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,

package/packages/server/src/middleware-dev-server.ts

@@ -5,6 +5,10 @@ import type {
     DevServerOptions,
 } from "./index.js";
 
+import {
+    createCriticalCssProxy,
+} from "./critical-css-proxy.js";
+
 import {
     loadProjectMiddleware,
 } from "./middleware-loader.js";
@@ -56,6 +60,12 @@ export function createMiddlewareDevServer(
         > | null =
         null;
 
+    let criticalCssGateway:
+        ReturnType<
+            typeof createCriticalCssProxy
+        > | null =
+        null;
+
     let started =
         false;
 
@@ -68,6 +78,8 @@ export function createMiddlewareDevServer(
             await findFreePort();
         const middlewarePort =
             await findFreePort();
+        const securityPort =
+            await findFreePort();
 
         internalServer =
             createStaticDevServer({
@@ -111,8 +123,10 @@ export function createMiddlewareDevServer(
 
         securityGateway =
             createSecurityProxy({
-                port,
-                hostname,
+                port:
+                    securityPort,
+                hostname:
+                    "127.0.0.1",
                 upstreamPort:
                     middlewarePort,
                 upstreamHostname:
@@ -133,12 +147,48 @@ export function createMiddlewareDevServer(
             throw error;
         }
 
+        criticalCssGateway =
+            createCriticalCssProxy({
+                port,
+                hostname,
+                upstreamPort:
+                    securityPort,
+                upstreamHostname:
+                    "127.0.0.1",
+                cssFile:
+                    path.join(
+                        rootDirectory,
+                        "public",
+                        "bcp.css"
+                    ),
+            });
+
+        try {
+            await criticalCssGateway.start();
+        } catch (error) {
+            await securityGateway.stop();
+            await middlewareGateway.stop();
+            await internalServer.stop();
+            internalServer =
+                null;
+            middlewareGateway =
+                null;
+            securityGateway =
+                null;
+            criticalCssGateway =
+                null;
+            throw error;
+        }
+
         started =
             true;
 
         console.log(
             `[BCP Security] Dev gateway: http://${hostname}:${port}`
         );
+        console.log(
+            `[BCP CSS] Inline /bcp.css when <= 8 KiB and allowed by CSP.`
+        );
         console.log(
             `[BCP Middleware] File: ${path.join(rootDirectory, "middleware.ts")} (optional; .tsx/.js/.jsx also supported)`
         );
@@ -146,6 +196,12 @@ export function createMiddlewareDevServer(
     }
 
     async function stop(): Promise<void> {
+        if (criticalCssGateway) {
+            await criticalCssGateway.stop();
+            criticalCssGateway =
+                null;
+        }
+
         if (securityGateway) {
             await securityGateway.stop();
             securityGateway =
@@ -257,4 +313,4 @@ async function findFreePort(): Promise<number> {
             );
         }
     }
-}
+}