feat: disable static file server in lambda function

lazarv · Dec 20, 2024 · b0e31be · b0e31be
1 parent f8987ae
commit b0e31be
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 16 deletions.
diff --git a/examples/hello-world-aws/cdk/lib/react-server-stack.ts b/examples/hello-world-aws/cdk/lib/react-server-stack.ts
@@ -105,10 +105,10 @@ export class ReactServerStack extends cdk.Stack {
       },
 
       architecture: lambda.Architecture.ARM_64,
-      memorySize: 256,
+      memorySize: 512,
       timeout: cdk.Duration.seconds(10),
       logRetention: logs.RetentionDays.THREE_DAYS,
-      tracing: lambda.Tracing.ACTIVE,
+      //tracing: lambda.Tracing.ACTIVE,
     });
 
     const integration = new HttpLambdaIntegration(

diff --git a/packages/react-server-adapter-aws/functions/index.mjs b/packages/react-server-adapter-aws/functions/index.mjs
@@ -4,6 +4,7 @@ import { awsLambdaAdapter as lambdaHandler } from "@lazarv/react-server-adapter-
 const rsHandler = await createHandler({
   origin: process.env.ORIGIN || "http://localhost:3000",
   outDir: process.env?.OUT_DIR,
+  serveStaticFiles: false,
 });
 
 export const handler = lambdaHandler(rsHandler);
diff --git a/packages/react-server-adapter-aws/index.mjs b/packages/react-server-adapter-aws/index.mjs
@@ -53,6 +53,13 @@ export const adapter = createAdapter({
         "awsLambdaAdapterStreaming"
       );
     }
+    const serveStaticFiles = adapterOptions?.serveStaticFiles ?? false;
+    if (serveStaticFiles) {
+      entryFileContent = entryFileContent.replace(
+        "serveStaticFiles: false",
+        "serveStaticFiles: true"
+      );
+    }
 
     await clearDirectory(outServerDir);
     await mkdir(outServerDir, { recursive: true });

diff --git a/packages/react-server-adapter-aws/libs/create-middleware.mjs b/packages/react-server-adapter-aws/libs/create-middleware.mjs
@@ -33,6 +33,8 @@ export async function createMiddleware(root, options) {
     options.outDir = ".react-server";
   }
 
+  const serveStaticFiles = options.serveStaticFiles ?? false;
+
   const workerUrl = resolve(
     join(
       options.outDir,
@@ -54,7 +56,7 @@ export async function createMiddleware(root, options) {
   };
   runtime$(
     typeof config.runtime === "function"
-      ? config.runtime(initialRuntime) ?? initialRuntime
+      ? (config.runtime(initialRuntime) ?? initialRuntime)
       : {
           ...initialRuntime,
           ...config.runtime,
@@ -66,18 +68,22 @@ export async function createMiddleware(root, options) {
   const initialHandlers = [
     urlParser,
     async () => PrerenderStorage.enterWith({}),
-    await staticHandler(join(cwd, options.outDir, "dist"), {
-      cwd: join(options.outDir, "dist"),
-    }),
-    await staticHandler("{client,assets}", { cwd: options.outDir }),
-    await staticHandler(join(cwd, options.outDir), {
-      cwd: options.outDir,
-    }),
-    ...(config.public !== false
+    ...(serveStaticFiles
       ? [
-          await staticHandler(join(cwd, publicDir), {
-            cwd: publicDir,
+          await staticHandler(join(cwd, options.outDir, "dist"), {
+            cwd: join(options.outDir, "dist"),
+          }),
+          await staticHandler("{client,assets}", { cwd: options.outDir }),
+          await staticHandler(join(cwd, options.outDir), {
+            cwd: options.outDir,
           }),
+          ...(config.public !== false
+            ? [
+                await staticHandler(join(cwd, publicDir), {
+                  cwd: publicDir,
+                }),
+              ]
+            : []),
         ]
       : []),
     await trailingSlashHandler(),
@@ -94,7 +100,7 @@ export async function createMiddleware(root, options) {
 
   const middleware = compose(
     typeof config.handlers === "function"
-      ? config.handlers(initialHandlers) ?? initialHandlers
+      ? (config.handlers(initialHandlers) ?? initialHandlers)
       : [...initialHandlers, ...(config.handlers ?? [])]
   );
 

diff --git a/packages/react-server-adapter-aws/setup/cdk/cdk/lib/react-server-stack.ts b/packages/react-server-adapter-aws/setup/cdk/cdk/lib/react-server-stack.ts
@@ -105,10 +105,10 @@ export class ReactServerStack extends cdk.Stack {
       },
 
       architecture: lambda.Architecture.ARM_64,
-      memorySize: 256,
+      memorySize: 512,
       timeout: cdk.Duration.seconds(10),
       logRetention: logs.RetentionDays.THREE_DAYS,
-      tracing: lambda.Tracing.ACTIVE,
+      //tracing: lambda.Tracing.ACTIVE,
     });
 
     const integration = new HttpLambdaIntegration(