aws-v3-sdk 1.0.33 → 1.0.34

package/clients/all.js

@@ -3,7 +3,6 @@ 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/s3.js

@@ -1,4 +1,4 @@
-const { S3Client, GetObjectCommand, PutObjectCommand, ListObjectsCommand, DeleteObjectsCommand, CreateMultipartUploadCommand, CompleteMultipartUploadCommand, UploadPartCommand } = require('@aws-sdk/client-s3')
+const { S3Client, GetObjectCommand, PutObjectCommand, HeadObjectCommand, ListObjectsCommand, DeleteObjectsCommand, CreateMultipartUploadCommand, CompleteMultipartUploadCommand, UploadPartCommand } = require('@aws-sdk/client-s3')
 const { getSignedUrl } = require('@aws-sdk/s3-request-presigner')
 
 const { Agent } = require('https')
@@ -147,6 +147,30 @@ 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/es-handler/es-audits-wrapper.js

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

package/es-handler/es-wrapper.js

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

package/package.json

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

package/clients/s3R.js

@@ -1,170 +0,0 @@
-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