Try to debug s3 queue

package.json

@@ -60,7 +60,7 @@
         "@sentry/tracing": "^5.29.0",
         "@types/lru-cache": "^5.1.0",
         "adm-zip": "^0.4.16",
-        "aws-sdk": "^2.884.0",
+        "aws-sdk": "^2.917.0",
         "fast-deep-equal": "^3.1.3",
         "generic-pool": "^3.7.1",
         "graphile-worker": "^0.11.1",

src/main/job-queues/redlocked/s3-queue.ts

@@ -37,7 +37,7 @@ export class S3Queue extends JobQueueBase {
         const dayTime = `${day.split('-').join('')}-${time.split(':').join('')}`
         const suffix = randomBytes(8).toString('hex')
 
-        await this.s3Wrapper.upload({
+        await this.s3Wrapper.putObject({
             Bucket: this.serverConfig.JOB_QUEUE_S3_BUCKET_NAME,
             Key: `${this.serverConfig.JOB_QUEUE_S3_PREFIX || ''}${day}/${dayTime}-${suffix}.json.gz`,
             Body: gzipSync(Buffer.from(JSON.stringify(retry), 'utf8')),
@@ -160,10 +160,10 @@ export class S3Queue extends JobQueueBase {
             Prefix: this.serverConfig.JOB_QUEUE_S3_PREFIX,
             MaxKeys: 2,
         })
-        await s3Wrapper.upload({
+        await s3Wrapper.putObject({
             Bucket: this.serverConfig.JOB_QUEUE_S3_BUCKET_NAME,
             Key: filename,
-            Body: 'test',
+            Body: Buffer.from('test'),
         })
         const object = await s3Wrapper.getObject({
             Bucket: this.serverConfig.JOB_QUEUE_S3_BUCKET_NAME,

src/utils/db/s3-wrapper.ts

@@ -1,33 +1,87 @@
 import { S3 } from 'aws-sdk'
 
+import { status } from '../status'
+
 export class S3Wrapper {
     s3: S3
 
     constructor(options: S3.Types.ClientConfiguration) {
         this.s3 = new S3(options)
     }
 
-    async upload(params: S3.Types.PutObjectRequest): Promise<S3.ManagedUpload.SendData> {
-        return await new Promise((resolve, reject) => {
-            this.s3?.upload(params, (err, data) => (err ? reject(err) : resolve(data)))
-        })
+    async upload(params: S3.Types.PutObjectRequest): Promise<S3.Types.PutObjectOutput> {
+        return await this.s3.upload(params).promise()
+    }
+
+    async putObject(params: S3.Types.PutObjectRequest): Promise<S3.Types.PutObjectOutput> {
+        try {
+            status.info('#', 's3.putObject', params)
+            const put = this.s3.putObject(params)
+
+            put.on('validate', function (r) {
+                status.info('#', '---validate')
+            })
+            put.on('build', function (r) {
+                status.info('#', '---build')
+            })
+            put.on('sign', function (r) {
+                status.info('#', '---sign')
+            })
+            put.on('send', function (r) {
+                status.info('#', '---send')
+            })
+            put.on('retry', function (r) {
+                status.info('#', '---retry')
+            })
+            put.on('extractError', function (r) {
+                status.info('#', '---extractError')
+            })
+            put.on('extractData', function (r) {
+                status.info('#', '---extractData')
+            })
+            put.on('success', function (r) {
+                status.info('#', '---success')
+            })
+            put.on('error', function (e, r) {
+                status.info('#', '---error')
+            })
+            put.on('complete', function (r) {
+                status.info('#', '---complete')
+            })
+            put.on('httpHeaders', function (s, h, r) {
+                status.info('#', '---httpHeaders')
+            })
+            put.on('httpData', function (c, r) {
+                status.info('#', '---httpData')
+            })
+            put.on('httpUploadProgress', function (p, r) {
+                status.info('#', '---httpUploadProgress')
+            })
+            put.on('httpDownloadProgress', function (p, r) {
+                status.info('#', '---httpDownloadProgress')
+            })
+            put.on('httpError', function (e, r) {
+                status.info('#', '---httpError')
+            })
+            put.on('httpDone', function (r) {
+                status.info('#', '---httpDone')
+            })
+
+            return await put.promise()
+        } finally {
+            status.info('#', 's3.putObject DONE')
+        }
     }
 
     async getObject(params: S3.GetObjectRequest): Promise<S3.Types.GetObjectOutput> {
-        return await new Promise((resolve, reject) =>
-            this.s3?.getObject(params, (err, data) => (err ? reject(err) : resolve(data)))
-        )
+        return await this.s3.getObject(params).promise()
     }
 
     async deleteObject(params: S3.DeleteObjectRequest): Promise<S3.Types.DeleteObjectOutput> {
-        return await new Promise((resolve, reject) =>
-            this.s3?.deleteObject(params, (err, data) => (err ? reject(err) : resolve(data)))
-        )
+        return await this.s3.deleteObject(params).promise()
     }
 
     async listObjectsV2(params: S3.ListObjectsV2Request): Promise<S3.Types.ListObjectsV2Output> {
-        return await new Promise((resolve, reject) =>
-            this.s3?.listObjectsV2(params, (err, data) => (err ? reject(err) : resolve(data)))
-        )
+        return await this.s3.listObjectsV2(params).promise()
     }
 }

yarn.lock

@@ -2250,10 +2250,10 @@ atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-aws-sdk@^2.884.0:
-  version "2.884.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.884.0.tgz#dd82338bb2c26201c59ac799abec3d6db51cbe21"
-  integrity sha512-+rhzq7zmntsj4VJRUf0v6ri9vw3dYroy9BbRtbxLHILdnSFPkoqMcodr/pwcUSO5kYEYbCG7mxr5/R2a+cfbxQ==
+aws-sdk@^2.917.0:
+  version "2.917.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.917.0.tgz#bb963954c9a73e308491468a03a65c7f6952bf30"
+  integrity sha512-9dYbmj2X6AcBOVrjajJbfNTTzQUJ88ZJZ0qpg/nTGn12BDAEEDY0h+woOkz5vF7+ZEHnAPxQHdsyOApFLqeiXQ==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"