@middy/s3-object-response 2.5.1 → 3.0.0-alpha.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2021 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
+Copyright (c) 2017-2022 Luciano Mammino, will Farrell and the [Middy team](https://github.com/middyjs/middy/graphs/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -104,7 +104,7 @@ Everyone is very welcome to contribute to this repository. Feel free to [raise i
 
 ## License
 
-Licensed under [MIT License](LICENSE). Copyright (c) 2017-2021 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
+Licensed under [MIT License](LICENSE). Copyright (c) 2017-2022 Luciano Mammino, will Farrell, and the [Middy team](https://github.com/middyjs/middy/graphs/contributors).
 
 <a href="https://app.fossa.io/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy?ref=badge_large">
   <img src="https://app.fossa.io/api/projects/git%2Bgithub.com%2Fmiddyjs%2Fmiddy.svg?type=large" alt="FOSSA Status"  style="max-width:100%;">

package/index.d.ts

@@ -1,13 +1,10 @@
 import { S3 } from 'aws-sdk'
-import { captureAWSClient } from 'aws-xray-sdk'
 import middy from '@middy/core'
+import { Options as MiddyOptions } from '@middy/util'
 
-interface Options<S = S3> {
-  AwsClient?: new() => S
-  awsClientOptions?: Partial<S3.Types.ClientConfiguration>
-  awsClientAssumeRole?: string
-  awsClientCapture?: typeof captureAWSClient
-  disablePrefetch?: boolean
+interface Options<S = S3>
+  extends Pick<MiddyOptions<S, S3.Types.ClientConfiguration>,
+  'AwsClient' | 'awsClientOptions' | 'awsClientAssumeRole' | 'awsClientCapture' | 'disablePrefetch'> {
   bodyType?: string
 }
 

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@middy/s3-object-response",
-  "version": "2.5.1",
+  "version": "3.0.0-alpha.0",
   "description": "S3 object response handling middleware for the middy framework",
-  "type": "commonjs",
+  "type": "module",
   "engines": {
-    "node": ">=12"
+    "node": ">=14"
   },
   "engineStrict": true,
   "publishConfig": {
     "access": "public"
   },
-  "main": "index.js",
+  "exports": "./index.js",
   "types": "index.d.ts",
   "files": [
     "index.d.ts"
@@ -46,12 +46,12 @@
   },
   "homepage": "https://github.com/middyjs/middy#readme",
   "dependencies": {
-    "@middy/util": "^2.5.1"
+    "@middy/util": "^3.0.0-alpha.0"
   },
   "devDependencies": {
-    "@middy/core": "^2.5.1",
+    "@middy/core": "^3.0.0-alpha.0",
     "aws-sdk": "^2.939.0",
     "aws-xray-sdk": "^3.3.3"
   },
-  "gitHead": "df18e5eff7d73492a96a2ca4780a2eae45d1cedb"
+  "gitHead": "c533f62841c8a39d061d7b94f30ba178f002c8db"
 }

package/index.js

@@ -1,116 +0,0 @@
-"use strict";
-
-let https = require('https');
-
-const {
-  URL
-} = require('url');
-
-const {
-  canPrefetch,
-  createPrefetchClient,
-  createClient
-} = require('@middy/util');
-
-const S3 = require('aws-sdk/clients/s3'); // v2
-// const { S3 } = require('@aws-sdk/client-s3') // v3
-
-
-const defaults = {
-  AwsClient: S3,
-  // Allow for XRay
-  awsClientOptions: {},
-  awsClientAssumeRole: undefined,
-  awsClientCapture: undefined,
-  httpsCapture: undefined,
-  disablePrefetch: false,
-  bodyType: undefined
-};
-
-const s3ObjectResponseMiddleware = (opts = {}) => {
-  const options = { ...defaults,
-    ...opts
-  };
-
-  if (!['stream', 'promise'].includes(options.bodyType)) {
-    throw new Error('bodyType is invalid.');
-  }
-
-  if (options.httpsCapture) {
-    https = options.httpsCapture(https);
-  }
-
-  let client;
-
-  if (canPrefetch(options)) {
-    client = createPrefetchClient(options);
-  }
-
-  const s3ObjectResponseMiddlewareBefore = async request => {
-    const {
-      inputS3Url,
-      outputRoute,
-      outputToken
-    } = request.event.getObjectContext;
-    request.internal.s3ObjectResponse = {
-      RequestRoute: outputRoute,
-      RequestToken: outputToken
-    };
-    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;
-
-    if (!client) {
-      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
-  };
-
-  return {
-    before: s3ObjectResponseMiddlewareBefore,
-    after: s3ObjectResponseMiddlewareAfter
-  };
-};
-
-const fetchType = (type, fetchOptions) => {
-  if (type === 'stream') {
-    return fetchStream(fetchOptions);
-  } else if (type === 'promise') {
-    return fetchPromise(fetchOptions);
-  }
-
-  return null;
-};
-
-const fetchStream = fetchOptions => {
-  return https.request(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;