@middy/s3-object-response 5.1.0 → 5.2.1

package/index.js

@@ -1,49 +1,60 @@
-import { canPrefetch, createPrefetchClient, createClient } from '@middy/util';
-import { S3Client, WriteGetObjectResponseCommand } from '@aws-sdk/client-s3';
+import {
+  canPrefetch,
+  createPrefetchClient,
+  createClient
+  // catchInvalidSignatureException
+} from '@middy/util'
+
+import { S3Client, WriteGetObjectResponseCommand } from '@aws-sdk/client-s3'
+
 const defaults = {
-    AwsClient: S3Client,
-    awsClientOptions: {},
-    awsClientAssumeRole: undefined,
-    awsClientCapture: undefined,
-    disablePrefetch: false
-};
-const s3ObjectResponseMiddleware = (opts = {})=>{
-    const options = {
-        ...defaults,
-        ...opts
-    };
-    let client;
-    if (canPrefetch(options)) {
-        client = createPrefetchClient(options);
+  AwsClient: S3Client,
+  awsClientOptions: {},
+  awsClientAssumeRole: undefined,
+  awsClientCapture: undefined,
+  disablePrefetch: false
+}
+
+const s3ObjectResponseMiddleware = (opts = {}) => {
+  const options = { ...defaults, ...opts }
+
+  let client
+  if (canPrefetch(options)) {
+    client = createPrefetchClient(options)
+  }
+
+  const s3ObjectResponseMiddlewareBefore = async (request) => {
+    const { inputS3Url } = request.event.getObjectContext
+
+    request.context.s3ObjectFetch = fetch(inputS3Url)
+  }
+
+  const s3ObjectResponseMiddlewareAfter = async (request) => {
+    if (!client) {
+      client = await createClient(options, request)
     }
-    const s3ObjectResponseMiddlewareBefore = async (request)=>{
-        const { inputS3Url, outputRoute, outputToken } = request.event.getObjectContext;
-        request.internal.s3ObjectResponse = {
-            RequestRoute: outputRoute,
-            RequestToken: outputToken
-        };
-        request.context.s3ObjectFetch = fetch(inputS3Url);
-    };
-    const s3ObjectResponseMiddlewareAfter = async (request)=>{
-        if (!client) {
-            client = await createClient(options, request);
-        }
-        if (request.response.body) {
-            request.response.Body = request.response.body;
-            delete request.response.body;
-        }
-        await client.send(new WriteGetObjectResponseCommand({
-            ...request.internal.s3ObjectResponse,
-            ...request.response
-        }));
-        return {
-            statusCode: 200
-        };
-    };
-    return {
-        before: s3ObjectResponseMiddlewareBefore,
-        after: s3ObjectResponseMiddlewareAfter
-    };
-};
-export default s3ObjectResponseMiddleware;
 
+    request.response.RequestRoute = request.event.getObjectContext.outputRoute
+    request.response.RequestToken = request.event.getObjectContext.outputToken
+
+    if (request.response.body) {
+      request.response.Body = request.response.body
+      delete request.response.body
+    }
+
+    const command = new WriteGetObjectResponseCommand(
+      request.internal.s3ObjectResponse
+    )
+    await client.send(command) // Doesn't return a promise?
+    // .catch((e) => catchInvalidSignatureException(e, client, command))
+
+    return { statusCode: 200 }
+  }
+
+  return {
+    before: s3ObjectResponseMiddlewareBefore,
+    after: s3ObjectResponseMiddlewareAfter
+  }
+}
+
+export default s3ObjectResponseMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/s3-object-response",
-  "version": "5.1.0",
+  "version": "5.2.1",
   "description": "S3 object response handling middleware for the middy framework",
   "type": "module",
   "engines": {
@@ -60,13 +60,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"
 }