Commit 56a4cff

authored

(feat): Lazy load S3 client (#255)

* Lazy load S3 client, stop creating new S3Client each run if client config * Run prettier

1 parent f2c2999 commit 56a4cffCopy full SHA for 56a4cff

File tree

-12

lines changed

-12

lines changed

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -364,10 +364,6 @@ describe('SendFile Tests:', function() {`
`364`	`364`	`endpoint: "http://test"`
`365`	`365`	`}`
`366`	`366`	`const apiWithConfig = require('../index')({ version: 'v1.0', mimeTypes: { test: 'text/test' }, s3Config})`
`367`		`- let _event = Object.assign({},event,{ path: '/sendfile/s3' })`
`368`		`- await new Promise(r => apiWithConfig.run(_event,{`
`369`		`- s3Config`
`370`		`- },(e,res) => { r(res) }))`
`371`	`367`	`sinon.assert.calledWith(setConfigSpy, s3Config);`
`372`	`368`	`}) // end it`
`373`	`369`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const REQUEST = require('./lib/request');`
`9`	`9`	`const RESPONSE = require('./lib/response');`
`10`	`10`	`const UTILS = require('./lib/utils');`
`11`	`11`	`const LOGGER = require('./lib/logger');`
`12`		`-const S3 = require('./lib/s3-service');`
	`12`	`+const S3 = ()=>require('./lib/s3-service');`
`13`	`13`	`const prettyPrint = require('./lib/prettyPrint');`
`14`	`14`	`const { ConfigurationError } = require('./lib/errors');`
`15`	`15`
`@@ -49,6 +49,9 @@ class API {`
`49`	`49`
`50`	`50`	`this._s3Config = props && props.s3Config;`
`51`	`51`
	`52`	`+ // Set S3 Client`
	`53`	`+ if (this._s3Config) S3().setConfig(this._s3Config);`
	`54`	`+`
`52`	`55`	`this._sampleCounts = {};`
`53`	`56`
`54`	`57`	`this._requestCount = 0;`
`@@ -287,9 +290,6 @@ class API {`
`287`	`290`	`this._context = this.context = typeof context === 'object' ? context : {};`
`288`	`291`	`this._cb = cb ? cb : undefined;`
`289`	`292`
`290`		`- // Set S3 Client`
`291`		`- if (this._s3Config) S3.setConfig(this._s3Config);`
`292`		`-`
`293`	`293`	`// Initalize request and response objects`
`294`	`294`	`let request = new REQUEST(this);`
`295`	`295`	`let response = new RESPONSE(this, request);`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ const path = require('path'); // Require Node.js path`
`12`	`12`	`const compression = require('./compression'); // Require compression lib`
`13`	`13`	`const { ResponseError, FileError } = require('./errors'); // Require custom errors`
`14`	`14`
`15`		`-// Require AWS S3 service`
`16`		`-const S3 = require('./s3-service');`
	`15`	`+// Lazy load AWS S3 service`
	`16`	`+const S3 = ()=>require('./s3-service');`
`17`	`17`
`18`	`18`	`class RESPONSE {`
`19`	`19`	`// Create the constructor function.`
`@@ -195,7 +195,7 @@ class RESPONSE {`
`195`	`195`
`196`	`196`	`// getSignedUrl doesn't support .promise()`
`197`	`197`	`return await new Promise((r) =>`
`198`		`- S3.getSignedUrl('getObject', params, async (e, url) => {`
	`198`	`+ S3().getSignedUrl('getObject', params, async (e, url) => {`
`199`	`199`	`if (e) {`
`200`	`200`	`// Execute callback with caught error`
`201`	`201`	`await fn(e);`
`@@ -336,7 +336,7 @@ class RESPONSE {`
`336`	`336`	`let params = UTILS.parseS3(filepath);`
`337`	`337`
`338`	`338`	`// Attempt to get the object from S3`
`339`		`- let data = await S3.getObject(params).promise();`
	`339`	`+ let data = await S3().getObject(params).promise();`
`340`	`340`
`341`	`341`	`// Set results, type and header`
`342`	`342`	`buffer = data.Body;`

Comments

(0)