@nxtedition/lib 19.0.43 → 19.0.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.0.43",
+  "version": "19.0.44",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/s3.js

@@ -1,5 +1,6 @@
 import crypto from 'node:crypto'
 import stream from 'node:stream'
+import tp from 'node:timers/promises'
 import AWS from '@aws-sdk/client-s3'
 import PQueue from 'p-queue'
 
@@ -89,32 +90,40 @@ export async function upload({ client: s3, signal, logger, partSize = 16e6, para
         queue
           .add(
             async () => {
-              logger?.debug({ number, size }, 'part upload started')
-              try {
-                const { ETag } = await s3.send(
-                  new AWS.UploadPartCommand({
-                    Bucket,
-                    Key,
-                    UploadId: uploadId,
-                    ContentMD5: hasher.digest('base64'),
-                    ContentLength: size,
-                    PartNumber: number,
-                    Body: new stream.Readable({
-                      read() {
-                        for (const chunk of chunks.splice(0)) {
-                          this.push(chunk)
-                        }
-                        this.push(null)
-                      },
+              for (let retryCount = 0; true; retryCount++) {
+                logger?.debug({ number, size }, 'part upload started')
+                try {
+                  const { ETag } = await s3.send(
+                    new AWS.UploadPartCommand({
+                      Bucket,
+                      Key,
+                      UploadId: uploadId,
+                      ContentMD5: hasher.digest('base64'),
+                      ContentLength: size,
+                      PartNumber: number,
+                      Body: new stream.Readable({
+                        read() {
+                          for (const chunk of chunks.splice(0)) {
+                            this.push(chunk)
+                          }
+                          this.push(null)
+                        },
+                      }),
                     }),
-                  }),
-                )
-                logger?.debug({ number, size, etag: ETag }, 'part upload completed')
-                return { part: { ETag, PartNumber: number } }
-              } catch (err) {
-                uploader.ac.abort(err)
-                logger?.warn({ err }, 'part upload failed')
-                return { error: err }
+                  )
+                  logger?.debug({ number, size, etag: ETag }, 'part upload completed')
+                  return { part: { ETag, PartNumber: number } }
+                } catch (err) {
+                  logger?.warn({ err }, 'part upload failed')
+
+                  if (retryCount < 3) {
+                    logger?.warn({ retryCount }, 'part upload retry')
+                    await tp.setTimeout(1e3, undefined, { signal: uploader.signal })
+                  } else {
+                    uploader.ac.abort(err)
+                    return { error: err }
+                  }
+                }
               }
             },
             { signal: uploader.signal },