@opennextjs/aws 3.2.0 → 3.2.2

package/dist/core/routing/util.js

@@ -24,7 +24,8 @@ export function convertFromQueryString(query) {
     const queryParts = query.split("&");
     return queryParts.reduce((acc, part) => {
         const [key, value] = part.split("=");
-        return { ...acc, [key]: value };
+        acc[key] = value;
+        return acc;
     }, {});
 }
 /**
@@ -37,7 +38,7 @@ export function getUrlParts(url, isExternal) {
         const match = url.match(regex);
         return {
             hostname: "",
-            pathname: match?.[1] ?? url,
+            pathname: match?.[1] ? `/${match[1]}` : url,
             protocol: "",
             queryString: match?.[2] ?? "",
         };
@@ -50,7 +51,7 @@ export function getUrlParts(url, isExternal) {
     return {
         protocol: match[1] ?? "https:",
         hostname: match[2],
-        pathname: match[3],
+        pathname: match[3] ?? "",
         queryString: match[4]?.slice(1) ?? "",
     };
 }
@@ -84,13 +85,16 @@ export function convertRes(res) {
  * @__PURE__
  */
 export function convertToQueryString(query) {
+    // URLSearchParams is a representation of the PARSED query.
+    // So we must decode the value before appending it to the URLSearchParams.
+    // https://stackoverflow.com/a/45516812
     const urlQuery = new URLSearchParams();
     Object.entries(query).forEach(([key, value]) => {
         if (Array.isArray(value)) {
-            value.forEach((entry) => urlQuery.append(key, entry));
+            value.forEach((entry) => urlQuery.append(key, decodeURIComponent(entry)));
         }
         else {
-            urlQuery.append(key, value);
+            urlQuery.append(key, decodeURIComponent(value));
         }
     });
     const queryString = urlQuery.toString();
@@ -125,45 +129,20 @@ export function getMiddlewareMatch(middlewareManifest) {
  * @__PURE__
  */
 export function escapeRegex(str) {
-    let path = str.replace(/\(\.\)/g, "_µ1_");
-    path = path.replace(/\(\.{2}\)/g, "_µ2_");
-    path = path.replace(/\(\.{3}\)/g, "_µ3_");
-    return path;
+    return str
+        .replaceAll("(.)", "_µ1_")
+        .replaceAll("(..)", "_µ2_")
+        .replaceAll("(...)", "_µ3_");
 }
 /**
  *
  * @__PURE__
  */
 export function unescapeRegex(str) {
-    let path = str.replace(/_µ1_/g, "(.)");
-    path = path.replace(/_µ2_/g, "(..)");
-    path = path.replace(/_µ3_/g, "(...)");
-    return path;
-}
-/**
- *
- * @__PURE__
- */
-function filterHeadersForProxy(headers) {
-    const filteredHeaders = {};
-    const disallowedHeaders = [
-        "host",
-        "connection",
-        "via",
-        "x-cache",
-        "transfer-encoding",
-        "content-encoding",
-        "content-length",
-    ];
-    Object.entries(headers).forEach(([key, value]) => {
-        const lowerKey = key.toLowerCase();
-        if (disallowedHeaders.includes(lowerKey) || lowerKey.startsWith("x-amz"))
-            return;
-        else {
-            filteredHeaders[key] = value?.toString() ?? "";
-        }
-    });
-    return filteredHeaders;
+    return str
+        .replaceAll("_µ1_", "(.)")
+        .replaceAll("_µ2_", "(..)")
+        .replaceAll("_µ3_", "(...)");
 }
 /**
  * @__PURE__
@@ -181,50 +160,6 @@ export function convertBodyToReadableStream(method, body) {
     });
     return readable;
 }
-/**
- *
- * @__PURE__
- */
-export async function proxyRequest(internalEvent, res) {
-    const { url, headers, method, body } = internalEvent;
-    const request = await import("node:https").then((m) => m.request);
-    debug("proxyRequest", url);
-    await new Promise((resolve, reject) => {
-        const filteredHeaders = filterHeadersForProxy(headers);
-        debug("filteredHeaders", filteredHeaders);
-        const req = request(url, {
-            headers: filteredHeaders,
-            method,
-            rejectUnauthorized: false,
-        }, (_res) => {
-            res.writeHead(_res.statusCode ?? 200, filterHeadersForProxy(_res.headers));
-            if (_res.headers["content-encoding"] === "br") {
-                _res.pipe(require("node:zlib").createBrotliDecompress()).pipe(res);
-            }
-            else if (_res.headers["content-encoding"] === "gzip") {
-                _res.pipe(require("node:zlib").createGunzip()).pipe(res);
-            }
-            else {
-                _res.pipe(res);
-            }
-            _res.on("error", (e) => {
-                error("proxyRequest error", e);
-                res.end();
-                reject(e);
-            });
-            res.on("finish", () => {
-                resolve();
-            });
-        });
-        if (body && method !== "GET" && method !== "HEAD") {
-            req.write(body);
-        }
-        req.end();
-    });
-    // console.log("result", result);
-    // res.writeHead(result.status, resHeaders);
-    // res.end(await result.text());
-}
 var CommonHeaders;
 (function (CommonHeaders) {
     CommonHeaders["CACHE_CONTROL"] = "cache-control";
@@ -244,7 +179,8 @@ export function fixCacheHeaderForHtmlPages(rawPath, headers) {
             "private, no-cache, no-store, max-age=0, must-revalidate";
         return;
     }
-    // WORKAROUND: `NextServer` does not set cache headers for HTML pages — https://github.com/serverless-stack/open-next#workaround-nextserver-does-not-set-cache-headers-for-html-pages
+    // WORKAROUND: `NextServer` does not set cache headers for HTML pages
+    // https://opennext.js.org/aws/v2/advanced/workaround#workaround-nextserver-does-not-set-cache-headers-for-html-pages
     if (HtmlPages.includes(rawPath)) {
         headers[CommonHeaders.CACHE_CONTROL] =
             "public, max-age=0, s-maxage=31536000, must-revalidate";
@@ -276,7 +212,8 @@ export function addOpenNextHeader(headers) {
     }
     if (globalThis.openNextDebug) {
         headers["X-OpenNext-Version"] = globalThis.openNextVersion;
-        headers["X-OpenNext-RequestId"] = globalThis.__als.getStore()?.requestId;
+        headers["X-OpenNext-RequestId"] =
+            globalThis.__openNextAls.getStore()?.requestId;
     }
 }
 /**
@@ -307,13 +244,13 @@ export async function revalidateIfRequired(host, rawPath, headers, req) {
         // If data has the same etag during these 5 min dedup window, it will be deduplicated and not revalidated.
         try {
             const hash = (str) => crypto.createHash("md5").update(str).digest("hex");
-            const requestId = globalThis.__als.getStore()?.requestId ?? "";
+            const requestId = globalThis.__openNextAls.getStore()?.requestId ?? "";
             const lastModified = globalThis.lastModified[requestId] > 0
                 ? globalThis.lastModified[requestId]
                 : "";
             // For some weird cases, lastModified is not set, haven't been able to figure out yet why
             // For those cases we add the etag to the deduplication id, it might help
-            const etag = headers["etag"] ?? headers["ETag"] ?? "";
+            const etag = headers.etag ?? headers.ETag ?? "";
             await globalThis.queue.send({
                 MessageBody: { host, url: revalidateUrl },
                 MessageDeduplicationId: hash(`${rawPath}-${lastModified}-${etag}`),
@@ -335,19 +272,22 @@ export async function revalidateIfRequired(host, rawPath, headers, req) {
 export function generateMessageGroupId(rawPath) {
     let a = cyrb128(rawPath);
     // We use mulberry32 to generate a random int between 0 and MAX_REVALIDATE_CONCURRENCY
-    var t = (a += 0x6d2b79f5);
+    let t = (a += 0x6d2b79f5);
     t = Math.imul(t ^ (t >>> 15), t | 1);
     t ^= t + Math.imul(t ^ (t >>> 7), t | 61);
     const randomFloat = ((t ^ (t >>> 14)) >>> 0) / 4294967296;
     // This will generate a random int between 0 and MAX_REVALIDATE_CONCURRENCY
     // This means that we could have 1000 revalidate request at the same time
-    const maxConcurrency = parseInt(process.env.MAX_REVALIDATE_CONCURRENCY ?? "10");
+    const maxConcurrency = Number.parseInt(process.env.MAX_REVALIDATE_CONCURRENCY ?? "10");
     const randomInt = Math.floor(randomFloat * maxConcurrency);
     return `revalidate-${randomInt}`;
 }
 // Used to generate a hash int from a string
 function cyrb128(str) {
-    let h1 = 1779033703, h2 = 3144134277, h3 = 1013904242, h4 = 2773480762;
+    let h1 = 1779033703;
+    let h2 = 3144134277;
+    let h3 = 1013904242;
+    let h4 = 2773480762;
     for (let i = 0, k; i < str.length; i++) {
         k = str.charCodeAt(i);
         h1 = h2 ^ Math.imul(h1 ^ k, 597399067);
@@ -359,6 +299,7 @@ function cyrb128(str) {
     h2 = Math.imul(h4 ^ (h2 >>> 22), 2869860233);
     h3 = Math.imul(h1 ^ (h3 >>> 17), 951274213);
     h4 = Math.imul(h2 ^ (h4 >>> 19), 2716044179);
+    // biome-ignore lint/style/noCommaOperator:
     (h1 ^= h2 ^ h3 ^ h4), (h2 ^= h1), (h3 ^= h1), (h4 ^= h1);
     return h1 >>> 0;
 }
@@ -372,7 +313,7 @@ export function fixISRHeaders(headers) {
             "private, no-cache, no-store, max-age=0, must-revalidate";
         return;
     }
-    const requestId = globalThis.__als.getStore()?.requestId ?? "";
+    const requestId = globalThis.__openNextAls.getStore()?.requestId ?? "";
     const _lastModified = globalThis.lastModified[requestId] ?? 0;
     if (headers[CommonHeaders.NEXT_CACHE] === "HIT" && _lastModified > 0) {
         // calculate age
@@ -384,7 +325,7 @@ export function fixISRHeaders(headers) {
         if (typeof cacheControl !== "string")
             return;
         const match = cacheControl.match(regex);
-        const sMaxAge = match ? parseInt(match[1]) : undefined;
+        const sMaxAge = match ? Number.parseInt(match[1]) : undefined;
         // 31536000 is the default s-maxage value for SSG pages
         if (sMaxAge && sMaxAge !== 31536000) {
             const remainingTtl = Math.max(sMaxAge - age, 1);

package/dist/core/routingHandler.d.ts

@@ -1,4 +1,6 @@
 import type { InternalEvent, InternalResult, Origin } from "../types/open-next";
+export declare const MIDDLEWARE_HEADER_PREFIX = "x-middleware-response-";
+export declare const MIDDLEWARE_HEADER_PREFIX_LEN: number;
 export interface MiddlewareOutputEvent {
     internalEvent: InternalEvent;
     isExternalRewrite: boolean;

package/dist/core/routingHandler.js

@@ -1,18 +1,20 @@
 import { BuildId, ConfigHeaders, PrerenderManifest, RoutesManifest, } from "../adapters/config/index";
 import { debug } from "../adapters/logger";
 import { cacheInterceptor } from "./routing/cacheInterceptor";
-import { addNextConfigHeaders, fixDataPage, handleFallbackFalse, handleRedirects, handleRewrites, } from "./routing/matcher";
+import { fixDataPage, getNextConfigHeaders, handleFallbackFalse, handleRedirects, handleRewrites, } from "./routing/matcher";
 import { handleMiddleware } from "./routing/middleware";
+export const MIDDLEWARE_HEADER_PREFIX = "x-middleware-response-";
+export const MIDDLEWARE_HEADER_PREFIX_LEN = MIDDLEWARE_HEADER_PREFIX.length;
 // Add the locale prefix to the regex so we correctly match the rawPath
-const optionalLocalePrefixRegex = !!RoutesManifest.locales.length
-    ? `^/(?:${RoutesManifest.locales.map((locale) => locale + "/?").join("|")})?`
+const optionalLocalePrefixRegex = RoutesManifest.locales.length
+    ? `^/(?:${RoutesManifest.locales.map((locale) => `${locale}/?`).join("|")})?`
     : "^/";
 // Add the basepath prefix to the regex so we correctly match the rawPath
-const optionalBasepathPrefixRegex = !!RoutesManifest.basePath
+const optionalBasepathPrefixRegex = RoutesManifest.basePath
     ? `^${RoutesManifest.basePath}/?`
     : "^/";
 // Add the basePath prefix to the api routes
-const apiPrefix = !!RoutesManifest.basePath
+const apiPrefix = RoutesManifest.basePath
     ? `${RoutesManifest.basePath}/api`
     : "/api";
 const staticRegexp = RoutesManifest.routes.static.map((route) => new RegExp(route.regex
@@ -21,16 +23,34 @@ const staticRegexp = RoutesManifest.routes.static.map((route) => new RegExp(rout
 const dynamicRegexp = RoutesManifest.routes.dynamic.map((route) => new RegExp(route.regex
     .replace("^/", optionalLocalePrefixRegex)
     .replace("^/", optionalBasepathPrefixRegex)));
+// Geolocation headers starting from Nextjs 15
+// See https://github.com/vercel/vercel/blob/7714b1c/packages/functions/src/headers.ts
+const geoHeaderToNextHeader = {
+    "x-open-next-city": "x-vercel-ip-city",
+    "x-open-next-country": "x-vercel-ip-country",
+    "x-open-next-region": "x-vercel-ip-country-region",
+    "x-open-next-latitude": "x-vercel-ip-latitude",
+    "x-open-next-longitude": "x-vercel-ip-longitude",
+};
 function applyMiddlewareHeaders(eventHeaders, middlewareHeaders, setPrefix = true) {
+    const keyPrefix = setPrefix ? MIDDLEWARE_HEADER_PREFIX : "";
     Object.entries(middlewareHeaders).forEach(([key, value]) => {
         if (value) {
-            eventHeaders[`${setPrefix ? "x-middleware-response-" : ""}${key}`] =
-                Array.isArray(value) ? value.join(",") : value;
+            eventHeaders[keyPrefix + key] = Array.isArray(value)
+                ? value.join(",")
+                : value;
         }
     });
 }
 export default async function routingHandler(event) {
-    const nextHeaders = addNextConfigHeaders(event, ConfigHeaders) ?? {};
+    // Add Next geo headers
+    for (const [openNextGeoName, nextGeoName] of Object.entries(geoHeaderToNextHeader)) {
+        const value = event.headers[openNextGeoName];
+        if (value) {
+            event.headers[nextGeoName] = value;
+        }
+    }
+    const nextHeaders = getNextConfigHeaders(event, ConfigHeaders);
     let internalEvent = fixDataPage(event, BuildId);
     if ("statusCode" in internalEvent) {
         return internalEvent;
@@ -45,10 +65,8 @@ export default async function routingHandler(event) {
     if ("statusCode" in middleware) {
         return middleware;
     }
-    else {
-        middlewareResponseHeaders = middleware.responseHeaders || {};
-        internalEvent = middleware;
-    }
+    middlewareResponseHeaders = middleware.responseHeaders || {};
+    internalEvent = middleware;
     // At this point internalEvent is an InternalEvent or a MiddlewareOutputEvent
     let isExternalRewrite = middleware.externalRewrite ?? false;
     if (!isExternalRewrite) {

package/dist/core/util.js

@@ -5,7 +5,8 @@ import { AppPathsManifestKeys, NextConfig, RoutesManifest, } from "../adapters/c
 import NextServer from "next/dist/server/next-server.js";
 import { debug } from "../adapters/logger.js";
 import { applyOverride as applyNextjsRequireHooksOverride, overrideHooks as overrideNextjsRequireHooks, } from "./require-hooks.js";
-// WORKAROUND: Set `__NEXT_PRIVATE_PREBUNDLED_REACT` to use prebundled React — https://github.com/serverless-stack/open-next#workaround-set-__next_private_prebundled_react-to-use-prebundled-react
+// WORKAROUND: Set `__NEXT_PRIVATE_PREBUNDLED_REACT` to use prebundled Reac
+// See https://opennext.js.org/aws/v2/advanced/workaround#workaround-set-__next_private_prebundled_react-to-use-prebundled-react
 // Step 1: Need to override the require hooks for React before Next.js server
 //         overrides them with prebundled ones in the case of app dir
 // Step 2: Import Next.js server
@@ -31,7 +32,7 @@ export const requestHandler = new NextServer.default({
         // our own cache handler to store the cache on S3.
         //#override stableIncrementalCache
         cacheHandler: cacheHandlerPath,
-        cacheMaxMemorySize: 0,
+        cacheMaxMemorySize: 0, // We need to disable memory cache
         //#endOverride
         experimental: {
             ...NextConfig.experimental,
@@ -62,7 +63,8 @@ export function loadMiddlewareManifest(nextDir) {
 }
 //#override setNextjsPrebundledReact
 export function setNextjsPrebundledReact(rawPath) {
-    // WORKAROUND: Set `__NEXT_PRIVATE_PREBUNDLED_REACT` to use prebundled React — https://github.com/serverless-stack/open-next#workaround-set-__next_private_prebundled_react-to-use-prebundled-react
+    // WORKAROUND: Set `__NEXT_PRIVATE_PREBUNDLED_REACT` to use prebundled React
+    // See https://opennext.js.org/aws/v2/advanced/workaround#workaround-set-__next_private_prebundled_react-to-use-prebundled-react
     const routes = [
         ...RoutesManifest.routes.static,
         ...RoutesManifest.routes.dynamic,

package/dist/helpers/withSST.d.ts

@@ -44,7 +44,7 @@ export declare function withSST<Fn extends Record<string, SSTCompatibleSplittedF
     functions?: Fn | undefined;
     middleware?: {
         external: true;
-    } | undefined;
+    };
     dangerous?: import("../types/open-next").DangerousOptions | undefined;
     buildCommand?: string | undefined;
     buildOutputPath?: string | undefined;

package/dist/http/openNextResponse.d.ts

@@ -1,12 +1,7 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-import type { IncomingMessage, OutgoingHttpHeader, OutgoingHttpHeaders, ServerResponse } from "http";
-import type { Socket } from "net";
-import type { TransformCallback, Writable } from "stream";
-import { Transform } from "stream";
+import type { IncomingMessage, OutgoingHttpHeader, OutgoingHttpHeaders, ServerResponse } from "node:http";
+import type { Socket } from "node:net";
+import type { TransformCallback, Writable } from "node:stream";
+import { Transform } from "node:stream";
 export interface StreamCreator {
     writeHeaders(prelude: {
         statusCode: number;
@@ -18,6 +13,7 @@ export interface StreamCreator {
 }
 export declare class OpenNextNodeResponse extends Transform implements ServerResponse {
     private fixHeaders;
+    private onEnd;
     private streamCreator?;
     private initialHeaders?;
     statusCode: number;

package/dist/http/openNextResponse.js

@@ -1,4 +1,4 @@
-import { Transform } from "stream";
+import { Transform } from "node:stream";
 import { debug } from "../adapters/logger";
 import { parseCookies, parseHeaders } from "./util";
 const SET_COOKIE_HEADER = "set-cookie";
@@ -6,6 +6,7 @@ const CANNOT_BE_USED = "This cannot be used in OpenNext";
 // We only need to implement the methods that are used by next.js
 export class OpenNextNodeResponse extends Transform {
     fixHeaders;
+    onEnd;
     streamCreator;
     initialHeaders;
     statusCode;
@@ -53,20 +54,9 @@ export class OpenNextNodeResponse extends Transform {
     constructor(fixHeaders, onEnd, streamCreator, initialHeaders) {
         super();
         this.fixHeaders = fixHeaders;
+        this.onEnd = onEnd;
         this.streamCreator = streamCreator;
         this.initialHeaders = initialHeaders;
-        this.once("finish", () => {
-            if (!this.headersSent) {
-                this.flushHeaders();
-            }
-            // In some cases we might not have a store i.e. for example in the image optimization function
-            // We may want to reconsider this in the future, it might be intersting to have access to this store everywhere
-            globalThis.__als
-                ?.getStore()
-                ?.pendingPromiseRunner.add(onEnd(this.headers));
-            const bodyLength = this.getBody().length;
-            this.streamCreator?.onFinish(bodyLength);
-        });
     }
     // Necessary for next 12
     // We might have to implement all the methods here
@@ -122,7 +112,8 @@ export class OpenNextNodeResponse extends Transform {
         this.headersSent = true;
         // Initial headers should be merged with the new headers
         // These initial headers are the one created either in the middleware or in next.config.js
-        const mergeHeadersPriority = globalThis.__als?.getStore()?.mergeHeadersPriority ?? "middleware";
+        const mergeHeadersPriority = globalThis.__openNextAls?.getStore()?.mergeHeadersPriority ??
+            "middleware";
         if (this.initialHeaders) {
             this.headers =
                 mergeHeadersPriority === "middleware"
@@ -134,7 +125,7 @@ export class OpenNextNodeResponse extends Transform {
                         ...this.initialHeaders,
                         ...this.headers,
                     };
-            const initialCookies = parseCookies(this.initialHeaders[SET_COOKIE_HEADER] ?? []);
+            const initialCookies = parseCookies(this.initialHeaders[SET_COOKIE_HEADER]);
             this._cookies =
                 mergeHeadersPriority === "middleware"
                     ? [...this._cookies, ...initialCookies]
@@ -162,14 +153,12 @@ export class OpenNextNodeResponse extends Transform {
         if (!this.hasHeader(key)) {
             return this.setHeader(key, value);
         }
-        else {
-            const existingHeader = this.getHeader(key);
-            const toAppend = Array.isArray(value) ? value : [value];
-            const newValue = Array.isArray(existingHeader)
-                ? [...existingHeader, ...toAppend]
-                : [existingHeader, ...toAppend];
-            return this.setHeader(key, newValue);
-        }
+        const existingHeader = this.getHeader(key);
+        const toAppend = Array.isArray(value) ? value : [value];
+        const newValue = Array.isArray(existingHeader)
+            ? [...existingHeader, ...toAppend]
+            : [existingHeader, ...toAppend];
+        return this.setHeader(key, newValue);
     }
     writeHead(statusCode, statusMessage, headers) {
         let _headers = headers;
@@ -227,15 +216,24 @@ export class OpenNextNodeResponse extends Transform {
         this._internalWrite(chunk, encoding);
         callback();
     }
-    //This is only here because of aws broken streaming implementation.
-    //Hopefully one day they will be able to give us a working streaming implementation in lambda for everyone
-    //If you're lucky you have a working streaming implementation in your aws account and don't need this
-    //If not you can set the OPEN_NEXT_FORCE_NON_EMPTY_RESPONSE env variable to true
-    //BE CAREFUL: Aws keeps rolling out broken streaming implementations even on accounts that had working ones before
-    //This is not dependent on the node runtime used
-    //There is another known issue with aws lambda streaming where the request reach the lambda only way after the request has been sent by the client. For this there is absolutely nothing we can do, contact aws support if that's your case
     _flush(callback) {
-        if (this.getBody().length < 1 &&
+        if (!this.headersSent) {
+            this.flushHeaders();
+        }
+        // In some cases we might not have a store i.e. for example in the image optimization function
+        // We may want to reconsider this in the future, it might be intersting to have access to this store everywhere
+        globalThis.__openNextAls
+            ?.getStore()
+            ?.pendingPromiseRunner.add(this.onEnd(this.headers));
+        const bodyLength = this.getBody().length;
+        this.streamCreator?.onFinish(bodyLength);
+        //This is only here because of aws broken streaming implementation.
+        //Hopefully one day they will be able to give us a working streaming implementation in lambda for everyone
+        //If you're lucky you have a working streaming implementation in your aws account and don't need this
+        //If not you can set the OPEN_NEXT_FORCE_NON_EMPTY_RESPONSE env variable to true
+        //BE CAREFUL: Aws keeps rolling out broken streaming implementations even on accounts that had working ones before
+        //This is not dependent on the node runtime used
+        if (bodyLength === 0 &&
             // We use an env variable here because not all aws account have the same behavior
             // On some aws accounts the response will hang if the body is empty
             // We are modifying the response body here, this is not a good practice

package/dist/http/request.d.ts

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import http from "node:http";
 export declare class IncomingMessage extends http.IncomingMessage {
     constructor({ method, url, headers, body, remoteAddress, }: {

package/dist/http/request.js

@@ -13,8 +13,10 @@ export class IncomingMessage extends http.IncomingMessage {
             end: Function.prototype,
             destroy: Function.prototype,
         });
-        if (typeof headers["content-length"] === "undefined") {
-            headers["content-length"] = Buffer.byteLength(body).toString();
+        // Set the content length when there is a body.
+        // See https://httpwg.org/specs/rfc9110.html#field.content-length
+        if (body) {
+            headers["content-length"] ??= String(Buffer.byteLength(body));
         }
         Object.assign(this, {
             ip: remoteAddress,

package/dist/http/util.d.ts

@@ -1,4 +1,4 @@
 import type http from "node:http";
 export declare const parseHeaders: (headers?: http.OutgoingHttpHeader[] | http.OutgoingHttpHeaders) => Record<string, string>;
 export declare const convertHeader: (header: http.OutgoingHttpHeader) => string;
-export declare function parseCookies(cookies?: string | string[]): string[] | undefined;
+export declare function parseCookies(cookies: string | string[] | null | undefined): string[];

package/dist/http/util.js

@@ -7,9 +7,7 @@ export const parseHeaders = (headers) => {
         if (value === undefined) {
             continue;
         }
-        else {
-            result[key.toLowerCase()] = convertHeader(value);
-        }
+        result[key.toLowerCase()] = convertHeader(value);
     }
     return result;
 };
@@ -17,18 +15,16 @@ export const convertHeader = (header) => {
     if (typeof header === "string") {
         return header;
     }
-    else if (Array.isArray(header)) {
+    if (Array.isArray(header)) {
         return header.join(",");
     }
-    else {
-        return String(header);
-    }
+    return String(header);
 };
 export function parseCookies(cookies) {
-    if (!cookies)
-        return;
-    if (typeof cookies === "string") {
-        return cookies.split(/(?<!Expires=\w+),/i).map((c) => c.trim());
+    if (!cookies) {
+        return [];
     }
-    return cookies;
+    return typeof cookies === "string"
+        ? cookies.split(/(?<!Expires=\w+),/i).map((c) => c.trim())
+        : cookies;
 }

package/dist/minimize-js.js

@@ -6,9 +6,9 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import minify from "@node-minify/core";
 import terser from "@node-minify/terser";
-var failed_files = [];
-var total_files = 0;
-var options = {};
+const failed_files = [];
+let total_files = 0;
+const options = {};
 const promiseSeries = async (tasks, initial) => {
     if (!Array.isArray(tasks)) {
         return Promise.reject(new TypeError("promise.series only accepts an array of functions"));
@@ -40,12 +40,12 @@ const minifyJSON = async (file) => {
     try {
         if (options.compress_json || options.packagejson) {
             total_files++;
-            var is_package_json = file.indexOf("package.json") > -1;
-            var data = await fs.readFile(file, "utf8");
-            var json = JSON.parse(data);
-            var new_json = {};
+            const is_package_json = file.indexOf("package.json") > -1;
+            const data = await fs.readFile(file, "utf8");
+            const json = JSON.parse(data);
+            let new_json = {};
             if (options.packagejson && is_package_json) {
-                var { name, version, bin, main, binary, engines } = json;
+                const { name, version, bin, main, binary, engines } = json;
                 new_json = { name, version };
                 if (bin)
                     new_json.bin = bin;
@@ -66,14 +66,14 @@ const minifyJSON = async (file) => {
     //process.stdout.write(".");
 };
 const walk = async (currentDirPath) => {
-    var js_files = [];
-    var json_files = [];
-    var dirs = [];
-    var current_dirs = await fs.readdir(currentDirPath);
+    const js_files = [];
+    const json_files = [];
+    const dirs = [];
+    const current_dirs = await fs.readdir(currentDirPath);
     for (const name of current_dirs) {
-        var filePath = path.join(currentDirPath, name);
-        var stat = await fs.stat(filePath);
-        var is_bin = /\.bin$/;
+        const filePath = path.join(currentDirPath, name);
+        const stat = await fs.stat(filePath);
+        const is_bin = /\.bin$/;
         if (stat.isFile()) {
             if (filePath.substr(-5) === ".json")
                 json_files.push(filePath);
@@ -84,8 +84,8 @@ const walk = async (currentDirPath) => {
             dirs.push(filePath);
         }
     }
-    var js_promise = Promise.all(js_files.map((f) => minifyJS(f)));
-    var json_promise = Promise.all(json_files.map((f) => minifyJSON(f)));
+    const js_promise = Promise.all(js_files.map((f) => minifyJS(f)));
+    const json_promise = Promise.all(json_files.map((f) => minifyJSON(f)));
     await Promise.all([js_promise, json_promise]);
     await promiseSeries(dirs.map((dir) => () => walk(dir)));
 };
@@ -96,7 +96,7 @@ export async function minifyAll(dir, opts) {
     //process.stdout.write(".\n");
     //console.log("Total found files: " + total_files);
     if (failed_files.length) {
-        console.log(`\n\nFailed to minify files:`);
-        failed_files.forEach((f) => console.log("\t" + f));
+        console.log("\n\nFailed to minify files:");
+        failed_files.forEach((f) => console.log(`\t${f}`));
     }
 }

package/dist/overrides/converters/aws-apigw-v1.d.ts

@@ -1,3 +1,3 @@
-import type { Converter, InternalEvent, InternalResult } from "../../types/open-next";
-declare const _default: Converter<InternalEvent, InternalResult>;
+import type { Converter } from "../../types/overrides";
+declare const _default: Converter;
 export default _default;

package/dist/overrides/converters/aws-apigw-v1.js

@@ -52,7 +52,8 @@ async function convertFromAPIGatewayProxyEvent(event) {
         query: removeUndefinedFromQuery(event.multiValueQueryStringParameters ?? {}),
         cookies: event.multiValueHeaders?.cookie?.reduce((acc, cur) => {
             const [key, value] = cur.split("=");
-            return { ...acc, [key]: value };
+            acc[key] = value;
+            return acc;
         }, {}) ?? {},
     };
 }