@opennextjs/aws 3.8.4 → 3.9.0

package/dist/adapters/cache.js

@@ -102,6 +102,12 @@ export default class Cache {
             }
             if (cacheData?.type === "page" || cacheData?.type === "app") {
                 if (globalThis.isNextAfter15 && cacheData?.type === "app") {
+                    const segmentData = new Map();
+                    if (cacheData.segmentData) {
+                        for (const [segmentPath, segmentContent] of Object.entries(cacheData.segmentData ?? {})) {
+                            segmentData.set(segmentPath, Buffer.from(segmentContent));
+                        }
+                    }
                     return {
                         lastModified: _lastModified,
                         value: {
@@ -111,6 +117,7 @@ export default class Cache {
                             status: meta?.status,
                             headers: meta?.headers,
                             postponed: meta?.postponed,
+                            segmentData,
                         },
                     };
                 }

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

@@ -5,7 +5,9 @@ import { debug } from "../../logger.js";
 export async function optimizeImage(headers, imageParams, nextConfig, handleRequest) {
     const { isAbsolute, href } = imageParams;
     const imageUpstream = isAbsolute
-        ? await fetchExternalImage(href)
+        ? //@ts-expect-error - fetchExternalImage signature has changed in Next.js 16, it has an extra boolean parameter.
+            // https://github.com/vercel/next.js/blob/bfe2ab4/packages/next/src/server/image-optimizer.ts#L711
+            await fetchExternalImage(href)
         : await fetchInternalImage(href, 
         // @ts-expect-error - It is supposed to be an IncomingMessage object, but only the headers are used.
         { headers }, {}, // res object is not necessary as it's not actually used.

package/dist/build/copyTracedFiles.js

@@ -174,6 +174,7 @@ File ${serverPath} does not exist
     });
     // Only files that are actually copied
     const tracedFiles = [];
+    const erroredFiles = [];
     //Actually copy the files
     filesToCopy.forEach((to, from) => {
         // We don't want to copy excluded packages (e.g. sharp)
@@ -202,7 +203,16 @@ File ${serverPath} does not exist
             }
         }
         else {
-            copyFileSync(from, to);
+            // Adding this inside a try-catch to handle errors on Next 16+
+            // where some files listed in the .nft.json might not be present in the standalone folder
+            // TODO: investigate that further - is it expected?
+            try {
+                copyFileSync(from, to);
+            }
+            catch (e) {
+                logger.debug("Error copying file:", e);
+                erroredFiles.push(to);
+            }
         }
     });
     readdirSync(standaloneNextDir)
@@ -265,7 +275,7 @@ File ${serverPath} does not exist
     }
     logger.debug("copyTracedFiles:", Date.now() - tsStart, "ms");
     return {
-        tracedFiles,
+        tracedFiles: tracedFiles.filter((f) => !erroredFiles.includes(f)),
         nodePackages,
         manifests,
     };

package/dist/build/createAssets.js

@@ -72,6 +72,10 @@ export function createCacheAssets(options) {
     const htmlPages = buildHelper.getHtmlPages(dotNextPath);
     const isFileSkipped = (relativePath) => relativePath.endsWith(".js") ||
         relativePath.endsWith(".js.nft.json") ||
+        // We skip manifest files as well
+        relativePath.endsWith("-manifest.json") ||
+        // We skip the segment rsc files as they are treated in a different way
+        relativePath.endsWith(".segment.rsc") ||
         (relativePath.endsWith(".html") && htmlPages.has(relativePath));
     // Merge cache files into a single file
     const cacheFilesPath = {};
@@ -116,6 +120,14 @@ export function createCacheAssets(options) {
             logger.warn(`Skipping invalid cache file: ${cacheFilePath}`);
             return;
         }
+        // If we have a meta file, and it contains segmentPaths, we need to add them to the cache file
+        const segments = Array.isArray(cacheFileMeta?.segmentPaths)
+            ? Object.fromEntries(cacheFileMeta.segmentPaths.map((segmentPath) => {
+                const absoluteSegmentPath = path.join(files.meta.replace(/\.meta$/, ".segments"), `${segmentPath}.segment.rsc`);
+                const segmentContent = fs.readFileSync(absoluteSegmentPath, "utf8");
+                return [segmentPath, segmentContent];
+            }))
+            : {};
         const cacheFileContent = {
             type: files.body ? "route" : files.json ? "page" : "app",
             meta: cacheFileMeta,
@@ -129,6 +141,7 @@ export function createCacheAssets(options) {
                     ? "base64"
                     : "utf8")
                 : undefined,
+            segmentData: Object.keys(segments).length > 0 ? segments : undefined,
         };
         // Ensure directory exists before writing
         fs.mkdirSync(path.dirname(cacheFilePath), { recursive: true });

package/dist/core/routing/cacheInterceptor.js

@@ -3,7 +3,7 @@ import { NextConfig, PrerenderManifest } from "../../adapters/config/index";
 import { emptyReadableStream, toReadableStream } from "../../utils/stream";
 import { isBinaryContentType } from "../../utils/binary";
 import { getTagsFromValue, hasBeenRevalidated } from "../../utils/cache";
-import { debug } from "../../adapters/logger";
+import { debug, error } from "../../adapters/logger";
 import { localizePath } from "./i18n";
 import { generateMessageGroupId } from "./queue";
 const CACHE_ONE_YEAR = 60 * 60 * 24 * 365;
@@ -18,6 +18,9 @@ const CACHE_ONE_MONTH = 60 * 60 * 24 * 30;
  * Also see this PR: https://github.com/vercel/next.js/pull/79426
  */
 const VARY_HEADER = "RSC, Next-Router-State-Tree, Next-Router-Prefetch, Next-Router-Segment-Prefetch, Next-Url";
+const NEXT_SEGMENT_PREFETCH_HEADER = "next-router-segment-prefetch";
+const NEXT_PRERENDER_HEADER = "x-nextjs-prerender";
+const NEXT_POSTPONED_HEADER = "x-nextjs-postponed";
 async function computeCacheControl(path, body, host, revalidate, lastModified) {
     let finalRevalidate = CACHE_ONE_YEAR;
     const existingRoute = Object.entries(PrerenderManifest.routes).find((p) => p[0] === path)?.[1];
@@ -81,24 +84,54 @@ async function computeCacheControl(path, body, host, revalidate, lastModified) {
         etag,
     };
 }
+function getBodyForAppRouter(event, cachedValue) {
+    if (cachedValue.type !== "app") {
+        throw new Error("getBodyForAppRouter called with non-app cache value");
+    }
+    try {
+        const segmentHeader = `${event.headers[NEXT_SEGMENT_PREFETCH_HEADER]}`;
+        const isSegmentResponse = Boolean(segmentHeader) &&
+            segmentHeader in (cachedValue.segmentData || {});
+        const body = isSegmentResponse
+            ? cachedValue.segmentData[segmentHeader]
+            : cachedValue.rsc;
+        return {
+            body,
+            additionalHeaders: isSegmentResponse
+                ? { [NEXT_PRERENDER_HEADER]: "1", [NEXT_POSTPONED_HEADER]: "2" }
+                : {},
+        };
+    }
+    catch (e) {
+        error("Error while getting body for app router from cache:", e);
+        return { body: cachedValue.rsc, additionalHeaders: {} };
+    }
+}
 async function generateResult(event, localizedPath, cachedValue, lastModified) {
     debug("Returning result from experimental cache");
     let body = "";
     let type = "application/octet-stream";
     let isDataRequest = false;
-    switch (cachedValue.type) {
-        case "app":
-            isDataRequest = Boolean(event.headers.rsc);
-            body = isDataRequest ? cachedValue.rsc : cachedValue.html;
-            type = isDataRequest ? "text/x-component" : "text/html; charset=utf-8";
-            break;
-        case "page":
-            isDataRequest = Boolean(event.query.__nextDataReq);
-            body = isDataRequest
-                ? JSON.stringify(cachedValue.json)
-                : cachedValue.html;
-            type = isDataRequest ? "application/json" : "text/html; charset=utf-8";
-            break;
+    let additionalHeaders = {};
+    if (cachedValue.type === "app") {
+        isDataRequest = Boolean(event.headers.rsc);
+        if (isDataRequest) {
+            const { body: appRouterBody, additionalHeaders: appHeaders } = getBodyForAppRouter(event, cachedValue);
+            body = appRouterBody;
+            additionalHeaders = appHeaders;
+        }
+        else {
+            body = cachedValue.html;
+        }
+        type = isDataRequest ? "text/x-component" : "text/html; charset=utf-8";
+    }
+    else if (cachedValue.type === "page") {
+        isDataRequest = Boolean(event.query.__nextDataReq);
+        body = isDataRequest ? JSON.stringify(cachedValue.json) : cachedValue.html;
+        type = isDataRequest ? "application/json" : "text/html; charset=utf-8";
+    }
+    else {
+        throw new Error("generateResult called with unsupported cache value type, only 'app' and 'page' are supported");
     }
     const cacheControl = await computeCacheControl(localizedPath, body, event.headers.host, cachedValue.revalidate, lastModified);
     return {
@@ -116,6 +149,7 @@ async function generateResult(event, localizedPath, cachedValue, lastModified) {
             "content-type": type,
             ...cachedValue.meta?.headers,
             vary: VARY_HEADER,
+            ...additionalHeaders,
         },
     };
 }

package/dist/core/routing/util.js

@@ -295,6 +295,13 @@ export async function revalidateIfRequired(host, rawPath, headers, req) {
  * @__PURE__
  */
 export function fixISRHeaders(headers) {
+    const sMaxAgeRegex = /s-maxage=(\d+)/;
+    const match = headers[CommonHeaders.CACHE_CONTROL]?.match(sMaxAgeRegex);
+    const sMaxAge = match ? Number.parseInt(match[1]) : undefined;
+    // We only apply the fix if the cache-control header contains s-maxage
+    if (!sMaxAge) {
+        return;
+    }
     if (headers[CommonHeaders.NEXT_CACHE] === "REVALIDATED") {
         headers[CommonHeaders.CACHE_CONTROL] =
             "private, no-cache, no-store, max-age=0, must-revalidate";
@@ -302,18 +309,11 @@ export function fixISRHeaders(headers) {
     }
     const _lastModified = globalThis.__openNextAls.getStore()?.lastModified ?? 0;
     if (headers[CommonHeaders.NEXT_CACHE] === "HIT" && _lastModified > 0) {
-        // calculate age
-        const age = Math.round((Date.now() - _lastModified) / 1000);
-        // extract s-maxage from cache-control
-        const regex = /s-maxage=(\d+)/;
-        const cacheControl = headers[CommonHeaders.CACHE_CONTROL];
-        debug("cache-control", cacheControl, _lastModified, Date.now());
-        if (typeof cacheControl !== "string")
-            return;
-        const match = cacheControl.match(regex);
-        const sMaxAge = match ? Number.parseInt(match[1]) : undefined;
+        debug("cache-control", headers[CommonHeaders.CACHE_CONTROL], _lastModified, Date.now());
         // 31536000 is the default s-maxage value for SSG pages
         if (sMaxAge && sMaxAge !== 31536000) {
+            // calculate age
+            const age = Math.round((Date.now() - _lastModified) / 1000);
             const remainingTtl = Math.max(sMaxAge - age, 1);
             headers[CommonHeaders.CACHE_CONTROL] =
                 `s-maxage=${remainingTtl}, stale-while-revalidate=2592000`;

package/dist/http/openNextResponse.d.ts

@@ -4,7 +4,7 @@ import type { TransformCallback } from "node:stream";
 import { Transform } from "node:stream";
 import type { StreamCreator } from "../types/open-next";
 export declare class OpenNextNodeResponse extends Transform implements ServerResponse {
-    private fixHeaders;
+    private fixHeadersFn;
     private onEnd;
     private streamCreator?;
     private initialHeaders?;
@@ -13,6 +13,7 @@ export declare class OpenNextNodeResponse extends Transform implements ServerRes
     headers: OutgoingHttpHeaders;
     headersSent: boolean;
     _chunks: Buffer[];
+    headersAlreadyFixed: boolean;
     private _cookies;
     private responseStream?;
     private bodyLength;
@@ -35,7 +36,7 @@ export declare class OpenNextNodeResponse extends Transform implements ServerRes
     socket: Socket | null;
     setTimeout(_msecs: number, _callback?: (() => void) | undefined): this;
     addTrailers(_headers: OutgoingHttpHeaders | readonly [string, string][]): void;
-    constructor(fixHeaders: (headers: OutgoingHttpHeaders) => void, onEnd: (headers: OutgoingHttpHeaders) => Promise<void>, streamCreator?: StreamCreator | undefined, initialHeaders?: OutgoingHttpHeaders | undefined, statusCode?: number);
+    constructor(fixHeadersFn: (headers: OutgoingHttpHeaders) => void, onEnd: (headers: OutgoingHttpHeaders) => Promise<void>, streamCreator?: StreamCreator | undefined, initialHeaders?: OutgoingHttpHeaders | undefined, statusCode?: number);
     get originalResponse(): this;
     get finished(): boolean;
     setHeader(name: string, value: string | string[]): this;
@@ -51,8 +52,9 @@ export declare class OpenNextNodeResponse extends Transform implements ServerRes
     /**
      * OpenNext specific method
      */
+    fixHeaders(headers: OutgoingHttpHeaders): void;
     getFixedHeaders(): OutgoingHttpHeaders;
-    getBody(): Buffer;
+    getBody(): Buffer<ArrayBuffer>;
     private _internalWrite;
     _transform(chunk: any, encoding: BufferEncoding, callback: TransformCallback): void;
     _flush(callback: TransformCallback): void;

package/dist/http/openNextResponse.js

@@ -5,7 +5,7 @@ const SET_COOKIE_HEADER = "set-cookie";
 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;
+    fixHeadersFn;
     onEnd;
     streamCreator;
     initialHeaders;
@@ -14,6 +14,7 @@ export class OpenNextNodeResponse extends Transform {
     headers = {};
     headersSent = false;
     _chunks = [];
+    headersAlreadyFixed = false;
     _cookies = [];
     responseStream;
     bodyLength = 0;
@@ -52,9 +53,9 @@ export class OpenNextNodeResponse extends Transform {
     addTrailers(_headers) {
         throw new Error(CANNOT_BE_USED);
     }
-    constructor(fixHeaders, onEnd, streamCreator, initialHeaders, statusCode) {
+    constructor(fixHeadersFn, onEnd, streamCreator, initialHeaders, statusCode) {
         super();
-        this.fixHeaders = fixHeaders;
+        this.fixHeadersFn = fixHeadersFn;
         this.onEnd = onEnd;
         this.streamCreator = streamCreator;
         this.initialHeaders = initialHeaders;
@@ -210,6 +211,13 @@ export class OpenNextNodeResponse extends Transform {
     /**
      * OpenNext specific method
      */
+    fixHeaders(headers) {
+        if (this.headersAlreadyFixed) {
+            return;
+        }
+        this.fixHeadersFn(headers);
+        this.headersAlreadyFixed = true;
+    }
     getFixedHeaders() {
         // Do we want to apply this on writeHead?
         this.fixHeaders(this.headers);
@@ -222,13 +230,18 @@ export class OpenNextNodeResponse extends Transform {
         return Buffer.concat(this._chunks);
     }
     _internalWrite(chunk, encoding) {
-        const buffer = Buffer.from(chunk, encoding);
+        // When encoding === 'buffer', chunk is already a Buffer
+        // and does not need to be converted again.
+        // @ts-expect-error TS2367 'encoding' can be 'buffer', but it's not in the
+        // official type definition
+        const buffer = encoding === "buffer" ? chunk : Buffer.from(chunk, encoding);
         this.bodyLength += buffer.length;
         if (this.streamCreator?.retainChunks !== false) {
             // Avoid keeping chunks around when the `StreamCreator` supports it to save memory
             this._chunks.push(buffer);
         }
-        this.push(chunk, encoding);
+        // No need to pass the encoding for buffers
+        this.push(buffer);
         this.streamCreator?.onWrite?.();
     }
     _transform(chunk, encoding, callback) {

package/dist/http/util.js

@@ -1,4 +1,4 @@
-import logger from "../logger";
+import { warn } from "../adapters/logger";
 export const parseHeaders = (headers) => {
     const result = {};
     if (!headers) {
@@ -18,11 +18,11 @@ export const parseHeaders = (headers) => {
          * and https://github.com/opennextjs/opennextjs-aws/pull/977#issuecomment-3261763114
          */
         if (keyLower === "location" && Array.isArray(value)) {
-            if (value[0] === value[1]) {
+            if (value.length === 1 || value[0] === value[1]) {
                 result[keyLower] = value[0];
             }
             else {
-                logger.warn("Multiple different values for Location header found. Using the last one");
+                warn("Multiple different values for Location header found. Using the last one");
                 result[keyLower] = value[value.length - 1];
             }
             continue;

package/dist/overrides/proxyExternalRequest/fetch.js

@@ -8,7 +8,7 @@ const fetchProxy = {
         const response = await fetch(url, {
             method,
             headers,
-            body,
+            body: body,
         });
         const responseHeaders = {};
         response.headers.forEach((value, key) => {

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

@@ -52,7 +52,12 @@ const handler = async (handler, converter) => async (request, env, ctx, abortSig
             resolveResponse(response);
             return new Writable({
                 write(chunk, encoding, callback) {
-                    controller.enqueue(chunk);
+                    try {
+                        controller.enqueue(chunk);
+                    }
+                    catch (e) {
+                        return callback(e);
+                    }
                     callback();
                 },
                 final(callback) {

package/dist/types/aws-lambda.d.ts

@@ -6,16 +6,9 @@ export interface ResponseStream extends Writable {
     setContentType(contentType: string): void;
 }
 type Handler = (event: APIGatewayProxyEventV2, responseStream: ResponseStream, context: Context) => Promise<any>;
-interface Metadata {
-    statusCode: number;
-    headers: Record<string, string>;
-}
 declare global {
     namespace awslambda {
         function streamifyResponse(handler: Handler): Handler;
-        namespace HttpResponseStream {
-            function from(res: Writable, metadata: Metadata): ResponseStream;
-        }
     }
 }
 export type AwsLambdaEvent = APIGatewayProxyEventV2 | CloudFrontRequestEvent | APIGatewayProxyEvent | WarmerEvent;

package/dist/types/overrides.d.ts

@@ -42,6 +42,7 @@ export type CachedFile = {
     html: string;
     rsc: string;
     meta?: Meta;
+    segmentData?: Record<string, string>;
 } | {
     type: "route";
     body: string;

package/package.json

@@ -3,7 +3,7 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.8.4",
+  "version": "3.9.0",
   "bin": {
     "open-next": "./dist/index.js"
   },
@@ -33,7 +33,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@ast-grep/napi": "^0.35.0",
+    "@ast-grep/napi": "^0.40.0",
     "@aws-sdk/client-cloudfront": "3.398.0",
     "@aws-sdk/client-dynamodb": "^3.398.0",
     "@aws-sdk/client-lambda": "^3.398.0",
@@ -41,22 +41,23 @@
     "@aws-sdk/client-sqs": "^3.398.0",
     "@node-minify/core": "^8.0.6",
     "@node-minify/terser": "^8.0.6",
-    "@tsconfig/node18": "^1.0.1",
-    "aws4fetch": "^1.0.18",
-    "chalk": "^5.3.0",
+    "@tsconfig/node18": "^1.0.3",
+    "aws4fetch": "^1.0.20",
+    "chalk": "^5.6.2",
     "cookie": "^1.0.2",
     "esbuild": "0.25.4",
-    "express": "5.0.1",
+    "express": "^5.1.0",
     "path-to-regexp": "^6.3.0",
-    "urlpattern-polyfill": "^10.0.0",
-    "yaml": "^2.7.0"
+    "urlpattern-polyfill": "^10.1.0",
+    "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@types/aws-lambda": "^8.10.109",
+    "@types/aws-lambda": "^8.10.158",
     "@types/express": "5.0.0",
     "@types/node": "20.17.6",
-    "tsc-alias": "^1.8.8",
-    "typescript": "5.6.3"
+    "concurrently": "^9.2.1",
+    "tsc-alias": "^1.8.16",
+    "typescript": "5.9.3"
   },
   "bugs": {
     "url": "https://github.com/opennextjs/opennextjs-aws/issues"
@@ -68,6 +69,6 @@
   },
   "scripts": {
     "build": "tsc && tsc-alias",
-    "dev": "tsc -w"
+    "dev": "concurrently \"tsc -w\" \"tsc-alias -w\""
   }
 }