@middy/ssm 7.2.2 → 7.3.0

package/index.d.ts

@@ -11,6 +11,7 @@ export declare function ssmParam<T>(path: string): ParamType<T>;
 export interface SSMOptions<AwsSSMClient = SSMClient>
 	extends Omit<MiddyOptions<AwsSSMClient, SSMClientConfig>, "fetchData"> {
 	fetchData?: { [key: string]: string | ParamType<unknown> };
+	awsRequestLimit?: number;
 }
 
 export type Context<TOptions extends SSMOptions | undefined> =
@@ -45,4 +46,8 @@ declare function ssm<TOptions extends SSMOptions>(
 	Internal<TOptions>
 >;
 
+export declare function ssmValidateOptions(
+	options?: Record<string, unknown>,
+): void;
+
 export default ssm;

package/index.js

@@ -6,6 +6,7 @@ import {
 	SSMClient,
 } from "@aws-sdk/client-ssm";
 import {
+	awsClientOptionSchema,
 	canPrefetch,
 	catchInvalidSignatureException,
 	createClient,
@@ -16,9 +17,9 @@ import {
 	modifyCache,
 	processCache,
 	sanitizeKey,
+	validateOptions,
 } from "@middy/util";
 
-const awsRequestLimit = 10;
 const defaults = {
 	AwsClient: SSMClient, // Allow for XRay
 	awsClientOptions: {},
@@ -30,8 +31,17 @@ const defaults = {
 	cacheKeyExpiry: {},
 	cacheExpiry: -1,
 	setToContext: false,
+	awsRequestLimit: 10,
 };
 
+const optionSchema = {
+	...awsClientOptionSchema,
+	awsRequestLimit: (v) => Number.isInteger(v) && v >= 1,
+};
+
+export const ssmValidateOptions = (options) =>
+	validateOptions("@middy/ssm", optionSchema, options);
+
 const ssmMiddleware = (opts = {}) => {
 	const options = { ...defaults, ...opts };
 
@@ -62,7 +72,7 @@ const ssmMiddleware = (opts = {}) => {
 			batchKeys.set(internalKey, fetchKey);
 			// from the first to the batch size skip, unless it's the last entry
 			if (
-				(!idx || (idx + 1) % awsRequestLimit !== 0) &&
+				(!idx || (idx + 1) % options.awsRequestLimit !== 0) &&
 				!(idx + 1 === namedKeys.length)
 			) {
 				continue;
@@ -80,15 +90,15 @@ const ssmMiddleware = (opts = {}) => {
 					// Don't sanitize key, mapped to set value in options
 					const result = {};
 					for (const fetchKey of resp.InvalidParameters ?? []) {
-						result[fetchKey] = new Promise(() => {
-							const internalKey = internalKeys[fetchKeys.indexOf(fetchKey)];
-							const value = getCache(options.cacheKey).value ?? {};
-							value[internalKey] = undefined;
-							modifyCache(options.cacheKey, value);
-							throw new Error(`InvalidParameter ${fetchKey}`, {
+						const internalKey = internalKeys[fetchKeys.indexOf(fetchKey)];
+						const value = getCache(options.cacheKey).value ?? {};
+						value[internalKey] = undefined;
+						modifyCache(options.cacheKey, value);
+						result[fetchKey] = Promise.reject(
+							new Error(`InvalidParameter ${fetchKey}`, {
 								cause: { package: "@middy/ssm" },
-							});
-						});
+							}),
+						);
 					}
 					for (const param of resp.Parameters ?? []) {
 						result[param.Name] = parseValue(param);
@@ -150,7 +160,7 @@ const ssmMiddleware = (opts = {}) => {
 			.send(command)
 			.catch((e) => catchInvalidSignatureException(e, client, command))
 			.then((resp) => {
-				for (const param of resp.Parameters) {
+				for (const param of resp.Parameters ?? []) {
 					values[sanitizeKey(param.Name.replace(path, ""))] = parseValue(param);
 				}
 				if (resp.NextToken) {
@@ -168,6 +178,7 @@ const ssmMiddleware = (opts = {}) => {
 	};
 
 	let client;
+	let clientInit;
 	if (canPrefetch(options)) {
 		client = createPrefetchClient(options);
 		processCache(options, fetchRequest);
@@ -175,7 +186,8 @@ const ssmMiddleware = (opts = {}) => {
 
 	const ssmMiddlewareBefore = async (request) => {
 		if (!client) {
-			client = await createClient(options, request);
+			clientInit ??= createClient(options, request);
+			client = await clientInit;
 		}
 
 		const { value } = processCache(options, fetchRequest, request);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@middy/ssm",
-	"version": "7.2.2",
+	"version": "7.3.0",
 	"description": "SSM (EC2 Systems Manager) parameters middleware for the middy framework",
 	"type": "module",
 	"engines": {
@@ -17,9 +17,6 @@
 			"import": {
 				"types": "./index.d.ts",
 				"default": "./index.js"
-			},
-			"require": {
-				"default": "./index.js"
 			}
 		}
 	},
@@ -65,7 +62,7 @@
 		"url": "https://github.com/sponsors/willfarrell"
 	},
 	"dependencies": {
-		"@middy/util": "7.2.2"
+		"@middy/util": "7.3.0"
 	},
 	"peerDependencies": {
 		"@aws-sdk/client-ssm": "^3.0.0"
@@ -77,7 +74,7 @@
 	},
 	"devDependencies": {
 		"@aws-sdk/client-ssm": "^3.0.0",
-		"@middy/core": "7.2.2",
+		"@middy/core": "7.3.0",
 		"@types/aws-lambda": "^8.0.0",
 		"@types/node": "^22.0.0",
 		"aws-xray-sdk": "^3.3.3"