aws-v3-sdk 2.0.0 → 2.0.1

package/clients/all.js

@@ -3,6 +3,7 @@ module.exports = {
   DynamoDB: require('./dynamoDB'),
   EnvironmentCredentials: require('./credential'),
   S3: require('./s3'),
+  S3R: require('./s3R'),
   STS: require('./sts'),
   SQS: require('./sqs'),
   SNS: require('./sns'),

package/clients/dynamo/DocumentClient.js

@@ -116,18 +116,6 @@ class DocumentClient {
     })
   }
 
-  transactWrite (params, callback) {
-    const docClient = DynamoDBDocument.from(new DynamoDB())
-    docClient.transactWrite(params, function (err, data) {
-      if (err) {
-        callback(err)
-      }
-      else {
-        callback(null, data)
-      }
-    })
-  }
-
   batchGet (params, callback) {
     const docClient = DynamoDBDocument.from(ddb)
 
@@ -333,31 +321,6 @@ class DocumentClient {
       return Promise.reject(error)
     })
   }
-
-    transactWriteAsync (params, callback) {
-    const docClient = DynamoDBDocument.from(new DynamoDB())
-    return new Promise((resolve, reject) => {
-      docClient.transactWrite(params, (err, response) => {
-        if (err || !response) {
-          return reject(err)
-        }
-        if (response) {
-          return resolve(response)
-        }
-      })
-    }).then(result => {
-      if (callback && typeof callback === 'function') {
-        callback(null, result)
-      }
-      return result
-    }).catch(error => {
-      if (callback && typeof callback === 'function') {
-        callback(error, null)
-      }
-      return Promise.reject(error)
-    })
-  }
 }
 
-
 module.exports = DocumentClient

package/clients/s3.js

@@ -1,4 +1,4 @@
-const { S3Client, GetObjectCommand, PutObjectCommand, HeadObjectCommand, ListObjectsCommand, DeleteObjectsCommand, CreateMultipartUploadCommand, CompleteMultipartUploadCommand, UploadPartCommand } = require('@aws-sdk/client-s3')
+const { S3Client, GetObjectCommand, PutObjectCommand, ListObjectsCommand, DeleteObjectsCommand, CreateMultipartUploadCommand, CompleteMultipartUploadCommand, UploadPartCommand } = require('@aws-sdk/client-s3')
 const { getSignedUrl } = require('@aws-sdk/s3-request-presigner')
 
 const { Agent } = require('https')
@@ -147,30 +147,6 @@ class S3 {
       return Promise.reject(error)
     })
   }
-
-  headObject (params, callback) {
-    return new Promise((resolve, reject) => {
-      const headObject = new HeadObjectCommand(params)
-      client.send(headObject, (err, data) => {
-        if (err || !data) {
-          resolve(err)
-        }
-        if (data) {
-          resolve(data)
-        }
-      })
-    }).then(result => {
-      if (callback && typeof callback === 'function') {
-        callback(null, result)
-      }
-      return result
-    }).catch(error => {
-      if (callback && typeof callback === 'function') {
-        callback(error, null)
-      }
-      return Promise.reject(error)
-    })
-  }
 }
 
 module.exports = S3

package/clients/s3R.js

