@nxtedition/lib 15.0.41 → 15.0.43

package/http.js

@@ -7,7 +7,6 @@ const compose = require('koa-compose')
 const http = require('http')
 const fp = require('lodash/fp')
 const tp = require('timers/promises')
-const { AbortError } = require('./errors')
 
 const ERR_HEADER_EXPR =
   /^(content-length|content-type|te|host|upgrade|trailers|connection|keep-alive|http2-settings|transfer-encoding|proxy-connection|proxy-authenticate|proxy-authorization)$/i
@@ -60,19 +59,34 @@ module.exports.request = async function request(ctx, next) {
       reqLogger.trace({ req }, 'request started')
     }
 
-    const onClose = () => queueMicrotask(() => ac.abort())
-    const onTimeout = () => res.destroy(new createError.RequestTimeout())
-    const onError = (err) => ac.abort(err)
-
-    res.on('close', onClose).on('timeout', onTimeout).on('error', onError)
-
-    req.on('timeout', onTimeout).on('error', onError)
-
-    await next()
+    await Promise.all([
+      next(),
+      new Promise((resolve, reject) => {
+        res
+          .on('timeout', function () {
+            this.destroy(new createError.RequestTimeout())
+          })
+          .on('error', (err) => {
+            reqLogger.error({ err }, 'response error')
+            reject(err)
+          })
+          .on('close', () => {
+            reqLogger.debug('response closed')
+            resolve(null)
+          })
 
-    if (!res.writableEnded && res.destroyed) {
-      throw new AbortError()
-    }
+        req
+          .on('timeout', function () {
+            this.destroy(new createError.RequestTimeout())
+          })
+          .on('error', (err) => {
+            reqLogger.error({ err }, 'request error')
+          })
+          .on('close', () => {
+            reqLogger.debug('request closed')
+          })
+      }),
+    ])
 
     assert(res.writableEnded)
     assert(res.statusCode)
@@ -90,7 +104,10 @@ module.exports.request = async function request(ctx, next) {
     } else {
       reqLogger.trace('request completed')
     }
+
+    ac.abort()
   } catch (err) {
+    const reason = ac.signal.reason
     const responseTime = Math.round(performance.now() - startTime)
 
     req.on('error', (err) => {
@@ -131,7 +148,8 @@ module.exports.request = async function request(ctx, next) {
         res.write(JSON.stringify(err.body))
       }
 
-      reqLogger = reqLogger.child({ res, err, responseTime })
+      reqLogger = reqLogger.child({ res, err, reason, responseTime })
+
       if (res.statusCode < 500) {
         reqLogger.warn('request failed')
       } else {
@@ -142,13 +160,14 @@ module.exports.request = async function request(ctx, next) {
 
       res.end()
     } else {
-      reqLogger = reqLogger.child({ res, err, responseTime })
+      reqLogger = reqLogger.child({ res, err, reason, responseTime })
+
       if (req.aborted || err.name === 'AbortError') {
-        reqLogger.debug({ err }, 'request aborted')
+        reqLogger.debug('request aborted')
       } else if (err.statusCode < 500) {
-        reqLogger.warn({ err }, 'request failed')
+        reqLogger.warn('request failed')
       } else {
-        reqLogger.error({ err }, 'request error')
+        reqLogger.error('request error')
       }
 
       if (res.writableEnded) {
@@ -158,6 +177,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.0.41",
+  "version": "15.0.43",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [