@opennextjs/aws 3.1.6 → 3.2.0

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

@@ -0,0 +1,3 @@
+import type { TagCache } from "./types";
+declare const dummyTagCache: TagCache;
+export default dummyTagCache;

package/dist/overrides/tagCache/dummy.js

@@ -0,0 +1,17 @@
+// We don't want to throw error on this one because we might use it when we don't need tag cache
+const dummyTagCache = {
+    name: "dummy",
+    getByPath: async () => {
+        return [];
+    },
+    getByTag: async () => {
+        return [];
+    },
+    getLastModified: async (_, lastModified) => {
+        return lastModified ?? Date.now();
+    },
+    writeTags: async () => {
+        return;
+    },
+};
+export default dummyTagCache;

package/dist/{cache/tag → overrides/tagCache}/dynamodb-lite.d.ts

@@ -1,3 +1,3 @@
-import { TagCache } from "./types";
+import type { TagCache } from "./types";
 declare const tagCache: TagCache;
 export default tagCache;

package/dist/{cache/tag → overrides/tagCache}/dynamodb-lite.js

@@ -131,7 +131,7 @@ const tagCache = {
             const revalidatedTags = (await result.json()).Items ?? [];
             debug("revalidatedTags", revalidatedTags);
             // If we have revalidated tags we return -1 to force revalidation
-            return revalidatedTags.length > 0 ? -1 : lastModified ?? Date.now();
+            return revalidatedTags.length > 0 ? -1 : (lastModified ?? Date.now());
         }
         catch (e) {
             error("Failed to get revalidated tags", e);

package/dist/{cache/tag → overrides/tagCache}/dynamodb.d.ts

@@ -1,3 +1,3 @@
-import { TagCache } from "./types";
+import type { TagCache } from "./types";
 declare const tagCache: TagCache;
 export default tagCache;

package/dist/{cache/tag → overrides/tagCache}/dynamodb.js

@@ -93,7 +93,7 @@ const tagCache = {
             const revalidatedTags = result.Items ?? [];
             debug("revalidatedTags", revalidatedTags);
             // If we have revalidated tags we return -1 to force revalidation
-            return revalidatedTags.length > 0 ? -1 : lastModified ?? Date.now();
+            return revalidatedTags.length > 0 ? -1 : (lastModified ?? Date.now());
         }
         catch (e) {
             error("Failed to get revalidated tags", e);

package/dist/overrides/warmer/aws-lambda.d.ts

@@ -0,0 +1,3 @@
+import type { Warmer } from "../../types/open-next";
+declare const lambdaWarmerInvoke: Warmer;
+export default lambdaWarmerInvoke;

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

@@ -0,0 +1,59 @@
+import { debug, error } from "../../adapters/logger";
+const lambdaWarmerInvoke = {
+    name: "aws-invoke",
+    invoke: async (warmerId) => {
+        const { InvokeCommand, LambdaClient } = await import("@aws-sdk/client-lambda");
+        const lambda = new LambdaClient({});
+        const warmParams = JSON.parse(process.env.WARM_PARAMS);
+        for (const warmParam of warmParams) {
+            const { concurrency: CONCURRENCY, function: FUNCTION_NAME } = warmParam;
+            debug({
+                event: "warmer invoked",
+                functionName: FUNCTION_NAME,
+                concurrency: CONCURRENCY,
+                warmerId,
+            });
+            const ret = await Promise.all(Array.from({ length: CONCURRENCY }, (_v, i) => i).map((i) => {
+                try {
+                    return lambda.send(new InvokeCommand({
+                        FunctionName: FUNCTION_NAME,
+                        InvocationType: "RequestResponse",
+                        Payload: Buffer.from(JSON.stringify({
+                            type: "warmer",
+                            warmerId,
+                            index: i,
+                            concurrency: CONCURRENCY,
+                            delay: 75,
+                        })),
+                    }));
+                }
+                catch (e) {
+                    error(`failed to warm up #${i}`, e);
+                    // ignore error
+                }
+            }));
+            // Print status
+            const warmedServerIds = ret
+                .map((r, i) => {
+                if (r?.StatusCode !== 200 || !r?.Payload) {
+                    error(`failed to warm up #${i}:`, r?.Payload?.toString());
+                    return;
+                }
+                const payload = JSON.parse(Buffer.from(r.Payload).toString());
+                return {
+                    statusCode: r.StatusCode,
+                    payload,
+                    type: "warmer",
+                };
+            })
+                .filter((r) => !!r);
+            debug({
+                event: "warmer result",
+                sent: CONCURRENCY,
+                success: warmedServerIds.length,
+                uniqueServersWarmed: [...new Set(warmedServerIds)].length,
+            });
+        }
+    },
+};
+export default lambdaWarmerInvoke;

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

@@ -0,0 +1,3 @@
+import type { Warmer } from "../../types/open-next";
+declare const dummyWarmer: Warmer;
+export default dummyWarmer;

package/dist/overrides/warmer/dummy.js

@@ -0,0 +1,7 @@
+const dummyWarmer = {
+    name: "dummy",
+    invoke: async (_) => {
+        throw new Error("Dummy warmer is not implemented");
+    },
+};
+export default dummyWarmer;

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

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

package/dist/{wrappers → overrides/wrappers}/aws-lambda-streaming.js

@@ -1,6 +1,6 @@
 import { Readable } from "node:stream";
 import zlib from "node:zlib";
-import { debug, error } from "../adapters/logger";
+import { debug, error } from "../../adapters/logger";
 function formatWarmerResponse(event) {
     const result = new Promise((resolve) => {
         setTimeout(() => {

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

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

package/dist/{wrappers → overrides/wrappers}/cloudflare.d.ts

@@ -1,5 +1,5 @@
-import type { InternalEvent, InternalResult, WrapperHandler } from "../types/open-next";
-import { MiddlewareOutputEvent } from "../core/routingHandler";
+import type { InternalEvent, InternalResult, WrapperHandler } from "../../types/open-next";
+import type { MiddlewareOutputEvent } from "../../core/routingHandler";
 declare const _default: {
     wrapper: WrapperHandler<InternalEvent, InternalResult | ({
         type: "middleware";

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

@@ -0,0 +1,7 @@
+import type { WrapperHandler } from "../../types/open-next";
+declare const _default: {
+    name: string;
+    handler: WrapperHandler<import("../../types/open-next").InternalEvent, import("../../types/open-next").InternalResult>;
+    supportStreaming: boolean;
+};
+export default _default;

package/dist/overrides/wrappers/dummy.js

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

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

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

package/dist/{wrappers → overrides/wrappers}/node.js

@@ -1,5 +1,5 @@
 import { createServer } from "node:http";
-import { debug, error } from "../adapters/logger";
+import { debug, error } from "../../adapters/logger";
 const wrapper = async (handler, converter) => {
     const server = createServer(async (req, res) => {
         const internalEvent = await converter.convertFrom(req);

package/dist/plugins/edge.d.ts

@@ -1,5 +1,5 @@
-import { Plugin } from "esbuild";
-import { MiddlewareInfo } from "../types/next-types.js";
+import type { Plugin } from "esbuild";
+import type { MiddlewareInfo } from "../types/next-types.js";
 export interface IPluginSettings {
     nextDir: string;
     edgeFunctionHandlerPath?: string;

package/dist/plugins/replacement.d.ts

@@ -1,4 +1,4 @@
-import { Plugin } from "esbuild";
+import type { Plugin } from "esbuild";
 export interface IPluginSettings {
     target: RegExp;
     replacements?: string[];

package/dist/plugins/resolve.d.ts

@@ -1,5 +1,5 @@
-import { Plugin } from "esbuild";
-import type { DefaultOverrideOptions, ImageLoader, IncludedImageLoader, LazyLoadedOverride, OverrideOptions } from "../types/open-next";
+import type { Plugin } from "esbuild";
+import type { DefaultOverrideOptions, ImageLoader, IncludedImageLoader, IncludedOriginResolver, IncludedWarmer, LazyLoadedOverride, OriginResolver, OverrideOptions, Warmer } from "../types/open-next";
 export interface IPluginSettings {
     overrides?: {
         wrapper?: DefaultOverrideOptions<any, any>["wrapper"];
@@ -8,6 +8,8 @@ export interface IPluginSettings {
         queue?: OverrideOptions["queue"];
         incrementalCache?: OverrideOptions["incrementalCache"];
         imageLoader?: LazyLoadedOverride<ImageLoader> | IncludedImageLoader;
+        originResolver?: LazyLoadedOverride<OriginResolver> | IncludedOriginResolver;
+        warmer?: LazyLoadedOverride<Warmer> | IncludedWarmer;
     };
     fnName?: string;
 }

package/dist/plugins/resolve.js

@@ -1,11 +1,33 @@
 import { readFileSync } from "node:fs";
 import logger from "../logger.js";
-function getOverrideOrDefault(override, defaultOverride) {
+function getOverrideOrDummy(override) {
     if (typeof override === "string") {
         return override;
     }
-    return defaultOverride;
+    // We can return dummy here because if it's not a string, it's a LazyLoadedOverride
+    return "dummy";
 }
+// This could be useful in the future to map overrides to nested folders
+const nameToFolder = {
+    wrapper: "wrappers",
+    converter: "converters",
+    tagCache: "tagCache",
+    queue: "queue",
+    incrementalCache: "incrementalCache",
+    imageLoader: "imageLoader",
+    originResolver: "originResolver",
+    warmer: "warmer",
+};
+const defaultOverrides = {
+    wrapper: "aws-lambda",
+    converter: "aws-apigw-v2",
+    tagCache: "dynamodb",
+    queue: "sqs",
+    incrementalCache: "s3",
+    imageLoader: "s3",
+    originResolver: "pattern-env",
+    warmer: "aws-lambda",
+};
 /**
  * @param opts.overrides - The name of the overrides to use
  * @returns
@@ -17,24 +39,14 @@ export function openNextResolvePlugin({ overrides, fnName, }) {
             logger.debug(`OpenNext Resolve plugin for ${fnName}`);
             build.onLoad({ filter: /core(\/|\\)resolve\.js/g }, async (args) => {
                 let contents = readFileSync(args.path, "utf-8");
-                //TODO: refactor this. Every override should be at the same place so we can generate this dynamically
-                if (overrides?.wrapper) {
-                    contents = contents.replace("../wrappers/aws-lambda.js", `../wrappers/${getOverrideOrDefault(overrides.wrapper, "aws-lambda")}.js`);
-                }
-                if (overrides?.converter) {
-                    contents = contents.replace("../converters/aws-apigw-v2.js", `../converters/${getOverrideOrDefault(overrides.converter, "dummy")}.js`);
-                }
-                if (overrides?.tagCache) {
-                    contents = contents.replace("../cache/tag/dynamodb.js", `../cache/tag/${getOverrideOrDefault(overrides.tagCache, "dynamodb-lite")}.js`);
-                }
-                if (overrides?.queue) {
-                    contents = contents.replace("../queue/sqs.js", `../queue/${getOverrideOrDefault(overrides.queue, "sqs-lite")}.js`);
-                }
-                if (overrides?.incrementalCache) {
-                    contents = contents.replace("../cache/incremental/s3.js", `../cache/incremental/${getOverrideOrDefault(overrides.incrementalCache, "s3-lite")}.js`);
-                }
-                if (overrides?.imageLoader) {
-                    contents = contents.replace("../overrides/imageLoader/s3.js", `../overrides/imageLoader/${getOverrideOrDefault(overrides.imageLoader, "s3")}.js`);
+                const overridesEntries = Object.entries(overrides ?? {});
+                for (const [overrideName, overrideValue] of overridesEntries) {
+                    if (!overrideValue) {
+                        continue;
+                    }
+                    const folder = nameToFolder[overrideName];
+                    const defaultOverride = defaultOverrides[overrideName];
+                    contents = contents.replace(`../overrides/${folder}/${defaultOverride}.js`, `../overrides/${folder}/${getOverrideOrDummy(overrideValue)}.js`);
                 }
                 return {
                     contents,

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

@@ -1,7 +1,8 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import { APIGatewayProxyEventV2, Context } from "aws-lambda";
-import { Writable } from "stream";
+/// <reference types="node" />
+import type { APIGatewayProxyEventV2, Context } from "aws-lambda";
+import type { Writable } from "stream";
 export interface ResponseStream extends Writable {
     getBufferedData(): Buffer;
     setContentType(contentType: string): void;

package/dist/{cache/next-types.d.ts → types/cache.d.ts}

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 interface CachedFetchValue {
     kind: "FETCH";
     data: {

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

@@ -1,5 +1,5 @@
 import type { IncomingMessage, OpenNextNodeResponse } from "../http/index.js";
-import { InternalEvent } from "./open-next";
+import type { InternalEvent } from "./open-next";
 type RemotePattern = {
     protocol?: "http" | "https";
     hostname: string;
@@ -55,6 +55,7 @@ export type Header = {
 export interface i18nConfig {
     locales: string[];
     defaultLocale: string;
+    localeDetection?: false;
 }
 export interface NextConfig {
     basePath?: string;
@@ -66,6 +67,7 @@ export interface NextConfig {
         appDir?: boolean;
     };
     images: ImageConfig;
+    poweredByHeader?: boolean;
 }
 export interface RouteDefinition {
     page: string;

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

@@ -1,13 +1,14 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node" />
+/// <reference types="node" />
 import type { Readable } from "node:stream";
 import type { ReadableStream } from "node:stream/web";
 import type { StreamCreator } from "../http/index.js";
 import type { WarmerEvent, WarmerResponse } from "../adapters/warmer-function";
-import type { IncrementalCache } from "../cache/incremental/types";
-import type { TagCache } from "../cache/tag/types";
-import type { Queue } from "../queue/types";
+import type { IncrementalCache } from "../overrides/incrementalCache/types";
+import type { Queue } from "../overrides/queue/types";
+import type { TagCache } from "../overrides/tagCache/types";
 export type BaseEventOrResult<T extends string = string> = {
     type: T;
 };
@@ -93,6 +94,8 @@ export type IncludedQueue = "sqs" | "sqs-lite";
 export type IncludedIncrementalCache = "s3" | "s3-lite";
 export type IncludedTagCache = "dynamodb" | "dynamodb-lite";
 export type IncludedImageLoader = "s3" | "host";
+export type IncludedOriginResolver = "pattern-env";
+export type IncludedWarmer = "aws-lambda";
 export interface DefaultOverrideOptions<E extends BaseEventOrResult = InternalEvent, R extends BaseEventOrResult = InternalResult> {
     /**
      * This is the main entrypoint of your app.
@@ -128,6 +131,30 @@ export interface OverrideOptions extends DefaultOverrideOptions {
      */
     queue?: IncludedQueue | LazyLoadedOverride<Queue>;
 }
+export interface InstallOptions {
+    /**
+     * List of packages to install
+     * @example
+     * ```ts
+     * install: {
+     *  packages: ["sharp@0.32"]
+     * }
+     * ```
+     */
+    packages: string[];
+    /**
+     * @default "arm64"
+     */
+    arch?: "x64" | "arm64";
+    /**
+     * @default "18"
+     */
+    nodeVersion?: "18" | "20" | "22";
+    /**
+     * @default "glibc"
+     */
+    libc?: "glibc" | "musl";
+}
 export interface DefaultFunctionOptions<E extends BaseEventOrResult = InternalEvent, R extends BaseEventOrResult = InternalResult> {
     /**
      * Minify the server bundle.
@@ -143,6 +170,13 @@ export interface DefaultFunctionOptions<E extends BaseEventOrResult = InternalEv
      * Enable overriding the default lambda.
      */
     override?: DefaultOverrideOptions<E, R>;
+    /**
+     * Install options for the function.
+     * This is used to install additional packages to this function.
+     * For image optimization, it will install sharp by default.
+     * @default undefined
+     */
+    install?: InstallOptions;
 }
 export interface FunctionOptions extends DefaultFunctionOptions {
     /**
@@ -210,7 +244,7 @@ export interface OpenNextConfig {
          * OPEN_NEXT_ORIGIN should be a json stringified object with the key of the splitted function as key and the origin as value
          * @default "pattern-env"
          */
-        originResolver?: "pattern-env" | LazyLoadedOverride<OriginResolver>;
+        originResolver?: IncludedOriginResolver | LazyLoadedOverride<OriginResolver>;
     };
     /**
      * Override the default warmer
@@ -219,7 +253,7 @@ export interface OpenNextConfig {
      * @default undefined
      */
     warmer?: DefaultFunctionOptions<WarmerEvent, WarmerResponse> & {
-        invokeFunction: "aws-lambda" | LazyLoadedOverride<Warmer>;
+        invokeFunction: IncludedWarmer | LazyLoadedOverride<Warmer>;
     };
     /**
      * Override the default revalidate function
@@ -244,14 +278,6 @@ export interface OpenNextConfig {
          * @default "s3"
          */
         loader?: IncludedImageLoader | LazyLoadedOverride<ImageLoader>;
-        /**
-         * @default "arm64"
-         */
-        arch?: "x64" | "arm64";
-        /**
-         * @default "18"
-         */
-        nodeVersion?: "18" | "20";
     };
     /**
      * Override the default initialization function

package/package.json

@@ -3,14 +3,14 @@
     "access": "public"
   },
   "name": "@opennextjs/aws",
-  "version": "3.1.6",
+  "version": "3.2.0",
   "bin": {
     "open-next": "./dist/index.js"
   },
   "license": "MIT",
   "type": "module",
   "description": "Open source Next.js serverless adapter",
-  "homepage": "https://open-next.js.org",
+  "homepage": "https://opennext.js.org/aws",
   "main": "./dist/index.js",
   "exports": {
     "./*": "./dist/*"

package/dist/converters/edge.d.ts

@@ -1,6 +0,0 @@
-import { Converter, InternalEvent, InternalResult } from "../types/open-next";
-import { MiddlewareOutputEvent } from "../core/routingHandler";
-declare const converter: Converter<InternalEvent, InternalResult | ({
-    type: "middleware";
-} & MiddlewareOutputEvent)>;
-export default converter;

package/dist/converters/sqs-revalidate.d.ts

@@ -1,4 +0,0 @@
-import { Converter } from "../types/open-next";
-import { RevalidateEvent } from "../adapters/revalidate";
-declare const converter: Converter<RevalidateEvent, RevalidateEvent>;
-export default converter;

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

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

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

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

package/dist/wrappers/node.d.ts

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