perf(converters): Improve performance

.changeset/dirty-rabbits-build.md

@@ -0,0 +1,5 @@
+---
+"@opennextjs/aws": patch
+---
+
+perf(converters): Improve performance

packages/open-next/src/core/routing/util.ts

@@ -1,4 +1,4 @@
 import crypto from "node:crypto";
 import type { OutgoingHttpHeaders } from "node:http";
 import { parse as parseQs, stringify as stringifyQs } from "node:querystring";
 
@@ -150,8 +150,9 @@
  * @__PURE__
  */
 export function convertToQuery(querystring: string) {
+  if (!querystring) return {};
   const query = new URLSearchParams(querystring);
-  const queryObject: Record<string, string[] | string> = {};
+ const queryObject: Record<string, string[] | string> = {};
 
   for (const key of query.keys()) {
     const queries = query.getAll(key);

packages/open-next/src/overrides/converters/aws-apigw-v2.ts

@@ -64,8 +64,10 @@ function normalizeAPIGatewayProxyEventV2Headers(
     headers.cookie = cookies.join("; ");
   }
 
-  for (const [key, value] of Object.entries(rawHeaders || {})) {
-    headers[key.toLowerCase()] = value!;
+  if (rawHeaders) {
+    for (const [key, value] of Object.entries(rawHeaders)) {
+      headers[key.toLowerCase()] = value!;
+    }
   }
 
   return headers;

packages/open-next/src/overrides/converters/aws-cloudfront.ts

@@ -70,9 +70,10 @@ function normalizeCloudFrontRequestEventHeaders(
   const headers: Record<string, string> = {};
 
   for (const [key, values] of Object.entries(rawHeaders)) {
+    const lowerKey = key.toLowerCase();
     for (const { value } of values) {
       if (value) {
-        headers[key.toLowerCase()] = value;
+        headers[lowerKey] = value;
       }
     }
   }

packages/open-next/src/overrides/converters/edge.ts

@@ -24,8 +24,6 @@ const converter: Converter<InternalEvent, InternalResult | MiddlewareResult> = {
 
     const searchParams = url.searchParams;
     const query = getQueryFromSearchParams(searchParams);
-    // Transform body into Buffer
-    const body = await event.arrayBuffer();
     const headers: Record<string, string> = {};
     event.headers.forEach((value, key) => {
       headers[key] = value;
@@ -34,6 +32,11 @@ const converter: Converter<InternalEvent, InternalResult | MiddlewareResult> = {
     const method = event.method;
     const shouldHaveBody = method !== "GET" && method !== "HEAD";
 
+    // Only read body for methods that should have one
+    const body = shouldHaveBody
+      ? Buffer.from(await event.arrayBuffer())
+      : undefined;
+
     const cookieHeader = event.headers.get("cookie");
     const cookies = cookieHeader
       ? (cookieParser.parse(cookieHeader) as Record<string, string>)
@@ -44,7 +47,7 @@ const converter: Converter<InternalEvent, InternalResult | MiddlewareResult> = {
       method,
       rawPath,
       url: event.url,
-      body: shouldHaveBody ? Buffer.from(body) : undefined,
+      body,
       headers,
       remoteAddress: event.headers.get("x-forwarded-for") ?? "::1",
       query,

packages/open-next/src/overrides/converters/node.ts

@@ -8,12 +8,28 @@ import { extractHostFromHeaders, getQueryFromSearchParams } from "./utils.js";
 const converter: Converter = {
   convertFrom: async (req: IncomingMessage & { protocol?: string }) => {
     const body = await new Promise<Buffer>((resolve) => {
+      const contentLength = req.headers["content-length"];
+      const expectedLength = contentLength
+        ? Number.parseInt(contentLength, 10)
+        : undefined;
       const chunks: Uint8Array[] = [];
+      let receivedLength = 0;
+
       req.on("data", (chunk) => {
         chunks.push(chunk);
+        receivedLength += chunk.length;
       });
       req.on("end", () => {
-        resolve(Buffer.concat(chunks));
+        // Use pre-allocated buffer if we have content-length and it matches
+        if (
+          expectedLength &&
+          receivedLength === expectedLength &&
+          chunks.length === 1
+        ) {
+          resolve(Buffer.from(chunks[0]));
+        } else {
+          resolve(Buffer.concat(chunks));
+        }
       });
     });