@nxtedition/lib 21.0.12 → 21.0.14

package/http.js

@@ -27,6 +27,14 @@ export function genReqId() {
 let reqTimeoutError
 let resTimeoutError
 
+function onRequestTimeout() {
+  this.destroy((reqTimeoutError ??= new createError.RequestTimeout()))
+}
+
+function onResponseTimeout() {
+  this.destroy((resTimeoutError ??= new createError.RequestTimeout()))
+}
+
 export async function request(ctx, next) {
   const { req, res, logger } = ctx
   const startTime = performance.now()
@@ -75,24 +83,18 @@ export async function request(ctx, next) {
     await Promise.all([
       next(),
       new Promise((resolve, reject) => {
-        req
-          .on('timeout', function () {
-            this.destroy((reqTimeoutError ??= new createError.RequestTimeout()))
-          })
-          .on('error', function (err) {
-            this.log.error({ err }, 'request error')
-          })
+        req.on('timeout', onRequestTimeout).on('error', function (err) {
+          reject(err)
+        })
         res
-          .on('timeout', function () {
-            this.destroy((resTimeoutError ??= new createError.RequestTimeout()))
-          })
+          .on('timeout', onResponseTimeout)
           .on('error', function (err) {
             reject(err)
           })
           // TODO (fix): Use 'end' once we can trust that
           // 'end' or 'error' will always be emitted.
           .on('close', function () {
-            reqLogger.debug('request closed')
+            this.log.debug('request closed')
             resolve(null)
             ac.abort()
           })

package/package.json

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

package/s3.js

@@ -204,9 +204,11 @@ export async function upload({
                 } catch (err) {
                   logger?.warn({ err }, 'part upload failed')
 
-                  if (retryCount < 5) {
+                  if (retryCount < 16) {
                     logger?.debug({ retryCount }, 'part upload retry')
-                    await tp.setTimeout(1e3, undefined, { signal: uploader.signal })
+                    await tp.setTimeout(retryCount * retryCount * 1e3, undefined, {
+                      signal: uploader.signal,
+                    })
                   } else {
                     uploader.ac.abort(err)
                     return { error: err }

package/serializers.js

@@ -35,8 +35,6 @@ function getTiming(obj) {
 }
 
 export default {
-  data: (data) =>
-    data != null && typeof data === 'object' ? JSON.stringify(data, undefined, 2) : data,
   err: (err) => errSerializer(err),
   socket: (socket) =>
     socket && {
@@ -194,6 +192,7 @@ function errSerializer(err) {
   const _err = Object.create(pinoErrProto)
   _err.type =
     toString.call(err.constructor) === '[object Function]' ? err.constructor.name : err.name
+  _err.name = err.name
   _err.message = err.message
   _err.stack = err.stack
 
@@ -212,7 +211,7 @@ function errSerializer(err) {
         if (!Object.prototype.hasOwnProperty.call(val, seen)) {
           _err[key] = errSerializer(val)
         }
-      } else if (val != null && key[0] !== key[0].toUpperCase()) {
+      } else if (val != null && !/^[A-Z0-9_]+$/.test(key)) {
         _err[key] = val
       }
     }