@middy/s3-object-response 2.5.5 → 2.5.6

package/index.js

@@ -1,116 +1,109 @@
-"use strict";
-
-let https = require('https');
-
-const {
-  URL
-} = require('url');
+let https = require('https')
+const { URL } = require('url')
 
 const {
   canPrefetch,
   createPrefetchClient,
   createClient
-} = require('@middy/util');
+} = require('@middy/util')
 
-const S3 = require('aws-sdk/clients/s3'); // v2
+const S3 = require('aws-sdk/clients/s3') // v2
 // const { S3 } = require('@aws-sdk/client-s3') // v3
 
-
 const defaults = {
-  AwsClient: S3,
-  // Allow for XRay
+  AwsClient: S3, // Allow for XRay
   awsClientOptions: {},
   awsClientAssumeRole: undefined,
   awsClientCapture: undefined,
   httpsCapture: undefined,
   disablePrefetch: false,
   bodyType: undefined
-};
+}
 
 const s3ObjectResponseMiddleware = (opts = {}) => {
-  const options = { ...defaults,
-    ...opts
-  };
+  const options = { ...defaults, ...opts }
 
   if (!['stream', 'promise'].includes(options.bodyType)) {
-    throw new Error('bodyType is invalid.');
+    throw new Error('bodyType is invalid.')
   }
 
   if (options.httpsCapture) {
-    https = options.httpsCapture(https);
+    https = options.httpsCapture(https)
   }
 
-  let client;
-
+  let client
   if (canPrefetch(options)) {
-    client = createPrefetchClient(options);
+    client = createPrefetchClient(options)
   }
 
-  const s3ObjectResponseMiddlewareBefore = async request => {
+  const s3ObjectResponseMiddlewareBefore = async (request) => {
     const {
       inputS3Url,
       outputRoute,
       outputToken
-    } = request.event.getObjectContext;
+    } = request.event.getObjectContext
+
     request.internal.s3ObjectResponse = {
       RequestRoute: outputRoute,
       RequestToken: outputToken
-    };
-    const parsedInputS3Url = new URL(inputS3Url);
+    }
+
+    const parsedInputS3Url = new URL(inputS3Url)
     const fetchOptions = {
       method: 'GET',
       host: parsedInputS3Url.hostname,
       path: parsedInputS3Url.pathname
-    };
-    request.context.s3Object = fetchType(options.bodyType, fetchOptions);
-  };
+    }
 
-  const s3ObjectResponseMiddlewareAfter = async request => {
-    var _request$response$Bod;
+    request.context.s3Object = fetchType(options.bodyType, fetchOptions)
+  }
 
+  const s3ObjectResponseMiddlewareAfter = async (request) => {
     if (!client) {
-      client = await createClient(options, request);
+      client = await createClient(options, request)
     }
 
-    request.response.Body = (_request$response$Bod = request.response.Body) !== null && _request$response$Bod !== void 0 ? _request$response$Bod : request.response.body;
-    delete request.response.body;
-    return client.writeGetObjectResponse({ ...request.response,
-      ...request.internal.s3ObjectResponse
-    }).promise().then(() => ({
-      statusCode: 200
-    })); // TODO test if needed
-  };
+    request.response.Body = request.response.Body ?? request.response.body
+    delete request.response.body
+
+    return client
+      .writeGetObjectResponse({
+        ...request.response,
+        ...request.internal.s3ObjectResponse
+      })
+      .promise()
+      .then(() => ({ statusCode: 200 })) // TODO test if needed
+  }
 
   return {
     before: s3ObjectResponseMiddlewareBefore,
     after: s3ObjectResponseMiddlewareAfter
-  };
-};
+  }
+}
 
 const fetchType = (type, fetchOptions) => {
   if (type === 'stream') {
-    return fetchStream(fetchOptions);
+    return fetchStream(fetchOptions)
   } else if (type === 'promise') {
-    return fetchPromise(fetchOptions);
+    return fetchPromise(fetchOptions)
   }
+  return null
+}
 
-  return null;
-};
-
-const fetchStream = fetchOptions => {
-  return https.request(fetchOptions);
-};
+const fetchStream = (fetchOptions) => {
+  return https.request(fetchOptions)
+}
 
-const fetchPromise = fetchOptions => {
+const fetchPromise = (fetchOptions) => {
   return new Promise((resolve, reject) => {
-    let data = '';
-    const stream = fetchStream(fetchOptions);
-    stream.on('data', chunk => {
-      data += chunk;
-    });
-    stream.on('end', () => resolve(data));
-    stream.on('error', error => reject(error));
-  });
-};
-
-module.exports = s3ObjectResponseMiddleware;
+    let data = ''
+    const stream = fetchStream(fetchOptions)
+    stream.on('data', (chunk) => {
+      data += chunk
+    })
+    stream.on('end', () => resolve(data))
+    stream.on('error', (error) => reject(error))
+  })
+}
+
+module.exports = s3ObjectResponseMiddleware

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@middy/s3-object-response",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "description": "S3 object response handling middleware for the middy framework",
   "type": "commonjs",
   "engines": {
@@ -46,12 +46,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.5"
+    "@middy/util": "^2.5.6"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.5",
+    "@middy/core": "^2.5.6",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "b84840ec8afd289f6decfd0d645be4899051792d"
+  "gitHead": "0c789f55b4adf691f977b0d9904d1a805bb3bb2b"
 }