@nxtedition/lib 19.0.37 → 19.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.0.37",
+  "version": "19.0.40",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -75,11 +75,11 @@
     "/__tests__"
   ],
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.540.0",
-    "@elastic/elasticsearch": "^8.12.2",
-    "@elastic/transport": "^8.4.1",
-    "@nxtedition/nxt-undici": "^2.0.41",
-    "date-fns": "^3.4.0",
+    "@aws-sdk/client-s3": "^3.552.0",
+    "@elastic/elasticsearch": "^8.13.1",
+    "@elastic/transport": "^8.5.0",
+    "@nxtedition/nxt-undici": "^2.0.45",
+    "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",
     "hasha": "^6.0.0",
     "http-errors": "^2.0.0",
@@ -92,7 +92,7 @@
     "nested-error-stacks": "^2.1.1",
     "object-hash": "^3.0.0",
     "p-queue": "^8.0.1",
-    "pino": "^8.19.0",
+    "pino": "^8.20.0",
     "pino-std-serializers": "^6.2.2",
     "qs": "^6.12.0",
     "request-target": "^1.0.2",
@@ -100,18 +100,18 @@
     "split-string": "^6.0.0",
     "split2": "^4.2.0",
     "toobusy-js": "^0.5.1",
-    "undici": "^6.7.1",
+    "undici": "^6.12.0",
     "url-join": "^5.0.0"
   },
   "devDependencies": {
-    "@nxtedition/deepstream.io-client-js": ">=24.1.6",
-    "@types/lodash": "^4.14.202",
-    "@types/node": "^20.11.26",
-    "eslint": "^8.57.0",
+    "@nxtedition/deepstream.io-client-js": ">=24.1.20",
+    "@types/lodash": "^4.17.0",
+    "@types/node": "^20.12.7",
+    "eslint": "^8.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-n": "^16.6.1",
+    "eslint-plugin-n": "^17.1.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "husky": "^9.0.11",

package/s3.js

@@ -1,5 +1,6 @@
 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'
 
@@ -22,7 +23,7 @@ export async function upload({
     throw new Error('Invalid partSize')
   }
 
-  if (!Number.isFinite(queueSize) || queueSize <= 0) {
+  if (!Number.isFinite(queueSize) || queueSize <= 0 || queueSize > 32) {
     throw new Error('Invalid queueSize')
   }
 
@@ -43,6 +44,8 @@ export async function upload({
   const queue = new PQueue({ concurrency: queueSize })
   const promises = []
 
+  assert(queue.concurrency > 0 && queue.concurrency <= 32)
+
   let uploadId
   try {
     const multipartUploadOutput = await s3.send(
@@ -51,7 +54,7 @@ export async function upload({
     )
     uploadId = multipartUploadOutput.UploadId
     logger = logger?.child({ uploadId })
-    logger?.debug('created multipart upload')
+    logger?.debug('multipart upload created')
 
     const uploader = {
       size: 0,
@@ -113,7 +116,11 @@ export async function upload({
                 logger?.debug({ number, size, etag: ETag }, 'part upload completed')
                 return { part: { ETag, PartNumber: number } }
               } catch (err) {
-                logger?.debug({ err }, 'part upload failed')
+                if (err.name === 'AbortError') {
+                  logger?.debug({ err }, 'part upload aborted')
+                } else {
+                  logger?.warn({ err }, 'part upload failed')
+                }
                 return { error: err }
               }
             },
@@ -122,7 +129,7 @@ export async function upload({
           .catch((err) => ({ error: err })),
       )
 
-      return queue.onEmpty()
+      return queue.size > 0 ? queue.onEmpty() : null
     }
 
     for await (const chunk of Body) {
@@ -154,7 +161,7 @@ export async function upload({
     signal?.throwIfAborted()
 
     if (errors.length > 0) {
-      throw new AggregateError(errors, 'upload failed')
+      throw new AggregateError(errors, 'multipart upload failed')
     }
 
     if (parts.length === 0) {
@@ -190,16 +197,15 @@ export async function upload({
       throw new Error(`Expected hash ${hash} but got ${result.hash}`)
     }
 
-    logger?.debug(result, 'completed multipart upload')
+    logger?.debug(result, 'multipart upload completed')
 
     return result
   } catch (err) {
-    logger?.error({ err }, 'failed multipart upload')
+    logger?.error({ err }, 'multipart upload failed')
 
     if (uploadId) {
       try {
         await s3.send(new AWS.AbortMultipartUploadCommand({ Bucket, Key, UploadId: uploadId }))
-        logger?.warn('aborted multipart upload')
       } catch (er) {
         throw new AggregateError([err, er])
       }

package/serializers.js

@@ -1,5 +1,6 @@
 import serializers from 'pino-std-serializers'
 import { SIGNALS } from './platform.js'
+import { util } from 'undici'
 
 function getHeader(obj, key) {
   return obj?.headers?.get?.(key) || obj?.getHeader?.(key) || obj?.headers?.[key]
@@ -11,14 +12,7 @@ function getHeaders(obj) {
   }
 
   if (Array.isArray(obj.headers)) {
-    const src = obj.headers
-    const dst = {}
-    for (let n = 0; n < src.length; n += 2) {
-      const key = src[n].toString().toLowerCase()
-      const val = src[n + 1].toString()
-      dst[key] = dst[key] ? `${dst[key]},${val}` : val
-    }
-    return dst
+    return util.parseHeaders(obj.headers)
   }
 
   return (