@middy/secrets-manager 7.2.2 → 7.3.0

package/index.d.ts

@@ -55,4 +55,8 @@ declare function secretsManager<
 	Internal<TOptions>
 >;
 
+export declare function secretsManagerValidateOptions(
+	options?: Record<string, unknown>,
+): void;
+
 export default secretsManager;

package/index.js

@@ -6,6 +6,7 @@ import {
 	SecretsManagerClient,
 } from "@aws-sdk/client-secrets-manager";
 import {
+	awsClientOptionSchema,
 	canPrefetch,
 	catchInvalidSignatureException,
 	createClient,
@@ -15,6 +16,7 @@ import {
 	jsonSafeParse,
 	modifyCache,
 	processCache,
+	validateOptions,
 } from "@middy/util";
 
 const defaults = {
@@ -31,6 +33,16 @@ const defaults = {
 	setToContext: false,
 };
 
+const optionSchema = {
+	...awsClientOptionSchema,
+	fetchRotationDate: (v) =>
+		typeof v === "boolean" ||
+		(v !== null && typeof v === "object" && !Array.isArray(v)),
+};
+
+export const secretsManagerValidateOptions = (options) =>
+	validateOptions("@middy/secrets-manager", optionSchema, options);
+
 const secretsManagerMiddleware = (opts = {}) => {
 	const options = {
 		...defaults,
@@ -66,18 +78,21 @@ const secretsManagerMiddleware = (opts = {}) => {
 						)
 						.then((resp) => {
 							if (options.cacheExpiry < 0) {
-								options.cacheKeyExpiry[internalKey] =
-									resp.NextRotationDate * 1000;
+								if (resp.NextRotationDate) {
+									options.cacheKeyExpiry[internalKey] =
+										resp.NextRotationDate * 1000;
+								}
 							} else {
-								options.cacheKeyExpiry[internalKey] = Math.min(
+								const lastChanged =
 									Math.max(
 										resp.LastRotationDate ?? 0,
 										resp.LastChangedDate ?? 0,
 									) *
 										1000 +
-										options.cacheExpiry,
-									resp.NextRotationDate * 1000,
-								);
+									options.cacheExpiry;
+								options.cacheKeyExpiry[internalKey] = resp.NextRotationDate
+									? Math.min(lastChanged, resp.NextRotationDate * 1000)
+									: lastChanged;
 							}
 						})
 				: undefined;
@@ -105,6 +120,7 @@ const secretsManagerMiddleware = (opts = {}) => {
 	};
 
 	let client;
+	let clientInit;
 	if (canPrefetch(options)) {
 		client = createPrefetchClient(options);
 		processCache(options, fetchRequest);
@@ -112,7 +128,8 @@ const secretsManagerMiddleware = (opts = {}) => {
 
 	const secretsManagerMiddlewareBefore = 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/secrets-manager",
-	"version": "7.2.2",
+	"version": "7.3.0",
 	"description": "Secrets Manager middleware for the middy framework",
 	"type": "module",
 	"engines": {
@@ -17,9 +17,6 @@
 			"import": {
 				"types": "./index.d.ts",
 				"default": "./index.js"
-			},
-			"require": {
-				"default": "./index.js"
 			}
 		}
 	},
@@ -63,7 +60,7 @@
 		"url": "https://github.com/sponsors/willfarrell"
 	},
 	"dependencies": {
-		"@middy/util": "7.2.2"
+		"@middy/util": "7.3.0"
 	},
 	"peerDependencies": {
 		"@aws-sdk/client-secrets-manager": "^3.0.0"
@@ -75,7 +72,7 @@
 	},
 	"devDependencies": {
 		"@aws-sdk/client-secrets-manager": "^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"