@middy/s3 5.1.0 → 5.2.1

package/index.js

@@ -1,64 +1,80 @@
-import { canPrefetch, createPrefetchClient, createClient, getCache, getInternal, processCache, modifyCache, jsonSafeParse } from '@middy/util';
-import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3';
+import {
+  canPrefetch,
+  createPrefetchClient,
+  createClient,
+  getCache,
+  getInternal,
+  processCache,
+  modifyCache,
+  jsonSafeParse,
+  catchInvalidSignatureException
+} from '@middy/util'
+import { S3Client, GetObjectCommand } from '@aws-sdk/client-s3'
 const defaults = {
-    AwsClient: S3Client,
-    awsClientOptions: {},
-    awsClientAssumeRole: undefined,
-    awsClientCapture: undefined,
-    fetchData: {},
-    disablePrefetch: false,
-    cacheKey: 's3',
-    cacheKeyExpiry: {},
-    cacheExpiry: -1,
-    setToContext: false
-};
-const contentTypePattern = /^application\/(.+\+)?json($|;.+)/;
-const s3Middleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    const fetch = (request, cachedValues = {})=>{
-        const values = {};
-        for (const internalKey of Object.keys(options.fetchData)){
-            if (cachedValues[internalKey]) continue;
-            values[internalKey] = client.send(new GetObjectCommand(options.fetchData[internalKey])).then(async (resp)=>{
-                let value = await resp.Body.transformToString();
-                if (contentTypePattern.test(resp.ContentType)) {
-                    value = jsonSafeParse(value);
-                }
-                return value;
-            }).catch((e)=>{
-                const value = getCache(options.cacheKey).value ?? {};
-                value[internalKey] = undefined;
-                modifyCache(options.cacheKey, value);
-                throw e;
-            });
-        }
-        return values;
-    };
-    let client;
-    if (canPrefetch(options)) {
-        client = createPrefetchClient(options);
-        processCache(options, fetch);
+  AwsClient: S3Client,
+  awsClientOptions: {},
+  awsClientAssumeRole: undefined,
+  awsClientCapture: undefined,
+  fetchData: {},
+  disablePrefetch: false,
+  cacheKey: 's3',
+  cacheKeyExpiry: {},
+  cacheExpiry: -1,
+  setToContext: false
+}
+const contentTypePattern = /^application\/(.+\+)?json($|;.+)/
+const s3Middleware = (opts = {}) => {
+  const options = {
+    ...defaults,
+    ...opts
+  }
+  const fetch = (request, cachedValues = {}) => {
+    const values = {}
+    for (const internalKey of Object.keys(options.fetchData)) {
+      if (cachedValues[internalKey]) continue
+      const command = new GetObjectCommand(options.fetchData[internalKey])
+      values[internalKey] = client
+        .send(command)
+        .catch((e) => catchInvalidSignatureException(e, client, command))
+        .then(async (resp) => {
+          let value = await resp.Body.transformToString()
+          if (contentTypePattern.test(resp.ContentType)) {
+            value = jsonSafeParse(value)
+          }
+          return value
+        })
+        .catch((e) => {
+          const value = getCache(options.cacheKey).value ?? {}
+          value[internalKey] = undefined
+          modifyCache(options.cacheKey, value)
+          throw e
+        })
+    }
+    return values
+  }
+  let client
+  if (canPrefetch(options)) {
+    client = createPrefetchClient(options)
+    processCache(options, fetch)
+  }
+  const s3MiddlewareBefore = async (request) => {
+    if (!client) {
+      client = await createClient(options, request)
     }
-    const s3MiddlewareBefore = async (request)=>{
-        if (!client) {
-            client = await createClient(options, request);
-        }
-        const { value } = processCache(options, fetch, request);
-        Object.assign(request.internal, value);
-        if (options.setToContext) {
-            const data = await getInternal(Object.keys(options.fetchData), request);
-            Object.assign(request.context, data);
-        }
-    };
-    return {
-        before: s3MiddlewareBefore
-    };
-};
-export default s3Middleware;
-export function s3Req(req) {
-    return req;
+    const { value } = processCache(options, fetch, request)
+    Object.assign(request.internal, value)
+    if (options.setToContext) {
+      const data = await getInternal(Object.keys(options.fetchData), request)
+      Object.assign(request.context, data)
+    }
+  }
+  return {
+    before: s3MiddlewareBefore
+  }
 }
+export default s3Middleware
 
+// used for TS type inference (see index.d.ts)
+export function s3Req (req) {
+  return req
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/s3",
-  "version": "5.1.0",
+  "version": "5.2.1",
   "description": "S3 middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -58,13 +58,13 @@
     "url": "https://github.com/sponsors/willfarrell"
   },
   "dependencies": {
-    "@middy/util": "5.1.0"
+    "@middy/util": "5.2.1"
   },
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.0.0",
-    "@middy/core": "5.1.0",
+    "@middy/core": "5.2.1",
     "@types/aws-lambda": "^8.10.101",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "bbdaf5843914921804ba085dd58117273febe6b5"
+  "gitHead": "4d55da221b9165b4b3e59a12632fd40a149a1e92"
 }