@nxtedition/lib 15.0.18 → 15.0.20

package/http.js

@@ -40,7 +40,7 @@ module.exports.request = async function request(ctx, next) {
     }
 
     ctx.id = req.id = req.headers['request-id'] || genReqId()
-    ctx.logger = req.log = logger.child({ req: { id: req.id, url: req.url } })
+    ctx.logger = req.log = logger.child({ req })
     ctx.signal = signal
     ctx.method = req.method
     ctx.query = ctx.url.search ? querystring.parse(ctx.url.search.slice(1)) : {}
@@ -89,8 +89,6 @@ module.exports.request = async function request(ctx, next) {
   } catch (err) {
     const responseTime = Math.round(performance.now() - startTime)
 
-    reqLogger = reqLogger.child({ req, res, err, responseTime })
-
     req.on('error', (err) => {
       if (res.statusCode > 500 || err.code !== 'ECONNRESET') {
         reqLogger.warn({ err }, 'request error')
@@ -129,14 +127,16 @@ module.exports.request = async function request(ctx, next) {
         res.write(JSON.stringify(err.body))
       }
 
-      if (res.statusCode >= 500) {
-        reqLogger.error('request error')
-      } else if (res.statusCode >= 400) {
+      reqLogger = reqLogger.child({ res, err, responseTime })
+      if (res.statusCode < 500) {
         reqLogger.warn('request failed')
+      } else {
+        reqLogger.error('request error')
       }
 
       res.end()
     } else {
+      reqLogger = reqLogger.child({ res, err, responseTime })
       if (req.aborted || err.name === 'AbortError') {
         reqLogger.debug('request aborted')
       } else if (err.statusCode < 500) {
@@ -206,7 +206,7 @@ module.exports.createServer = function (options, ctx, middleware) {
       requestTimeout: 0,
       ...options,
     },
-    (req, res) => middleware({ req, res, ...factory() })
+    (req, res) => middleware({ req, res, ...factory() }),
   )
 
   server.setTimeout(2 * 60e3)
@@ -235,11 +235,11 @@ module.exports.upgrade = async function upgrade(ctx, next) {
     }
 
     ctx.id = req.id = req.headers['request-id'] || genReqId()
-    ctx.logger = req.log = logger.child({ req: { id: req.id, method: req.method, url: req.url } })
+    ctx.logger = req.log = logger.child({ req })
     ctx.signal = signal
     ctx.query = ctx.url?.search ? querystring.parse(ctx.url.search.slice(1)) : {}
 
-    reqLogger = logger.child({ req })
+    reqLogger = logger
     reqLogger.debug('stream started')
 
     socket.on('error', (err) => {
@@ -256,7 +256,7 @@ module.exports.upgrade = async function upgrade(ctx, next) {
           .on('error', reject)
           .on('timeout', () => {
             reject(new createError.RequestTimeout())
-          })
+          }),
       ),
       new Promise((resolve, reject) =>
         socket
@@ -264,7 +264,7 @@ module.exports.upgrade = async function upgrade(ctx, next) {
           .on('error', reject)
           .on('timeout', () => {
             reject(new createError.RequestTimeout())
-          })
+          }),
       ),
       next(),
     ])

package/lib/undici/utils.js

@@ -62,7 +62,7 @@ function retryAfter(err, retryCount, opts) {
 
   if (err.statusCode && [420, 429, 502, 503, 504].includes(err.statusCode)) {
     const retryAfter = err.headers['retry-after'] ? err.headers['retry-after'] * 1e3 : null
-    return retryAfter ?? Math.min(10e3, retryCount * 1e3)
+    return Number.isFinite(retryAfter) ? retryAfter : Math.min(10e3, retryCount * 1e3)
   }
 
   if (

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.18",
+  "version": "15.0.20",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [