refactor: expose body type for lambda presets

this fixes issue with stormkit text streams
nitrojs · Aug 23, 2023 · e5f095d · e5f095d
1 parent 58b4853
commit e5f095d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/runtime/entries/aws-lambda.ts b/src/runtime/entries/aws-lambda.ts
@@ -63,13 +63,17 @@ export async function handler(
       cookies,
       statusCode: r.status,
       headers: normalizeLambdaOutgoingHeaders(r.headers, true),
-      body: await normalizeLambdaOutgoingBody(r.body, r.headers),
+      body: await normalizeLambdaOutgoingBody(r.body, r.headers).then(
+        (r) => r.body
+      ),
     };
   }
 
   return {
     statusCode: r.status,
     headers: normalizeLambdaOutgoingHeaders(r.headers),
-    body: await normalizeLambdaOutgoingBody(r.body, r.headers),
+    body: await normalizeLambdaOutgoingBody(r.body, r.headers).then(
+      (r) => r.body
+    ),
   };
 }
diff --git a/src/runtime/entries/netlify-lambda.ts b/src/runtime/entries/netlify-lambda.ts
@@ -40,7 +40,9 @@ export async function lambda(
   return {
     statusCode: r.status,
     headers: normalizeLambdaOutgoingHeaders(r.headers, true),
-    body: await normalizeLambdaOutgoingBody(r.body, r.headers),
+    body: await normalizeLambdaOutgoingBody(r.body, r.headers).then(
+      (r) => r.body
+    ),
     multiValueHeaders: {
       ...(cookies.length > 0 ? { "set-cookie": cookies } : {}),
     },

diff --git a/src/runtime/entries/stormkit.ts b/src/runtime/entries/stormkit.ts
@@ -42,7 +42,7 @@ export const handler: Handler<StormkitEvent, StormkitResponse> =
     return <StormkitResponse>{
       statusCode: response.status,
       headers: normalizeOutgoingHeaders(response.headers),
-      [normalizedBody === response.body ? "body" : "buffer"]: normalizedBody,
+      [normalizedBody.type === "text" ? "body" : "buffer"]: normalizedBody.body,
     };
   };
 

diff --git a/src/runtime/utils.lambda.ts b/src/runtime/utils.lambda.ts
@@ -31,18 +31,18 @@ export function normalizeLambdaOutgoingHeaders(
 export async function normalizeLambdaOutgoingBody(
   body: BodyInit | ReadableStream | Buffer | Readable | Uint8Array,
   headers: Record<string, number | string | string[] | undefined>
-): Promise<string> {
+): Promise<{ type: "text" | "binary"; body: string }> {
   if (typeof body === "string") {
-    return body;
+    return { type: "text", body };
   }
   if (!body) {
-    return "";
+    return { type: "text", body: "" };
   }
   const buffer = await _toBuffer(body as any);
   const contentType = (headers["content-type"] as string) || "";
   return isTextType(contentType)
-    ? buffer.toString("utf8")
-    : buffer.toString("base64");
+    ? { type: "text", body: buffer.toString("utf8") }
+    : { type: "binary", body: buffer.toString("base64") };
 }
 
 function _toBuffer(data: ReadableStream | Readable | Uint8Array) {