@opennextjs/aws 3.2.2 → 3.3.0

package/README.md

@@ -77,18 +77,23 @@ To run `OpenNext` locally:
 
 1. Clone this repository.
 1. Build `open-next`:
+
    ```bash
    cd packages/open-next
    pnpm build
    ```
+
 1. Run `open-next` in watch mode:
+
    ```bash
    pnpm dev
    ```
+
 1. Now, you can make changes in `open-next` and build your Next.js app to test the changes.
+
    ```bash
    cd path/to/my/nextjs/app
-   path/to/open-next/packages/open-next/dist/index.js build
+   path/to/opennextjs-aws/packages/open-next/dist/index.js build
    ```
 
 ### Coldstart

package/dist/adapters/cache.js

@@ -1,4 +1,4 @@
-import { isBinaryContentType } from "./binary";
+import { isBinaryContentType } from "../utils/binary";
 import { debug, error, warn } from "./logger";
 /** Beginning single backslash is intentional, to look for the dot + the extension. Do not escape it again. */
 const CACHE_EXTENSION_REGEX = /\.(cache|fetch)$/;

package/dist/adapters/image-optimization-adapter.d.ts

@@ -1,4 +1,3 @@
-import type { StreamCreator } from "../http/openNextResponse.js";
-import type { InternalEvent, InternalResult } from "../types/open-next.js";
+import type { InternalEvent, InternalResult, StreamCreator } from "../types/open-next.js";
 export declare const handler: (...args: any[]) => any;
 export declare function defaultHandler(event: InternalEvent, streamCreator?: StreamCreator): Promise<InternalResult>;

package/dist/adapters/logger.js

