@nxtedition/lib 15.1.4 → 15.1.6

package/http.js

@@ -23,24 +23,11 @@ function genReqId() {
   return `req-${nextReqId.toString(36)}`
 }
 
-function onTimeout() {
-  this.destroy(new createError.RequestTimeout())
-}
-
-function onRequestError(err) {
-  this.log.error({ err }, 'request error')
-}
-
-function onRequestEnd() {
-  this.log.debug('request end')
-}
-
 module.exports.request = async function request(ctx, next) {
   const { req, res, logger } = ctx
   const startTime = performance.now()
 
   const ac = new AbortController()
-  const signal = ac.signal
 
   let reqLogger = logger
   try {
@@ -51,7 +38,7 @@ module.exports.request = async function request(ctx, next) {
 
     ctx.id = req.id = req.headers['request-id'] || genReqId()
     ctx.logger = req.log = res.log = logger.child({ req: { id: req.id, url: req.url } })
-    ctx.signal = signal
+    ctx.signal = ac.signal
     ctx.method = req.method
     ctx.query = ctx.url.search.length > 1 ? querystring.parse(ctx.url.search.slice(1)) : {}
 
@@ -63,37 +50,49 @@ module.exports.request = async function request(ctx, next) {
 
     const isHealthcheck = ctx.url.pathname === '/healthcheck'
 
-    reqLogger = ctx.logger.child({ req })
+    reqLogger = logger.child({ req })
     if (!isHealthcheck) {
       reqLogger.debug('request started')
     } else {
       reqLogger.trace('request started')
     }
 
-    next()?.catch((err) => res.destroy(err))
-
-    await new Promise((resolve, reject) => {
-      req.on('timeout', onTimeout).on('error', onRequestError).on('end', onRequestEnd)
-      res
-        .on('timeout', onTimeout)
-        .on('error', function (err) {
-          this.log.error({ err }, 'response error')
-          ac.abort(err)
-          reject(err)
-        })
-        .on('finish', function () {
-          this.log.debug('response finish')
-          ac.abort()
-          resolve(null)
-        })
-        // TODO (fix): Remove this once we can trust that
-        // node always emits error or finish.
-        .on('close', function () {
-          this.log.debug('response close')
-          ac.abort()
-          resolve(null)
-        })
-    })
+    await Promise.all([
+      next(),
+      new Promise((resolve, reject) => {
+        req
+          .on('timeout', function () {
+            this.destroy(new createError.RequestTimeout())
+          })
+          .on('error', function (err) {
+            this.log.error({ err }, 'request error')
+          })
+          .on('end', function () {
+            this.log.trace('request end')
+          })
+          .on('close', function () {
+            this.log.trace('request close')
+          })
+        res
+          .on('timeout', function () {
+            this.destroy(new createError.RequestTimeout())
+          })
+          .on('error', function (err) {
+            this.log.error({ err }, 'response error')
+          })
+          .on('finish', function () {
+            this.log.trace('response finish')
+          })
+          .on('close', function () {
+            this.log.trace('response close')
+            if (this.errored) {
+              reject(this.errored)
+            } else {
+              resolve(null)
+            }
+          })
+      }),
+    ])
 
     const responseTime = Math.round(performance.now() - startTime)
 
@@ -108,20 +107,11 @@ module.exports.request = async function request(ctx, next) {
     } else {
       reqLogger.trace({ res, responseTime }, 'request completed')
     }
+
+    ac.abort()
   } catch (err) {
-    const reason = ac.signal.reason
     const responseTime = Math.round(performance.now() - startTime)
 
-    req.on('error', (err) => {
-      if (res.statusCode > 500 || err.code !== 'ECONNRESET') {
-        reqLogger.warn({ err }, 'request error')
-      }
-    })
-
-    res.on('error', (err) => {
-      reqLogger.warn({ err }, 'request error')
-    })
-
     if (!res.headersSent && !res.destroyed) {
       res.statusCode = err.statusCode || 500
 
@@ -150,7 +140,7 @@ module.exports.request = async function request(ctx, next) {
         res.write(JSON.stringify(err.body))
       }
 
-      reqLogger = reqLogger.child({ res, err, reason, responseTime })
+      reqLogger = reqLogger.child({ res, err, responseTime })
 
       if (res.statusCode < 500) {
         reqLogger.warn('request failed')
@@ -162,7 +152,7 @@ module.exports.request = async function request(ctx, next) {
 
       res.end()
     } else {
-      reqLogger = reqLogger.child({ res, err, reason, responseTime })
+      reqLogger = reqLogger.child({ res, err, responseTime })
 
       if (req.aborted || !res.writableEnded || err.name === 'AbortError') {
         reqLogger.debug('request aborted')
@@ -179,6 +169,8 @@ module.exports.request = async function request(ctx, next) {
         res.destroy()
       }
     }
+
+    ac.abort(err)
   }
 }
 

package/package.json

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