@@ -0,0 +1,170 @@
+const { S3Client, GetObjectCommand, PutObjectCommand, ListObjectsCommand, DeleteObjectsCommand, CreateMultipartUploadCommand, CompleteMultipartUploadCommand, UploadPartCommand, ListObjectsV2Command } = require('@aws-sdk/client-s3')
+const { getSignedUrl } = require('@aws-sdk/s3-request-presigner')
+class S3R {
+  constructor (params) {
+    this.client = new S3Client(params)
+  }
+
+  getSignedUrl (type, params, callback) {
+    return new Promise((resolve, reject) => {
+      if (type === 'getObject') {
+        const Expires = params.Expires
+        delete params.Expires
+        const command = new GetObjectCommand(params)
+        getSignedUrl(this.client, command, { expiresIn: Expires }).then(url => {
+          resolve(url)
+        }).catch(err => {
+          resolve(err)
+        })
+      } else if (type === 'putObject') {
+        const Expires = params.Expires
+        delete params.Expires
+        const command = new PutObjectCommand(params)
+        getSignedUrl(this.client, command, { expiresIn: Expires }).then(url => {
+          resolve(url)
+        }).catch(err => {
+          resolve(err)
+        })
+      } else if (type === 'uploadPart') {
+        const Expires = params.Expires
+        delete params.Expires
+        const command = new UploadPartCommand(params)
+        getSignedUrl(this.client, command, { expiresIn: Expires }).then(url => {
+          resolve(url)
+        }).catch(err => {
+          resolve(err)
+        })
+      }
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+
+  createMultipartUpload (params, callback) {
+    return new Promise((resolve, reject) => {
+      const command = new CreateMultipartUploadCommand(params)
+      this.client.send(command).then(response => {
+        resolve(response)
+      }).catch(err => {
+        reject(err)
+      })
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+
+  completeMultipartUpload (params, callback) {
+    return new Promise((resolve, reject) => {
+      const command = new CompleteMultipartUploadCommand(params)
+      this.client.send(command).then(response => {
+        resolve(response)
+      }).catch(err => {
+        resolve(err)
+      })
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+
+  getObject (params, callback) {
+    return new Promise((resolve, reject) => {
+      const getObject = new GetObjectCommand(params)
+      this.client.send(getObject).then(response => {
+        const chunks = []
+        const stream = response.Body
+        stream.on('data', chunk => chunks.push(chunk))
+        stream.on('end', () => {
+          const imageBuffer = Buffer.concat(chunks)
+          response.Body = imageBuffer
+          resolve(response)
+        })
+      }).catch(err => {
+        resolve(err)
+      })
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+
+  putObject (params, callback) {
+    return new Promise((resolve, reject) => {
+      const putObject = new PutObjectCommand(params)
+      this.client.send(putObject, (err, data) => {
+        if (err || !data) {
+          resolve(err)
+        }
+        if (data) {
+          resolve(data)
+        }
+      })
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+
+  listObjectsV2 (params, callback) {
+    return new Promise((resolve, reject) => {
+      const command = new ListObjectsV2Command(params)
+      this.client.send(command, (err, data) => {
+        if (err || !data) {
+          resolve(err)
+        }
+        if (data) {
+          resolve(data)
+        }
+      })
+    }).then(result => {
+      if (callback && typeof callback === 'function') {
+        callback(null, result)
+      }
+      return result
+    }).catch(error => {
+      if (callback && typeof callback === 'function') {
+        callback(error, null)
+      }
+      return Promise.reject(error)
+    })
+  }
+}
+
+module.exports = S3R

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

@@ -48,7 +48,7 @@ exports.sendAuditsReqToES = async (method, index, type, id, data) => {
         index,
         type,
         body: data,
-        refresh: true
+        refresh: false
 
       })
       return response.body

package/es-handler/es-wrapper.js

@@ -28,7 +28,8 @@ const getClient = async () => {
   const cred = createAwsConnector(credentials, REGION)
   return new Client({
     ...cred,
-    node: host
+    node: host,
+    maxRetries: 0
   })
 }
 
@@ -39,7 +40,8 @@ exports.sendReqToES = async (method, index, type, id, data) => {
       const response = await client.delete({
         index,
         type,
-        id
+        id,
+        refresh: false
       })
       return response.body
     } else if (method === 'UPDATE') {
@@ -48,7 +50,17 @@ exports.sendReqToES = async (method, index, type, id, data) => {
         index,
         type,
         body: data,
-        refresh: true
+        refresh: false,
+        retry_on_conflict: 10
+      })
+      return response.body
+    } else if (method === 'UPDATE_BY_QUERY') {
+      const response = await client.updateByQuery({
+        index,
+        type,
+        body: data,
+        refresh: false,
+        retry_on_conflict: 10
       })
       return response.body
     } else {
@@ -57,7 +69,7 @@ exports.sendReqToES = async (method, index, type, id, data) => {
         index,
         type,
         body: data,
-        refresh: true
+        refresh: false
       })
       return response.body
     }

package/es-handler/sendGetRequest.js

@@ -52,7 +52,7 @@ exports.sendGetRequest = async (index, query, from, size, sort, _source) => {
       options.size = size
     }
     if (_source) {
-      options._source = size
+      options._source = _source
     }
     client.search(options).then(response => {
       logger.debug(response, { response })

package/package.json

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