@@ -1,3 +1,4 @@
+import { isOpenNextError } from "../utils/error";
 export function debug(...args) {
     if (globalThis.openNextDebug) {
         console.log(...args);
@@ -22,23 +23,24 @@ export function error(...args) {
     if (args.some((arg) => isDownplayedErrorLog(arg))) {
         debug(...args);
     }
-    else if (args.some((arg) => arg.__openNextInternal)) {
+    else if (args.some((arg) => isOpenNextError(arg))) {
         // In case of an internal error, we log it with the appropriate log level
-        const error = args.find((arg) => arg.__openNextInternal);
-        if (error.logLevel === 0) {
-            debug(...args);
+        const error = args.find((arg) => isOpenNextError(arg));
+        if (error.logLevel < getOpenNextErrorLogLevel()) {
             return;
         }
+        if (error.logLevel === 0) {
+            // Display the name and the message instead of full Open Next errors.
+            // console.log is used so that logging does not depend on openNextDebug.
+            return console.log(...args.map((arg) => isOpenNextError(arg) ? `${arg.name}: ${arg.message}` : arg));
+        }
         if (error.logLevel === 1) {
-            warn(...args);
-            return;
+            // Display the name and the message instead of full Open Next errors.
+            return warn(...args.map((arg) => isOpenNextError(arg) ? `${arg.name}: ${arg.message}` : arg));
         }
-        console.error(...args);
-        return;
-    }
-    else {
-        console.error(...args);
+        return console.error(...args);
     }
+    console.error(...args);
 }
 export const awsLogger = {
     trace: () => { },
@@ -47,3 +49,22 @@ export const awsLogger = {
     warn,
     error,
 };
+/**
+ * Retrieves the log level for internal errors from the
+ * OPEN_NEXT_ERROR_LOG_LEVEL environment variable.
+ *
+ * @returns The numerical log level 0 (debug), 1 (warn), or 2 (error)
+ */
+function getOpenNextErrorLogLevel() {
+    const strLevel = process.env.OPEN_NEXT_ERROR_LOG_LEVEL ?? "1";
+    switch (strLevel.toLowerCase()) {
+        case "debug":
+        case "0":
+            return 0;
+        case "error":
+        case "2":
+            return 2;
+        default:
+            return 1;
+    }
+}

package/dist/adapters/plugins/image-optimization/image-optimization.d.ts

@@ -8,4 +8,5 @@ export declare function optimizeImage(headers: APIGatewayProxyEventHeaders, imag
     maxAge: number;
     etag: string;
     upstreamEtag: string;
+    error?: unknown;
 }>;

package/dist/adapters/plugins/image-optimization/image-optimization.js

@@ -5,7 +5,6 @@ import { debug } from "../../logger.js";
 export async function optimizeImage(headers, imageParams, nextConfig, handleRequest) {
     const result = await imageOptimizer({ headers }, {}, // res object is not necessary as it's not actually used.
     imageParams, nextConfig, false, // not in dev mode
-    // @ts-expect-error - This file is used only for Next 14.1 and below. Typing is correct for these versions.
     handleRequest);
     debug("optimized result", result);
     return result;

package/dist/adapters/plugins/image-optimization/image-optimization.replacement.d.ts

@@ -8,4 +8,5 @@ export declare function optimizeImage(headers: APIGatewayProxyEventHeaders, imag
     maxAge: number;
     etag: string;
     upstreamEtag: string;
+    error?: unknown;
 }>;

package/dist/build/bundleNextServer.d.ts

@@ -1,3 +1,3 @@
-export declare function bundleNextServer(outputDir: string, appPath: string, { debug }: {
-    debug?: boolean | undefined;
+export declare function bundleNextServer(outputDir: string, appPath: string, { minify }: {
+    minify?: boolean | undefined;
 }): Promise<void>;

package/dist/build/bundleNextServer.js

@@ -35,7 +35,7 @@ const externals = [
     // Adding it cause to add a lot of unnecessary deps
     "next/dist/compiled/next-server",
 ];
-export async function bundleNextServer(outputDir, appPath, { debug = false }) {
+export async function bundleNextServer(outputDir, appPath, { minify = true }) {
     const require = createRequire(`${appPath}/package.json`);
     const entrypoint = require.resolve("next/dist/esm/server/next-server.js");
     await build({
@@ -46,7 +46,7 @@ export async function bundleNextServer(outputDir, appPath, { debug = false }) {
         // packages: "external",
         format: "cjs",
         external: externals,
-        minify: !debug,
+        minify,
         outfile: path.join(outputDir, "next-server.runtime.prod.js"),
         sourcemap: false,
         plugins: [

package/dist/build/copyTracedFiles.js

@@ -79,7 +79,7 @@ File ${fullFilePath} does not exist
         }
         catch (e) {
             if (alternativePath) {
-                computeCopyFilesForPage(alternativePath);
+                safeComputeCopyFilesForPage(alternativePath);
             }
         }
     };

package/dist/build/createAssets.js

@@ -1,7 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
-import { isBinaryContentType } from "../adapters/binary.js";
 import logger from "../logger.js";
+import { isBinaryContentType } from "../utils/binary.js";
 import * as buildHelper from "./helper.js";
 export function createStaticAssets(options) {
     logger.info("Bundling static assets...");

package/dist/build/createMiddleware.js

@@ -20,7 +20,7 @@ export async function createMiddleware(options, { forceOnlyBuildOnce = false } =
         const outputPath = path.join(outputDir, "middleware");
         fs.mkdirSync(outputPath, { recursive: true });
         // Copy open-next.config.mjs
-        buildHelper.copyOpenNextConfig(options.buildDir, outputPath, config.middleware.override?.wrapper === "cloudflare");
+        buildHelper.copyOpenNextConfig(options.buildDir, outputPath, await buildHelper.isEdgeRuntime(config.middleware.override));
         // Bundle middleware
         await buildEdgeBundle({
             entrypoint: path.join(options.openNextDistDir, "adapters", "middleware.js"),

package/dist/build/createServerBundle.js

@@ -77,7 +77,6 @@ async function generateBundle(name, options, fnOptions) {
     //       `node_modules` inside `.next/standalone`, and others inside
     //       `.next/standalone/package/path` (ie. `.next`, `server.js`).
     //       We need to output the handler file inside the package path.
-    const isMonorepo = monorepoRoot !== appPath;
     const packagePath = path.relative(monorepoRoot, appBuildOutputPath);
     fs.mkdirSync(path.join(outputPath, packagePath), { recursive: true });
     const ext = fnOptions.runtime === "deno" ? "mjs" : "cjs";
@@ -89,7 +88,7 @@ async function generateBundle(name, options, fnOptions) {
     const isBundled = fnOptions.experimentalBundledNextServer ?? false;
     if (isBundled) {
         await bundleNextServer(path.join(outputPath, packagePath), appPath, {
-            debug: options.debug,
+            minify: options.minify,
         });
     }
     // Copy middleware
@@ -166,6 +165,7 @@ async function generateBundle(name, options, fnOptions) {
                 : {}),
         },
     }, options);
+    const isMonorepo = monorepoRoot !== appPath;
     if (isMonorepo) {
         addMonorepoEntrypoint(outputPath, packagePath);
     }
@@ -208,7 +208,7 @@ function addMonorepoEntrypoint(outputPath, packagePath) {
     //       that re-exports the real handler.
     // Always use posix path for import path
     const packagePosixPath = packagePath.split(path.sep).join(path.posix.sep);
-    fs.writeFileSync(path.join(outputPath, "index.mjs"), [`export * from "./${packagePosixPath}/index.mjs";`].join(""));
+    fs.writeFileSync(path.join(outputPath, "index.mjs"), `export * from "./${packagePosixPath}/index.mjs";`);
 }
 async function minifyServerBundle(outputDir) {
     logger.info("Minimizing server function...");

package/dist/build/edge/createEdgeBundle.d.ts

@@ -1,7 +1,7 @@
 import type { MiddlewareInfo } from "../../types/next-types";
 import type { IncludedConverter, IncludedOriginResolver, LazyLoadedOverride, OverrideOptions, SplittedFunctionOptions } from "../../types/open-next";
 import type { OriginResolver } from "../../types/overrides.js";
-import type { BuildOptions } from "../helper.js";
+import { type BuildOptions } from "../helper.js";
 interface BuildEdgeBundleOptions {
     middlewareInfo?: MiddlewareInfo;
     entrypoint: string;

package/dist/build/edge/createEdgeBundle.js

@@ -6,11 +6,10 @@ import logger from "../../logger.js";
 import { openNextEdgePlugins } from "../../plugins/edge.js";
 import { openNextReplacementPlugin } from "../../plugins/replacement.js";
 import { openNextResolvePlugin } from "../../plugins/resolve.js";
+import { isEdgeRuntime } from "../helper.js";
 import { copyOpenNextConfig, esbuildAsync } from "../helper.js";
 export async function buildEdgeBundle({ middlewareInfo, entrypoint, outfile, options, defaultConverter, overrides, additionalInject, includeCache, additionalExternals, onlyBuildOnce, name, }) {
-    const isInCloudfare = typeof overrides?.wrapper === "string"
-        ? overrides.wrapper === "cloudflare"
-        : (await overrides?.wrapper?.())?.edgeRuntime;
+    const isInCloudfare = await isEdgeRuntime(overrides);
     await esbuildAsync({
         entryPoints: [entrypoint],
         bundle: true,
@@ -76,20 +75,32 @@ globalThis.Buffer = Buffer;
 
 import {AsyncLocalStorage} from "node:async_hooks";
 globalThis.AsyncLocalStorage = AsyncLocalStorage;
+
+${""
+            /**
+             * Next.js sets this `__import_unsupported` on `globalThis` (with `configurable: false`):
+             *  https://github.com/vercel/next.js/blob/5b7833e3/packages/next/src/server/web/globals.ts#L94-L98
+             *
+             * It does so in both the middleware and the main server, so if the middleware runs in the same place
+             * as the main handler this code gets run twice triggering a runtime error.
+             *
+             * For this reason we need to patch `Object.defineProperty` to avoid this issue.
+             */
+            }
+const defaultDefineProperty = Object.defineProperty;
+Object.defineProperty = function(o, p, a) {
+  if(p=== '__import_unsupported' && Boolean(globalThis.__import_unsupported)) {
+    return;
+  }
+  return defaultDefineProperty(o, p, a);
+};
+
   ${isInCloudfare
                 ? ""
                 : `
   const require = (await import("node:module")).createRequire(import.meta.url);
   const __filename = (await import("node:url")).fileURLToPath(import.meta.url);
   const __dirname = (await import("node:path")).dirname(__filename);
-
-  const defaultDefineProperty = Object.defineProperty;
-  Object.defineProperty = function(o, p, a) {
-    if(p=== '__import_unsupported' && Boolean(globalThis.__import_unsupported)) {
-      return;
-    }
-    return defaultDefineProperty(o, p, a);
-  };
   `}
   ${additionalInject ?? ""}
   `,
@@ -101,7 +112,7 @@ globalThis.AsyncLocalStorage = AsyncLocalStorage;
             outfile,
             allowOverwrite: true,
             bundle: true,
-            minify: !options.debug,
+            minify: options.minify,
             platform: "node",
             format: "esm",
             conditions: ["workerd", "worker", "browser"],

package/dist/build/helper.d.ts

@@ -1,5 +1,5 @@
 import type { BuildOptions as ESBuildOptions } from "esbuild";
-import type { OpenNextConfig } from "../types/open-next.js";
+import type { DefaultOverrideOptions, OpenNextConfig } from "../types/open-next.js";
 export type BuildOptions = ReturnType<typeof normalizeOptions>;
 export declare function normalizeOptions(config: OpenNextConfig, distDir: string, tempBuildDir: string): {
     appBuildOutputPath: string;
@@ -9,6 +9,7 @@ export declare function normalizeOptions(config: OpenNextConfig, distDir: string
     buildDir: string;
     config: OpenNextConfig;
     debug: boolean;
+    minify: boolean;
     monorepoRoot: string;
     nextVersion: string;
     openNextVersion: string;
@@ -68,3 +69,7 @@ export declare function printOpenNextVersion(options: BuildOptions): void;
  * the app directory, but the compiled config is in the root of the monorepo.
  */
 export declare function initOutputDir(options: BuildOptions): void;
+/**
+ * @returns Whether the edge runtime is used
+ */
+export declare function isEdgeRuntime(overrides: DefaultOverrideOptions | undefined): Promise<boolean | undefined>;

package/dist/build/helper.js

@@ -21,6 +21,7 @@ export function normalizeOptions(config, distDir, tempBuildDir) {
     else {
         appPackageJsonPath = findNextPackageJsonPath(appPath, monorepoRoot);
     }
+    const debug = Boolean(process.env.OPEN_NEXT_DEBUG) ?? false;
     return {
         appBuildOutputPath: buildOutputPath,
         appPackageJsonPath,
@@ -28,7 +29,9 @@ export function normalizeOptions(config, distDir, tempBuildDir) {
         appPublicPath: path.join(appPath, "public"),
         buildDir: path.join(outputDir, ".build"),
         config,
-        debug: Boolean(process.env.OPEN_NEXT_DEBUG) ?? false,
+        debug,
+        // Whether ESBuild should minify the code
+        minify: !debug,
         monorepoRoot,
         nextVersion: getNextVersion(appPath),
         openNextVersion: getOpenNextVersion(),
@@ -68,13 +71,13 @@ function findNextPackageJsonPath(appPath, root) {
         : path.join(root, "./package.json");
 }
 export function esbuildSync(esbuildOptions, options) {
-    const { openNextVersion, debug } = options;
+    const { openNextVersion, debug, minify } = options;
     const result = buildSync({
         target: "esnext",
         format: "esm",
         platform: "node",
         bundle: true,
-        minify: !debug,
+        minify,
         mainFields: ["module", "main"],
         sourcemap: debug ? "inline" : false,
         sourcesContent: false,
@@ -95,13 +98,13 @@ export function esbuildSync(esbuildOptions, options) {
     }
 }
 export async function esbuildAsync(esbuildOptions, options) {
-    const { openNextVersion, debug } = options;
+    const { openNextVersion, debug, minify } = options;
     const result = await buildAsync({
         target: "esnext",
         format: "esm",
         platform: "node",
         bundle: true,
-        minify: !debug,
+        minify,
         mainFields: ["module", "main"],
         sourcemap: debug ? "inline" : false,
         sourcesContent: false,
@@ -261,3 +264,15 @@ export function initOutputDir(options) {
     fs.mkdirSync(buildDir, { recursive: true });
     fs.cpSync(options.tempBuildDir, buildDir, { recursive: true });
 }
+/**
+ * @returns Whether the edge runtime is used
+ */
+export async function isEdgeRuntime(overrides) {
+    if (!overrides?.wrapper) {
+        return false;
+    }
+    if (typeof overrides.wrapper === "string") {
+        return ["cloudflare-edge", "cloudflare"].includes(overrides.wrapper);
+    }
+    return (await overrides?.wrapper?.())?.edgeRuntime;
+}

package/dist/build/validateConfig.js

@@ -8,6 +8,8 @@ const compatibilityMatrix = {
     ],
     "aws-lambda-streaming": ["aws-apigw-v2"],
     cloudflare: ["edge"],
+    "cloudflare-edge": ["edge"],
+    "cloudflare-node": ["edge"],
     node: ["node"],
     dummy: [],
 };
@@ -63,7 +65,7 @@ export function validateConfig(config) {
         logger.warn("You've disabled incremental cache. This means that ISR and SSG will not work.");
     }
     if (config.dangerous?.disableTagCache) {
-        logger.warn(`You've disabled tag cache. 
+        logger.warn(`You've disabled tag cache.
        This means that revalidatePath and revalidateTag from next/cache will not work.
        It is safe to disable if you only use page router`);
     }

package/dist/core/requestHandler.d.ts

@@ -1,3 +1,2 @@
-import type { StreamCreator } from "../http/index.js";
-import type { InternalEvent, InternalResult } from "../types/open-next";
+import type { InternalEvent, InternalResult, StreamCreator } from "../types/open-next";
 export declare function openNextHandler(internalEvent: InternalEvent, responseStreaming?: StreamCreator): Promise<InternalResult>;

package/dist/core/requestHandler.js

@@ -16,23 +16,23 @@ export async function openNextHandler(internalEvent, responseStreaming) {
             internalEvent.headers.host = internalEvent.headers["x-forwarded-host"];
         }
         debug("internalEvent", internalEvent);
-        let preprocessResult = {
-            internalEvent: internalEvent,
+        let routingResult = {
+            internalEvent,
             isExternalRewrite: false,
             origin: false,
             isISR: false,
         };
         //#override withRouting
         try {
-            preprocessResult = await routingHandler(internalEvent);
+            routingResult = await routingHandler(internalEvent);
         }
         catch (e) {
             warn("Routing failed.", e);
         }
         //#endOverride
-        const headers = "type" in preprocessResult
-            ? preprocessResult.headers
-            : preprocessResult.internalEvent.headers;
+        const headers = "type" in routingResult
+            ? routingResult.headers
+            : routingResult.internalEvent.headers;
         const overwrittenResponseHeaders = {};
         for (const [rawKey, value] of Object.entries(headers)) {
             if (!rawKey.startsWith(MIDDLEWARE_HEADER_PREFIX)) {
@@ -43,14 +43,14 @@ export async function openNextHandler(internalEvent, responseStreaming) {
             headers[key] = value;
             delete headers[rawKey];
         }
-        if ("isExternalRewrite" in preprocessResult &&
-            preprocessResult.isExternalRewrite === true) {
+        if ("isExternalRewrite" in routingResult &&
+            routingResult.isExternalRewrite === true) {
             try {
-                preprocessResult = await globalThis.proxyExternalRequest.proxy(preprocessResult.internalEvent);
+                routingResult = await globalThis.proxyExternalRequest.proxy(routingResult.internalEvent);
             }
             catch (e) {
                 error("External request failed.", e);
-                preprocessResult = {
+                routingResult = {
                     internalEvent: {
                         type: "core",
                         rawPath: "/500",
@@ -68,22 +68,22 @@ export async function openNextHandler(internalEvent, responseStreaming) {
                 };
             }
         }
-        if ("type" in preprocessResult) {
+        if ("type" in routingResult) {
             // response is used only in the streaming case
             if (responseStreaming) {
                 const response = createServerResponse(internalEvent, headers, responseStreaming);
-                response.statusCode = preprocessResult.statusCode;
+                response.statusCode = routingResult.statusCode;
                 response.flushHeaders();
-                const [bodyToConsume, bodyToReturn] = preprocessResult.body.tee();
+                const [bodyToConsume, bodyToReturn] = routingResult.body.tee();
                 for await (const chunk of bodyToConsume) {
                     response.write(chunk);
                 }
                 response.end();
-                preprocessResult.body = bodyToReturn;
+                routingResult.body = bodyToReturn;
             }
-            return preprocessResult;
+            return routingResult;
         }
-        const preprocessedEvent = preprocessResult.internalEvent;
+        const preprocessedEvent = routingResult.internalEvent;
         debug("preprocessedEvent", preprocessedEvent);
         const reqProps = {
             method: preprocessedEvent.method,

package/dist/core/routing/matcher.js

@@ -227,7 +227,7 @@ export function handleRedirects(event, redirects) {
 }
 export function fixDataPage(internalEvent, buildId) {
     const { rawPath, query } = internalEvent;
-    const dataPattern = `/_next/data/${buildId}`;
+    const dataPattern = `${NextConfig.basePath ?? ""}/_next/data/${buildId}`;
     // Return 404 for data requests that don't match the buildId
     if (rawPath.startsWith("/_next/data") && !rawPath.startsWith(dataPattern)) {
         return {

package/dist/core/routing/middleware.d.ts

@@ -1,11 +1,11 @@
 import type { InternalEvent, InternalResult } from "../../types/open-next.js";
-type MiddlewareOutputEvent = InternalEvent & {
+type MiddlewareEvent = InternalEvent & {
     responseHeaders?: Record<string, string | string[]>;
-    externalRewrite?: boolean;
+    isExternalRewrite?: boolean;
 };
 type Middleware = (request: Request) => Response | Promise<Response>;
 type MiddlewareLoader = () => Promise<{
     default: Middleware;
 }>;
-export declare function handleMiddleware(internalEvent: InternalEvent, middlewareLoader?: MiddlewareLoader): Promise<MiddlewareOutputEvent | InternalResult>;
+export declare function handleMiddleware(internalEvent: InternalEvent, middlewareLoader?: MiddlewareLoader): Promise<MiddlewareEvent | InternalResult>;
 export {};

package/dist/core/routing/middleware.js

@@ -114,7 +114,7 @@ export async function handleMiddleware(internalEvent, middlewareLoader = default
     // NOTE: the header was added to `req` from above
     const rewriteUrl = responseHeaders.get("x-middleware-rewrite");
     let rewritten = false;
-    let externalRewrite = false;
+    let isExternalRewrite = false;
     let middlewareQueryString = internalEvent.query;
     let newUrl = internalEvent.url;
     if (rewriteUrl) {
@@ -122,7 +122,7 @@ export async function handleMiddleware(internalEvent, middlewareLoader = default
         if (isExternal(rewriteUrl, internalEvent.headers.host)) {
             newUrl = rewriteUrl;
             rewritten = true;
-            externalRewrite = true;
+            isExternalRewrite = true;
         }
         else {
             const rewriteUrlObject = new URL(rewriteUrl);
@@ -147,7 +147,6 @@ export async function handleMiddleware(internalEvent, middlewareLoader = default
     if (result.body) {
         // transfer response body to res
         const body = result.body;
-        // await pipeReadable(result.response.body, res);
         return {
             type: internalEvent.type,
             statusCode: statusCode,
@@ -169,6 +168,6 @@ export async function handleMiddleware(internalEvent, middlewareLoader = default
         query: middlewareQueryString,
         cookies: internalEvent.cookies,
         remoteAddress: internalEvent.remoteAddress,
-        externalRewrite,
+        isExternalRewrite,
     };
 }

package/dist/core/routing/util.d.ts

@@ -1,8 +1,8 @@
 import type { OutgoingHttpHeaders } from "node:http";
-import type { IncomingMessage, StreamCreator } from "../../http/index.js";
+import type { IncomingMessage } from "../../http/index.js";
 import { OpenNextNodeResponse } from "../../http/openNextResponse.js";
 import type { MiddlewareManifest } from "../../types/next-types";
-import type { InternalEvent, InternalResult } from "../../types/open-next.js";
+import type { InternalEvent, InternalResult, StreamCreator } from "../../types/open-next.js";
 /**
  *
  * @__PURE__

package/dist/core/routing/util.js

@@ -3,8 +3,8 @@ import { Readable } from "node:stream";
 import { BuildId, HtmlPages, NextConfig } from "../../adapters/config/index.js";
 import { OpenNextNodeResponse } from "../../http/openNextResponse.js";
 import { parseHeaders } from "../../http/util.js";
-import { isBinaryContentType } from "../../adapters/binary.js";
 import { debug, error } from "../../adapters/logger.js";
+import { isBinaryContentType } from "../../utils/binary.js";
 /**
  *
  * @__PURE__

package/dist/core/routingHandler.d.ts

@@ -1,10 +1,4 @@
-import type { InternalEvent, InternalResult, Origin } from "../types/open-next";
+import type { InternalEvent, InternalResult, RoutingResult } 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;
-    origin: Origin | false;
-    isISR: boolean;
-}
-export default function routingHandler(event: InternalEvent): Promise<InternalResult | MiddlewareOutputEvent>;
+export default function routingHandler(event: InternalEvent): Promise<InternalResult | RoutingResult>;

package/dist/core/routingHandler.js

@@ -60,15 +60,15 @@ export default async function routingHandler(event) {
         debug("redirect", redirect);
         return redirect;
     }
-    const middleware = await handleMiddleware(internalEvent);
-    let middlewareResponseHeaders = {};
-    if ("statusCode" in middleware) {
-        return middleware;
+    const eventOrResult = await handleMiddleware(internalEvent);
+    const isResult = "statusCode" in eventOrResult;
+    if (isResult) {
+        return eventOrResult;
     }
-    middlewareResponseHeaders = middleware.responseHeaders || {};
-    internalEvent = middleware;
-    // At this point internalEvent is an InternalEvent or a MiddlewareOutputEvent
-    let isExternalRewrite = middleware.externalRewrite ?? false;
+    const middlewareResponseHeaders = eventOrResult.responseHeaders;
+    let isExternalRewrite = eventOrResult.isExternalRewrite ?? false;
+    // internalEvent is `InternalEvent | MiddlewareEvent`
+    internalEvent = eventOrResult;
     if (!isExternalRewrite) {
         // First rewrite to be applied
         const beforeRewrites = handleRewrites(internalEvent, RoutesManifest.rewrites.beforeFiles);

package/dist/helpers/withCloudflare.d.ts

@@ -57,7 +57,7 @@ export declare function withCloudflare<Fn extends Record<string, CloudflareCompa
         external: true;
         originResolver: "pattern-env";
         override: {
-            wrapper: "cloudflare";
+            wrapper: "cloudflare-edge";
             converter: "edge";
         };
     };

package/dist/helpers/withCloudflare.js

@@ -36,7 +36,7 @@ export function withCloudflare(config) {
                     routes: [fn.routes],
                     patterns: [fn.patterns],
                     override: {
-                        wrapper: "cloudflare",
+                        wrapper: "cloudflare-edge",
                         converter: "edge",
                     },
                 }
@@ -50,7 +50,7 @@ export function withCloudflare(config) {
             external: true,
             originResolver: "pattern-env",
             override: {
-                wrapper: "cloudflare",
+                wrapper: "cloudflare-edge",
                 converter: "edge",
             },
         },

package/dist/http/openNextResponse.d.ts

@@ -1,16 +1,8 @@
 import type { IncomingMessage, OutgoingHttpHeader, OutgoingHttpHeaders, ServerResponse } from "node:http";
 import type { Socket } from "node:net";
-import type { TransformCallback, Writable } from "node:stream";
+import type { TransformCallback } from "node:stream";
 import { Transform } from "node:stream";
-export interface StreamCreator {
-    writeHeaders(prelude: {
-        statusCode: number;
-        cookies: string[];
-        headers: Record<string, string>;
-    }): Writable;
-    onWrite?: () => void;
-    onFinish: (length: number) => void;
-}
+import type { StreamCreator } from "../types/open-next";
 export declare class OpenNextNodeResponse extends Transform implements ServerResponse {
     private fixHeaders;
     private onEnd;

package/dist/http/openNextResponse.js

@@ -64,7 +64,9 @@ export class OpenNextNodeResponse extends Transform {
         return this;
     }
     get finished() {
-        return Boolean(this.writableFinished && this.responseStream?.writableFinished);
+        return this.responseStream
+            ? this.responseStream?.writableFinished
+            : this.writableFinished;
     }
     setHeader(name, value) {
         const key = name.toLowerCase();
@@ -125,7 +127,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]?.toString());
             this._cookies =
                 mergeHeadersPriority === "middleware"
                     ? [...this._cookies, ...initialCookies]
@@ -226,7 +228,7 @@ export class OpenNextNodeResponse extends Transform {
             ?.getStore()
             ?.pendingPromiseRunner.add(this.onEnd(this.headers));
         const bodyLength = this.getBody().length;
-        this.streamCreator?.onFinish(bodyLength);
+        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

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

@@ -3,7 +3,8 @@ import { fromReadableStream } from "../../utils/stream";
 import { debug } from "../../adapters/logger";
 import { convertToQuery } from "../../core/routing/util";
 import { removeUndefinedFromQuery } from "./utils";
-// Not sure which one is reallly needed as this is not documented anywhere but server actions redirect are not working without this, it causes a 500 error from cloudfront itself with a 'x-amzErrortype: InternalFailure' header
+// Not sure which one is really needed as this is not documented anywhere but server actions redirect are not working without this,
+// it causes a 500 error from cloudfront itself with a 'x-amzErrortype: InternalFailure' header
 const CloudFrontBlacklistedHeaders = [
     "connection",
     "expect",

package/dist/overrides/converters/aws-cloudfront.js

@@ -1,7 +1,7 @@
 import { parseCookies } from "../../http/util";
 import { fromReadableStream } from "../../utils/stream";
 import { debug } from "../../adapters/logger";
-import { convertToQuery, convertToQueryString, } from "../../core/routing/util";
+import { convertToQuery, convertToQueryString } from "../../core/routing/util";
 const cloudfrontBlacklistedHeaders = [
     // Disallowed headers, see: https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/edge-function-restrictions-all.html#function-restrictions-disallowed-headers
     "connection",

package/dist/overrides/converters/edge.d.ts

@@ -1,10 +1,7 @@
-import type { InternalEvent, InternalResult } from "../../types/open-next";
+import type { InternalEvent, InternalResult, MiddlewareResult } from "../../types/open-next";
 import type { Converter } from "../../types/overrides";
-import type { MiddlewareOutputEvent } from "../../core/routingHandler";
 declare global {
     var __dangerous_ON_edge_converter_returns_request: boolean | undefined;
 }
-declare const converter: Converter<InternalEvent, InternalResult | ({
-    type: "middleware";
-} & MiddlewareOutputEvent)>;
+declare const converter: Converter<InternalEvent, InternalResult | MiddlewareResult>;
 export default converter;

package/dist/overrides/converters/edge.js

@@ -2,7 +2,8 @@ import { Buffer } from "node:buffer";
 import { parseCookies } from "../../http/util";
 const converter = {
     convertFrom: async (event) => {
-        const searchParams = new URL(event.url).searchParams;
+        const url = new URL(event.url);
+        const searchParams = url.searchParams;
         const query = {};
         for (const [key, value] of searchParams.entries()) {
             if (key in query) {
@@ -17,13 +18,13 @@ const converter = {
                 query[key] = value;
             }
         }
-        //Transform body into Buffer
+        // Transform body into Buffer
         const body = await event.arrayBuffer();
         const headers = {};
         event.headers.forEach((value, key) => {
             headers[key] = value;
         });
-        const rawPath = new URL(event.url).pathname;
+        const rawPath = url.pathname;
         const method = event.method;
         const shouldHaveBody = method !== "GET" && method !== "HEAD";
         const cookies = Object.fromEntries(parseCookies(event.headers.get("cookie")).map((cookie) => cookie.split("=")));
@@ -79,7 +80,7 @@ const converter = {
         }
         return new Response(result.body, {
             status: result.statusCode,
-            headers: headers,
+            headers,
         });
     },
     name: "edge",

package/dist/overrides/incrementalCache/dummy.js

@@ -1,13 +1,14 @@
+import { IgnorableError } from "../../utils/error";
 const dummyIncrementalCache = {
     name: "dummy",
     get: async () => {
-        throw new Error("Dummy cache is not implemented");
+        throw new IgnorableError('"Dummy" cache does not cache anything');
     },
     set: async () => {
-        throw new Error("Dummy cache is not implemented");
+        throw new IgnorableError('"Dummy" cache does not cache anything');
     },
     delete: async () => {
-        throw new Error("Dummy cache is not implemented");
+        throw new IgnorableError('"Dummy" cache does not cache anything');
     },
 };
 export default dummyIncrementalCache;

package/dist/overrides/proxyExternalRequest/dummy.js

@@ -1,7 +1,8 @@
+import { FatalError } from "../../utils/error";
 const DummyProxyExternalRequest = {
     name: "dummy",
     proxy: async (_event) => {
-        throw new Error("This is a dummy implementation");
+        throw new FatalError("This is a dummy implementation");
     },
 };
 export default DummyProxyExternalRequest;

package/dist/overrides/proxyExternalRequest/node.js

@@ -1,7 +1,7 @@
-import { debug, error } from "node:console";
 import { request } from "node:https";
 import { Readable } from "node:stream";
-import { isBinaryContentType } from "../../adapters/binary";
+import { debug, error } from "../../adapters/logger";
+import { isBinaryContentType } from "../../utils/binary";
 function filterHeadersForProxy(headers) {
     const filteredHeaders = {};
     const disallowedHeaders = [

package/dist/overrides/queue/dummy.js

@@ -1,7 +1,8 @@
+import { FatalError } from "../../utils/error";
 const dummyQueue = {
     name: "dummy",
     send: async () => {
-        throw new Error("Dummy queue is not implemented");
+        throw new FatalError("Dummy queue is not implemented");
     },
 };
 export default dummyQueue;

package/dist/overrides/warmer/dummy.js

@@ -1,7 +1,8 @@
+import { FatalError } from "../../utils/error";
 const dummyWarmer = {
     name: "dummy",
     invoke: async (_) => {
-        throw new Error("Dummy warmer is not implemented");
+        throw new FatalError("Dummy warmer is not implemented");
     },
 };
 export default dummyWarmer;

package/dist/overrides/wrappers/aws-lambda-streaming.d.ts

@@ -2,6 +2,6 @@ import type { WrapperHandler } from "../../types/overrides";
 declare const _default: {
     wrapper: WrapperHandler;
     name: string;
-    supportStreaming: boolean;
+    supportStreaming: true;
 };
 export default _default;

package/dist/overrides/wrappers/aws-lambda-streaming.js

@@ -62,10 +62,6 @@ const handler = async (handler, converter) => awslambda.streamifyResponse(async
             responseStream.write(new Uint8Array(8));
             return compressedStream ?? responseStream;
         },
-        onWrite: () => {
-            // _hasWriten = true;
-        },
-        onFinish: () => { },
     };
     const response = await handler(internalEvent, streamCreator);
     const isUsingEdge = globalThis.isEdgeRuntime ?? false;

package/dist/overrides/wrappers/aws-lambda.js

@@ -25,9 +25,6 @@ const handler = async (handler, converter) => async (event) => {
                 },
             });
         },
-        onFinish: () => {
-            // Do nothing
-        },
     };
     const response = await handler(internalEvent, fakeStream);
     return converter.convertTo(response, event);

package/dist/overrides/wrappers/cloudflare-edge.d.ts

@@ -0,0 +1,9 @@
+import type { InternalEvent, InternalResult, MiddlewareResult } from "../../types/open-next";
+import type { WrapperHandler } from "../../types/overrides";
+declare const _default: {
+    wrapper: WrapperHandler<InternalEvent, InternalResult | MiddlewareResult>;
+    name: string;
+    supportStreaming: true;
+    edgeRuntime: true;
+};
+export default _default;

package/dist/overrides/wrappers/{cloudflare.js → cloudflare-edge.js}

@@ -21,8 +21,8 @@ const handler = async (handler, converter) => async (request, env, ctx) => {
     // Note: This code could be moved to a cloudflare specific converter when one is created.
     const cfProperties = request.cf;
     for (const [propName, headerName] of Object.entries(cfPropNameToHeaderName)) {
-        const propValue = cfProperties[propName];
-        if (propValue !== null) {
+        const propValue = cfProperties?.[propName];
+        if (propValue != null) {
             internalEvent.headers[headerName] = propValue;
         }
     }
@@ -32,7 +32,7 @@ const handler = async (handler, converter) => async (request, env, ctx) => {
 };
 export default {
     wrapper: handler,
-    name: "cloudflare",
+    name: "cloudflare-edge",
     supportStreaming: true,
     edgeRuntime: true,
 };

package/dist/overrides/wrappers/cloudflare-node.d.ts

@@ -0,0 +1,8 @@
+import type { InternalEvent, InternalResult } from "../../types/open-next";
+import type { WrapperHandler } from "../../types/overrides";
+declare const _default: {
+    wrapper: WrapperHandler<InternalEvent, InternalResult>;
+    name: string;
+    supportStreaming: true;
+};
+export default _default;

package/dist/overrides/wrappers/cloudflare-node.js

@@ -0,0 +1,47 @@
+import { Writable } from "node:stream";
+const handler = async (handler, converter) => async (request, env, ctx) => {
+    globalThis.process = process;
+    globalThis.openNextWaitUntil = ctx.waitUntil.bind(ctx);
+    // Set the environment variables
+    // Cloudflare suggests to not override the process.env object but instead apply the values to it
+    for (const [key, value] of Object.entries(env)) {
+        if (typeof value === "string") {
+            process.env[key] = value;
+        }
+    }
+    const internalEvent = await converter.convertFrom(request);
+    // TODO:
+    // The edge converter populate event.url with the url including the origin.
+    // This is required for middleware to keep track of the protocol (i.e. http with wrangler dev).
+    // However the server expects that the origin is not included.
+    const url = new URL(internalEvent.url);
+    internalEvent.url = url.href.slice(url.origin.length);
+    const { promise: promiseResponse, resolve: resolveResponse } = Promise.withResolvers();
+    const streamCreator = {
+        writeHeaders(prelude) {
+            const { statusCode, cookies, headers } = prelude;
+            const responseHeaders = new Headers(headers);
+            for (const cookie of cookies) {
+                responseHeaders.append("Set-Cookie", cookie);
+            }
+            const { readable, writable } = new TransformStream({
+                transform(chunk, controller) {
+                    controller.enqueue(Uint8Array.from(chunk.chunk ?? chunk));
+                },
+            });
+            const response = new Response(readable, {
+                status: statusCode,
+                headers: responseHeaders,
+            });
+            resolveResponse(response);
+            return Writable.fromWeb(writable);
+        },
+    };
+    ctx.waitUntil(handler(internalEvent, streamCreator));
+    return promiseResponse;
+};
+export default {
+    wrapper: handler,
+    name: "cloudflare-node",
+    supportStreaming: true,
+};

package/dist/overrides/wrappers/dummy.d.ts

@@ -1,7 +1,7 @@
 import type { WrapperHandler } from "../../types/overrides";
 declare const _default: {
     name: string;
-    handler: WrapperHandler;
-    supportStreaming: boolean;
+    wrapper: WrapperHandler;
+    supportStreaming: false;
 };
 export default _default;

package/dist/overrides/wrappers/dummy.js

@@ -1,6 +1,6 @@
 const dummyWrapper = async () => async () => undefined;
 export default {
     name: "dummy",
-    handler: dummyWrapper,
+    wrapper: dummyWrapper,
     supportStreaming: false,
 };

package/dist/overrides/wrappers/node.d.ts

@@ -2,6 +2,6 @@ import type { WrapperHandler } from "../../types/overrides";
 declare const _default: {
     wrapper: WrapperHandler;
     name: string;
-    supportStreaming: boolean;
+    supportStreaming: true;
 };
 export default _default;

package/dist/overrides/wrappers/node.js

@@ -11,9 +11,6 @@ const wrapper = async (handler, converter) => {
                 res.uncork();
                 return res;
             },
-            onFinish: () => {
-                // Is it necessary to do something here?
-            },
         };
         if (internalEvent.rawPath === "/__health") {
             res.writeHead(200, {

package/dist/plugins/resolve.js

@@ -43,10 +43,14 @@ export function openNextResolvePlugin({ overrides, fnName, }) {
             build.onLoad({ filter: /core(\/|\\)resolve\.js/g }, async (args) => {
                 let contents = readFileSync(args.path, "utf-8");
                 const overridesEntries = Object.entries(overrides ?? {});
-                for (const [overrideName, overrideValue] of overridesEntries) {
+                for (let [overrideName, overrideValue] of overridesEntries) {
                     if (!overrideValue) {
                         continue;
                     }
+                    if (overrideName === "wrapper" && overrideValue === "cloudflare") {
+                        // "cloudflare" is deprecated and replaced by "cloudflare-edge".
+                        overrideValue = "cloudflare-edge";
+                    }
                     const folder = nameToFolder[overrideName];
                     const defaultOverride = defaultOverrides[overrideName];
                     contents = contents.replace(`../overrides/${folder}/${defaultOverride}.js`, `../overrides/${folder}/${getOverrideOrDummy(overrideValue)}.js`);

package/dist/types/open-next.d.ts

@@ -1,4 +1,5 @@
 import type { ReadableStream } from "node:stream/web";
+import type { Writable } from "node:stream";
 import type { WarmerEvent, WarmerResponse } from "../adapters/warmer-function";
 import type { Converter, ImageLoader, IncrementalCache, OriginResolver, ProxyExternalRequest, Queue, TagCache, Warmer, Wrapper } from "./overrides";
 export type BaseEventOrResult<T extends string = string> = {
@@ -20,6 +21,15 @@ export type InternalResult = {
     body: ReadableStream;
     isBase64Encoded: boolean;
 } & BaseEventOrResult<"core">;
+export interface StreamCreator {
+    writeHeaders(prelude: {
+        statusCode: number;
+        cookies: string[];
+        headers: Record<string, string>;
+    }): Writable;
+    onWrite?: () => void;
+    onFinish?: (length: number) => void;
+}
 export interface DangerousOptions {
     /**
      * The tag cache is used for revalidateTags and revalidatePath.
@@ -56,8 +66,16 @@ export interface Origin {
     port?: number;
     customHeaders?: Record<string, string>;
 }
-export type IncludedWrapper = "aws-lambda" | "aws-lambda-streaming" | "node" | "cloudflare" | "dummy";
+export type IncludedWrapper = "aws-lambda" | "aws-lambda-streaming" | "node" | "cloudflare" | "cloudflare-edge" | "cloudflare-node" | "dummy";
 export type IncludedConverter = "aws-apigw-v2" | "aws-apigw-v1" | "aws-cloudfront" | "edge" | "node" | "sqs-revalidate" | "dummy";
+export interface RoutingResult {
+    internalEvent: InternalEvent;
+    isExternalRewrite: boolean;
+    origin: Origin | false;
+    isISR: boolean;
+}
+export interface MiddlewareResult extends RoutingResult, BaseEventOrResult<"middleware"> {
+}
 export type IncludedQueue = "sqs" | "sqs-lite" | "dummy";
 export type IncludedIncrementalCache = "s3" | "s3-lite" | "dummy";
 export type IncludedTagCache = "dynamodb" | "dynamodb-lite" | "dummy";

package/dist/types/overrides.d.ts

@@ -1,7 +1,6 @@
 import type { Readable } from "node:stream";
-import type { StreamCreator } from "../http/index";
 import type { Meta } from "./cache";
-import type { BaseEventOrResult, BaseOverride, InternalEvent, InternalResult, Origin } from "./open-next";
+import type { BaseEventOrResult, BaseOverride, InternalEvent, InternalResult, Origin, StreamCreator } from "./open-next";
 export interface QueueMessage {
     MessageDeduplicationId: string;
     MessageBody: {

package/dist/{adapters → utils}/binary.js

@@ -27,6 +27,7 @@ const commonBinaryMimeTypes = new Set([
     "audio/3gpp",
     "audio/aac",
     "audio/basic",
+    "audio/flac",
     "audio/mpeg",
     "audio/ogg",
     "audio/wavaudio/webm",

package/dist/utils/error.d.ts

@@ -21,3 +21,4 @@ export declare class FatalError extends Error implements BaseOpenNextError {
     readonly logLevel = 2;
     constructor(message: string);
 }
+export declare function isOpenNextError(e: any): e is BaseOpenNextError & Error;

package/dist/utils/error.js

@@ -30,3 +30,11 @@ export class FatalError extends Error {
         this.name = "FatalError";
     }
 }
+export function isOpenNextError(e) {
+    try {
+        return "__openNextInternal" in e;
+    }
+    catch {
+        return false;
+    }
+}

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "bin": {
     "open-next": "./dist/index.js"
   },
@@ -47,9 +47,9 @@
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.109",
-    "@types/node": "^18.16.1",
+    "@types/node": "20.17.6",
     "tsc-alias": "^1.8.8",
-    "typescript": "^5.6.3"
+    "typescript": "5.6.3"
   },
   "bugs": {
     "url": "https://github.com/opennextjs/opennextjs-aws/issues"

package/dist/overrides/wrappers/cloudflare.d.ts

@@ -1,12 +0,0 @@
-import type { InternalEvent, InternalResult } from "../../types/open-next";
-import type { WrapperHandler } from "../../types/overrides";
-import type { MiddlewareOutputEvent } from "../../core/routingHandler";
-declare const _default: {
-    wrapper: WrapperHandler<InternalEvent, InternalResult | ({
-        type: "middleware";
-    } & MiddlewareOutputEvent)>;
-    name: string;
-    supportStreaming: boolean;
-    edgeRuntime: boolean;
-};
-export default _default;