aws-v3-sdk 1.0.25 → 1.0.26

package/README.md

@@ -1,4 +1,2 @@
 # aws-v3-sdk
 AWS JS SDK UTILS
-
-PROD Release

package/clients/cognito.js

@@ -15,7 +15,7 @@ class CognitoIdentityServiceProvider {
   }
 
   async adminCreateUser (params, callback) {
-    const command = new AdminCreateUserCommand(params);
+    const command = new AdminCreateUserCommand(params)
     this.client.send(command).then(data => {
       callback(null, data)
     }).catch(err => {
@@ -24,7 +24,7 @@ class CognitoIdentityServiceProvider {
   }
 
   async adminSetUserMFAPreference (params, callback) {
-    const command = new AdminSetUserMFAPreferenceCommand(params);
+    const command = new AdminSetUserMFAPreferenceCommand(params)
     this.client.send(command).then(data => {
       callback(null, data)
     }).catch(err => {
@@ -33,7 +33,7 @@ class CognitoIdentityServiceProvider {
   }
 
   async adminDeleteUser (params, callback) {
-    const command = new AdminDeleteUserCommand(params);
+    const command = new AdminDeleteUserCommand(params)
     this.client.send(command).then(data => {
       callback(null, data)
     }).catch(err => {
@@ -42,7 +42,7 @@ class CognitoIdentityServiceProvider {
   }
 
   async adminEnableUser (params, callback) {
-    const command = new AdminEnableUserCommand(params);
+    const command = new AdminEnableUserCommand(params)
     this.client.send(command).then(data => {
       callback(null, data)
     }).catch(err => {
@@ -50,9 +50,8 @@ class CognitoIdentityServiceProvider {
     })
   }
 
-
   async adminDisableUser (params, callback) {
-    const command = new AdminDisableUserCommand(params);
+    const command = new AdminDisableUserCommand(params)
     this.client.send(command).then(data => {
       callback(null, data)
     }).catch(err => {
@@ -61,14 +60,13 @@ class CognitoIdentityServiceProvider {
   }
 
   async adminUserGlobalSignOut (params, callback) {
-    const command = new AdminUserGlobalSignOutCommand(params);
+    const command = new AdminUserGlobalSignOutCommand(params)
     this.client.send(command).then(data => {
       callback(null, data)
     }).catch(err => {
       callback(err)
     })
   }
-
 }
 
 module.exports = CognitoIdentityServiceProvider

package/clients/dynamo/DocumentClient.js

@@ -1,8 +1,16 @@
 const { DynamoDB, DynamoDBClient } = require('@aws-sdk/client-dynamodb')
 const { DynamoDBDocument, DynamoDBDocumentClient, GetCommand, BatchWriteCommand, PutCommand, QueryCommand, ScanCommand, DeleteCommand } = require('@aws-sdk/lib-dynamodb')
-const ddb = new DynamoDBClient()
-const documentClient = DynamoDBDocumentClient.from(ddb)
 
+const { Agent } = require('https')
+const { NodeHttpHandler } = require('@aws-sdk/node-http-handler')
+
+const ddb = new DynamoDBClient({
+  requestHandler: new NodeHttpHandler({
+    httpsAgent: new Agent({ keepAlive: false })
+  })
+})
+
+const documentClient = DynamoDBDocumentClient.from(ddb)
 class DocumentClient {
   get (params, callback) {
     const getCommand = new GetCommand(params)
@@ -60,7 +68,7 @@ class DocumentClient {
   }
 
   delete (params, callback) {
-    const docClient = DynamoDBDocument.from(new DynamoDB())
+    const docClient = DynamoDBDocument.from(ddb)
     docClient.delete(params, (err, response) => {
       if (err) {
         return callback(err)
@@ -109,7 +117,7 @@ class DocumentClient {
   }
 
   batchGet (params, callback) {
-    const docClient = DynamoDBDocument.from(new DynamoDB())
+    const docClient = DynamoDBDocument.from(ddb)
 
     docClient.batchGet(params, function (err, data) {
       if (err) callback(err)
@@ -180,7 +188,6 @@ class DocumentClient {
           return resolve(null)
         }
       })
-      
     }).then(result => {
       if (callback && typeof callback === 'function') {
         callback(null, result)
@@ -225,7 +232,7 @@ class DocumentClient {
 
   deleteAsync (params, callback) {
     return new Promise((resolve, reject) => {
-      const docClient = DynamoDBDocument.from(new DynamoDB())
+      const docClient = DynamoDBDocument.from(ddb)
       docClient.delete(params, (err, response) => {
         if (err) {
           return resolve(err)
@@ -248,7 +255,7 @@ class DocumentClient {
 
   updateAsync (params, callback) {
     return new Promise((resolve, reject) => {
-      const docClient = DynamoDBDocument.from(new DynamoDB())
+      const docClient = DynamoDBDocument.from(ddb)
       docClient.update(params, (err, response) => {
         if (err) {
           return resolve(err)
@@ -269,10 +276,9 @@ class DocumentClient {
     })
   }
 
-
   batchGetAsync (params, callback) {
     return new Promise((resolve, reject) => {
-      const docClient = DynamoDBDocument.from(new DynamoDB())
+      const docClient = DynamoDBDocument.from(ddb)
       docClient.batchGet(params, function (err, response) {
         if (err) reject(err)
         else {

package/clients/lambda.js

@@ -1,12 +1,19 @@
 const { LambdaClient, InvokeCommand, InvokeAsyncCommand } = require('@aws-sdk/client-lambda')
 const { toUtf8, fromUtf8 } = require('@aws-sdk/util-utf8-node')
 
+const { Agent } = require('https')
+const { NodeHttpHandler } = require('@aws-sdk/node-http-handler')
+
+const keepAliveOptions = new NodeHttpHandler({
+  httpsAgent: new Agent({ keepAlive: false })
+})
+
 class Lambda {
   constructor (region, session) {
     if (region && session) {
-      this.client = new LambdaClient({ region, credentials: session })
+      this.client = new LambdaClient({ region, credentials: session, requestHandler: keepAliveOptions })
     } else {
-      this.client = new LambdaClient()
+      this.client = new LambdaClient({ requestHandler: keepAliveOptions })
     }
   }
 

package/clients/s3.js

@@ -1,6 +1,14 @@
 const { S3Client, GetObjectCommand, PutObjectCommand, ListObjectsCommand, DeleteObjectsCommand, CreateMultipartUploadCommand, CompleteMultipartUploadCommand, UploadPartCommand } = require('@aws-sdk/client-s3')
 const { getSignedUrl } = require('@aws-sdk/s3-request-presigner')
-const client = new S3Client({})
+
+const { Agent } = require('https')
+const { NodeHttpHandler } = require('@aws-sdk/node-http-handler')
+
+const client = new S3Client({
+  requestHandler: new NodeHttpHandler({
+    httpsAgent: new Agent({ keepAlive: false })
+  })
+})
 
 class S3 {
   getSignedUrl (type, params, callback) {

package/clients/sns.js

@@ -1,13 +1,21 @@
-const { SNSClient, PublishCommand } = require("@aws-sdk/client-sns");
-const snsClient = new SNSClient({});
+const { SNSClient, PublishCommand } = require('@aws-sdk/client-sns')
+
+const { Agent } = require('https')
+const { NodeHttpHandler } = require('@aws-sdk/node-http-handler')
+
+const snsClient = new SNSClient({
+  requestHandler: new NodeHttpHandler({
+    httpsAgent: new Agent({ keepAlive: false })
+  })
+})
 
 class SNS {
   publish (params, callback) {
     return new Promise((resolve, reject) => {
-      let publishCommand = new PublishCommand(params)
-      const response =  snsClient.send(publishCommand).then(response=>{
+      const publishCommand = new PublishCommand(params)
+      snsClient.send(publishCommand).then(response => {
         resolve(response)
-      }).catch(err=>{
+      }).catch(err => {
         reject(err)
       })
     }).then(result => {

package/clients/sqs.js

@@ -1,24 +1,30 @@
-const { SQSClient, ReceiveMessageCommand, DeleteMessageCommand, SendMessageCommand } = require("@aws-sdk/client-sqs");
-const snsClient = new SQSClient();
+const { SQSClient, ReceiveMessageCommand, DeleteMessageCommand, SendMessageCommand } = require('@aws-sdk/client-sqs')
 
+const { Agent } = require('https')
+const { NodeHttpHandler } = require('@aws-sdk/node-http-handler')
+
+const sqsClient = new SQSClient({
+  requestHandler: new NodeHttpHandler({
+    httpsAgent: new Agent({ keepAlive: false })
+  })
+})
 class SQS {
- async sendMessage (params, callback) {
-      const command = new SendMessageCommand(params)
-      const response =  await snsClient.send(command)
-      return response
+  async sendMessage (params, callback) {
+    const command = new SendMessageCommand(params)
+    const response = await sqsClient.send(command)
+    return response
   }
 
   async receiveMessage (params, callback) {
     const command = new ReceiveMessageCommand(params)
-    const response = await  snsClient.send(command)
+    const response = await sqsClient.send(command)
     return response
-}
-
+  }
 
- async deleteMessage (params, callback) {
-      const command = new DeleteMessageCommand(params)
-      const response =  await snsClient.send(command)
-      return response
+  async deleteMessage (params, callback) {
+    const command = new DeleteMessageCommand(params)
+    const response = await sqsClient.send(command)
+    return response
   }
 }
 

package/es-handler/es-audits-wrapper.js

@@ -1,6 +1,7 @@
 const { Client, Connection } = require('@opensearch-project/opensearch')
 const { defaultProvider } = require('@aws-sdk/credential-provider-node')
 const aws4 = require('aws4')
+const logger = require('../utils/logger')
 
 const { REGION, ELASTICSEARCH_AUDITS_ENDPOINT } = process.env
 
@@ -32,23 +33,28 @@ const getClient = async () => {
 }
 
 exports.sendAuditsReqToES = async (method, index, type, id, data) => {
-  const client = await getClient()
-  if (method === 'DELETE') {
-    const response = await client.delete({
-      index,
-      type,
-      id
-    })
-    return response.body
-  } else {
-    const response = await client.index({
-      id,
-      index,
-      type,
-      body: data,
-      refresh: true
+  try {
+    const client = await getClient()
+    if (method === 'DELETE') {
+      const response = await client.delete({
+        index,
+        type,
+        id
+      })
+      return response.body
+    } else {
+      const response = await client.index({
+        id,
+        index,
+        type,
+        body: data,
+        refresh: true
 
-    })
-    return response.body
+      })
+      return response.body
+    }
+  } catch (error) {
+    logger.error('ES Error', { error })
+    return error
   }
 }

package/es-handler/es-wrapper.js

@@ -1,6 +1,7 @@
 const { Client, Connection } = require('@opensearch-project/opensearch')
 const { defaultProvider } = require('@aws-sdk/credential-provider-node')
 const aws4 = require('aws4')
+const logger = require('../utils/logger')
 
 const { REGION, ELASTICSEARCH_ENDPOINT } = process.env
 
@@ -61,6 +62,7 @@ exports.sendReqToES = async (method, index, type, id, data) => {
       return response.body
     }
   } catch (error) {
+    logger.error('ES Error', { error })
     return error
   }
 }

package/es-handler/sendGetRequest.js

@@ -1,6 +1,7 @@
 const { Client, Connection } = require('@opensearch-project/opensearch')
 const { defaultProvider } = require('@aws-sdk/credential-provider-node')
 const aws4 = require('aws4')
+const logger = require('../utils/logger')
 
 const { REGION, ELASTICSEARCH_ENDPOINT } = process.env
 const host = 'https://' + ELASTICSEARCH_ENDPOINT
@@ -33,25 +34,41 @@ const getClient = async () => {
 exports.sendGetRequest = async (index, query, from, size, sort, _source) => {
   const client = await getClient()
   return new Promise((resolve, reject) => {
-    let body = { query }
+    const body = {}
+    if (query) {
+      body.query = query
+    }
     if (sort) {
-      body = { query, sort }
+      body.sort = sort
     }
-    client.search({
+    const options = {
       index,
-      from,
-      size,
-      _source,
       body
-    }).then(response => {
+    }
+    if (from) {
+      options.from = from
+    }
+    if (size) {
+      options.size = size
+    }
+    if (_source) {
+      options._source = size
+    }
+    client.search(options).then(response => {
+      logger.debug(response, { response })
       const data = response.body.hits.hits
       const totalCount = response.body.hits.total
       const mappedData = data.map(item => {
         return item._source
       })
       resolve({ items: mappedData, data: mappedData, totalCount })
-    }).catch(e => {
-      resolve({ items: [], data: [], totalCount: 0 })
+    }).catch(err => {
+      if (err) {
+        logger.error('ES sendGetRequest Error', { err })
+        reject(err)
+      } else {
+        resolve({ items: [], data: [], totalCount: 0 })
+      }
     })
   })
 }
@@ -59,24 +76,37 @@ exports.sendGetRequest = async (index, query, from, size, sort, _source) => {
 exports.sendGetRequestCallback = async (index, query, from, size, sort, callback) => {
   const client = await getClient()
   return new Promise((resolve, reject) => {
-    let body = { query }
+    const body = {}
+    if (query) {
+      body.query = query
+    }
     if (sort) {
-      body = { query, sort }
+      body.sort = sort
     }
-    client.search({
+    const options = {
       index,
-      from,
-      size,
       body
-    }).then(response => {
+    }
+    if (from) {
+      options.from = from
+    }
+    if (size) {
+      options.size = size
+    }
+    client.search(options).then(response => {
       const data = response.body.hits.hits
       const totalCount = response.body.hits.total
       const mappedData = data.map(item => {
         return item._source
       })
       callback(null, { items: mappedData, data: mappedData, totalCount })
-    }).catch(e => {
-      callback(null, { items: [], data: [], totalCount: 0 })
+    }).catch(err => {
+      if (err) {
+        logger.error('ES Error', { err })
+        reject(err)
+      } else {
+        resolve({ items: [], data: [], totalCount: 0 })
+      }
     })
   })
 }
@@ -90,9 +120,13 @@ exports.getCount = async (index, query) => {
     }).then(response => {
       const data = response.body
       resolve({ data })
-    }).catch(e => {
-      console.log(e);
-      resolve({ })
+    }).catch(err => {
+      if (err) {
+        logger.error('ES Error', { err })
+        reject(err)
+      } else {
+        resolve({ items: [], data: [], totalCount: 0 })
+      }
     })
   })
 }
@@ -100,17 +134,18 @@ exports.getCount = async (index, query) => {
 exports.multiSearch = async (query) => {
   const client = await getClient()
   return new Promise((resolve, reject) => {
-    let body = query 
+    const body = query
     client.msearch({
       body
     }).then(response => {
-      resolve(response);
-    }).catch(e => {
-      console.log(e);
-      resolve({ items: [], data: [], totalCount: 0 })
+      resolve(response)
+    }).catch(err => {
+      if (err) {
+        logger.error('ES Error', { err })
+        reject(err)
+      } else {
+        resolve({ items: [], data: [], totalCount: 0 })
+      }
     })
   })
 }
-
-
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-v3-sdk",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "AWS v3 SDK Utils",
   "main": "index.js",
   "scripts": {

package/utils/logger.js

@@ -0,0 +1,16 @@
+const winston = require('winston')
+
+const level = process.env.LOG_LEVEL || 'debug'
+const logger = winston.createLogger({
+  level,
+  transports: [
+    new winston.transports.Console({
+      level,
+      timestamp: function () {
+        return (new Date()).toISOString()
+      }
+    })
+  ]
+})
+
+module.exports = logger