@nxtedition/lib 19.0.40 → 19.0.43

package/package.json

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

package/s3.js

@@ -1,20 +1,14 @@
 import crypto from 'node:crypto'
 import stream from 'node:stream'
-import assert from 'node:assert'
 import AWS from '@aws-sdk/client-s3'
 import PQueue from 'p-queue'
 
 const CONTENT_MD5_EXPR = /^[A-F0-9]{32}$/i
 const CONTENT_LENGTH_EXPR = /^\d+$/i
 
-export async function upload({
-  client: s3,
-  signal,
-  logger,
-  partSize = 16e6,
-  queueSize = 2,
-  params,
-}) {
+const queue = new PQueue({ concurrency: 16 })
+
+export async function upload({ client: s3, signal, logger, partSize = 16e6, params }) {
   if (s3 == null) {
     throw new Error('Invalid client')
   }
@@ -23,10 +17,6 @@ export async function upload({
     throw new Error('Invalid partSize')
   }
 
-  if (!Number.isFinite(queueSize) || queueSize <= 0 || queueSize > 32) {
-    throw new Error('Invalid queueSize')
-  }
-
   if (params == null || typeof params !== 'object') {
     throw new Error('Invalid params')
   }
@@ -41,24 +31,21 @@ export async function upload({
     throw new Error(`Invalid ContentLength: ${ContentLength}`)
   }
 
-  const queue = new PQueue({ concurrency: queueSize })
   const promises = []
 
-  assert(queue.concurrency > 0 && queue.concurrency <= 32)
+  const ac = new AbortController()
+  const onAbort = () => {
+    ac.abort()
+  }
+  signal?.addEventListener('abort', onAbort)
 
   let uploadId
   try {
-    const multipartUploadOutput = await s3.send(
-      new AWS.CreateMultipartUploadCommand({ Bucket, Key }),
-      { abortSignal: signal },
-    )
-    uploadId = multipartUploadOutput.UploadId
-    logger = logger?.child({ uploadId })
-    logger?.debug('multipart upload created')
-
     const uploader = {
       size: 0,
       hasher: crypto.createHash('md5'),
+      ac,
+      signal: ac.signal,
       part: {
         /** @type {Array<Buffer>} **/ chunks: [],
         hasher: crypto.createHash('md5'),
@@ -67,6 +54,16 @@ export async function upload({
       },
     }
 
+    const multipartUploadOutput = await s3.send(
+      new AWS.CreateMultipartUploadCommand({ Bucket, Key }),
+      { abortSignal: uploader.signal },
+    )
+    uploader.signal.throwIfAborted()
+
+    uploadId = multipartUploadOutput.UploadId
+    logger = logger?.child({ uploadId })
+    logger?.debug('multipart upload created')
+
     const maybeFlush = (minSize) => {
       const { part } = uploader
 
@@ -91,7 +88,7 @@ export async function upload({
       promises.push(
         queue
           .add(
-            async ({ signal }) => {
+            async () => {
               logger?.debug({ number, size }, 'part upload started')
               try {
                 const { ETag } = await s3.send(
@@ -111,20 +108,16 @@ export async function upload({
                       },
                     }),
                   }),
-                  { abortSignal: signal },
                 )
                 logger?.debug({ number, size, etag: ETag }, 'part upload completed')
                 return { part: { ETag, PartNumber: number } }
               } catch (err) {
-                if (err.name === 'AbortError') {
-                  logger?.debug({ err }, 'part upload aborted')
-                } else {
-                  logger?.warn({ err }, 'part upload failed')
-                }
+                uploader.ac.abort(err)
+                logger?.warn({ err }, 'part upload failed')
                 return { error: err }
               }
             },
-            { signal },
+            { signal: uploader.signal },
           )
           .catch((err) => ({ error: err })),
       )
@@ -133,7 +126,7 @@ export async function upload({
     }
 
     for await (const chunk of Body) {
-      signal?.throwIfAborted()
+      uploader.signal.throwIfAborted()
 
       uploader.hasher.update(chunk)
       uploader.size += chunk.byteLength
@@ -145,9 +138,11 @@ export async function upload({
       const thenable = maybeFlush(partSize)
       if (thenable) {
         await thenable
+        uploader.signal.throwIfAborted()
       }
     }
     await maybeFlush()
+    uploader.signal.throwIfAborted()
 
     const parts = []
     const errors = []
@@ -158,7 +153,7 @@ export async function upload({
         parts.push(part)
       }
     }
-    signal?.throwIfAborted()
+    uploader.signal.throwIfAborted()
 
     if (errors.length > 0) {
       throw new AggregateError(errors, 'multipart upload failed')
@@ -175,9 +170,8 @@ export async function upload({
         UploadId: uploadId,
         MultipartUpload: { Parts: parts },
       }),
-      { abortSignal: signal },
     )
-    signal?.throwIfAborted()
+    uploader.signal.throwIfAborted()
 
     const result = {
       size: uploader.size,
@@ -212,5 +206,7 @@ export async function upload({
     }
 
     throw err
+  } finally {
+    signal?.removeEventListener('abort', onAbort)
   }
 }