@middy/util 4.5.5 → 4.6.1

package/index.cjs

@@ -130,7 +130,8 @@ const sanitizeKey = (key)=>{
 };
 const cache = {};
 const processCache = (options, fetch = ()=>undefined, request)=>{
-    const { cacheExpiry, cacheKey } = options;
+    let { cacheKey, cacheKeyExpiry, cacheExpiry } = options;
+    cacheExpiry = cacheKeyExpiry?.[cacheKey] ?? cacheExpiry;
     if (cacheExpiry) {
         const cached = getCache(cacheKey);
         const unexpired = cached.expiry && (cacheExpiry < 0 || cached.expiry > Date.now());
@@ -153,9 +154,11 @@ const processCache = (options, fetch = ()=>undefined, request)=>{
         }
     }
     const value = fetch(request);
-    const expiry = Date.now() + cacheExpiry;
+    const now = Date.now();
+    const expiry = cacheExpiry > 86400000 ? cacheExpiry : now + cacheExpiry;
+    const duration = cacheExpiry > 86400000 ? cacheExpiry - now : cacheExpiry;
     if (cacheExpiry) {
-        const refresh = cacheExpiry > 0 ? setInterval(()=>processCache(options, fetch, request), cacheExpiry) : undefined;
+        const refresh = duration > 0 ? setInterval(()=>processCache(options, fetch, request), duration) : undefined;
         cache[cacheKey] = {
             value,
             expiry,

package/index.d.ts

@@ -1,7 +1,7 @@
 import middy from '@middy/core'
 
 interface Options<Client, ClientOptions> {
-  AwsClient?: new (...args: any[]) => Client
+  AwsClient?: new (...[config]: [any] | any) => Client
   awsClientOptions?: Partial<ClientOptions>
   awsClientAssumeRole?: string
   awsClientCapture?: (service: Client) => Client

package/index.js

@@ -76,7 +76,8 @@ export const sanitizeKey = (key)=>{
 };
 const cache = {};
 export const processCache = (options, fetch = ()=>undefined, request)=>{
-    const { cacheExpiry, cacheKey } = options;
+    let { cacheKey, cacheKeyExpiry, cacheExpiry } = options;
+    cacheExpiry = cacheKeyExpiry?.[cacheKey] ?? cacheExpiry;
     if (cacheExpiry) {
         const cached = getCache(cacheKey);
         const unexpired = cached.expiry && (cacheExpiry < 0 || cached.expiry > Date.now());
@@ -99,9 +100,11 @@ export const processCache = (options, fetch = ()=>undefined, request)=>{
         }
     }
     const value = fetch(request);
-    const expiry = Date.now() + cacheExpiry;
+    const now = Date.now();
+    const expiry = cacheExpiry > 86400000 ? cacheExpiry : now + cacheExpiry;
+    const duration = cacheExpiry > 86400000 ? cacheExpiry - now : cacheExpiry;
     if (cacheExpiry) {
-        const refresh = cacheExpiry > 0 ? setInterval(()=>processCache(options, fetch, request), cacheExpiry) : undefined;
+        const refresh = duration > 0 ? setInterval(()=>processCache(options, fetch, request), duration) : undefined;
         cache[cacheKey] = {
             value,
             expiry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/util",
-  "version": "4.5.5",
+  "version": "4.6.1",
   "description": "🛵 The stylish Node.js middleware engine for AWS Lambda (util package)",
   "type": "module",
   "engines": {
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@aws-sdk/client-ssm": "^3.0.0",
-    "@middy/core": "4.5.5",
+    "@middy/core": "4.6.1",
     "@types/aws-lambda": "^8.10.76",
     "@types/node": "^20.0.0",
     "aws-xray-sdk": "^3.3.3"
@@ -71,5 +71,5 @@
     "type": "github",
     "url": "https://github.com/sponsors/willfarrell"
   },
-  "gitHead": "e8458a63a1b10932c30556cd8e2bdc4775858d0b"
+  "gitHead": "253ed0e4ca95623decbade03938a07d837a1eba2"
 }