@nxtedition/lib 15.0.53 → 15.0.54

package/http.js

@@ -2,7 +2,6 @@ const createError = require('http-errors')
 const { performance } = require('perf_hooks')
 const requestTarget = require('request-target')
 const querystring = require('fast-querystring')
-const assert = require('assert')
 const compose = require('koa-compose')
 const http = require('http')
 const fp = require('lodash/fp')
@@ -24,6 +23,31 @@ function genReqId() {
   return `req-${nextReqId.toString(36)}`
 }
 
+const kResolve = Symbol('resolve')
+
+function onTimeout() {
+  this.destroy(new createError.RequestTimeout())
+}
+
+function onRequestError(err) {
+  this.log.error({ err }, 'request error')
+}
+
+function onRequestClose() {
+  this.log.debug('request closed')
+  this[kResolve](null)
+}
+
+function onResponseError(err) {
+  this.log.error({ err }, 'response error')
+  this[kResolve](Promise.reject(err))
+}
+
+function onResponseClose() {
+  this.log.debug('response closed')
+  this[kResolve](null)
+}
+
 module.exports.request = async function request(ctx, next) {
   const { req, res, logger } = ctx
   const startTime = performance.now()
@@ -39,10 +63,10 @@ module.exports.request = async function request(ctx, next) {
     }
 
     ctx.id = req.id = req.headers['request-id'] || genReqId()
-    ctx.logger = req.log = logger.child({ req })
+    ctx.logger = req.log = res.log = logger.child({ req })
     ctx.signal = signal
     ctx.method = req.method
-    ctx.query = ctx.url.search ? querystring.parse(ctx.url.search.slice(1)) : {}
+    ctx.query = ctx.url.search.length > 1 ? querystring.parse(ctx.url.search.slice(1)) : {}
 
     if (req.method === 'GET' || req.method === 'HEAD') {
       req.resume() // Dump the body if there is one.
@@ -54,55 +78,34 @@ module.exports.request = async function request(ctx, next) {
 
     reqLogger = ctx.logger
     if (!isHealthcheck) {
-      reqLogger.debug({ req }, 'request started')
+      reqLogger.debug('request started')
     } else {
-      reqLogger.trace({ req }, 'request started')
+      reqLogger.trace('request started')
     }
 
     await Promise.all([
       next(),
-      new Promise((resolve, reject) => {
-        res
-          .on('timeout', function () {
-            this.destroy(new createError.RequestTimeout())
-          })
-          .on('error', function (err) {
-            reqLogger.error({ err }, 'response error')
-            reject(err)
-          })
-          .on('close', function () {
-            reqLogger.debug('response closed')
-            resolve(null)
-          })
-        req
-          .on('timeout', function () {
-            this.destroy(new createError.RequestTimeout())
-          })
-          .on('error', function (err) {
-            reqLogger.error({ err }, 'request error')
-          })
-          .on('close', function () {
-            reqLogger.debug('request closed')
-          })
+      new Promise((resolve) => {
+        res[kResolve] = resolve
+
+        res.on('timeout', onTimeout).on('error', onResponseError).on('close', onResponseClose)
+
+        req.on('timeout', onTimeout).on('error', onRequestError).on('close', onRequestClose)
       }),
     ])
 
-    assert(req.aborted || res.writableEnded)
-
     const responseTime = Math.round(performance.now() - startTime)
 
-    reqLogger = reqLogger.child({ res, responseTime })
-
-    if (req.aborted) {
-      reqLogger.debug('request aborted')
+    if (!res.writableEnded) {
+      reqLogger.debug({ res, responseTime }, 'request aborted')
     } else if (res.statusCode >= 500) {
-      reqLogger.error('request error')
+      reqLogger.error({ res, responseTime }, 'request error')
     } else if (res.statusCode >= 400) {
-      reqLogger.warn('request failed')
+      reqLogger.warn({ res, responseTime }, 'request failed')
     } else if (!isHealthcheck) {
-      reqLogger.debug('request completed')
+      reqLogger.debug({ res, responseTime }, 'request completed')
     } else {
-      reqLogger.trace('request completed')
+      reqLogger.trace({ res, responseTime }, 'request completed')
     }
 
     ac.abort()
@@ -162,7 +165,7 @@ module.exports.request = async function request(ctx, next) {
     } else {
       reqLogger = reqLogger.child({ res, err, reason, responseTime })
 
-      if (req.aborted || err.name === 'AbortError') {
+      if (req.aborted || !res.writableEnded || err.name === 'AbortError') {
         reqLogger.debug('request aborted')
       } else if (err.statusCode < 500) {
         reqLogger.warn('request failed')
@@ -179,6 +182,8 @@ module.exports.request = async function request(ctx, next) {
     }
 
     ac.abort(err)
+  } finally {
+    res.destroy()
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.53",
+  "version": "15.0.54",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [
@@ -81,7 +81,7 @@
     "lodash": "^4.17.21",
     "mime": "^3.0.0",
     "moment-timezone": "^0.5.43",
-    "nconf": "^0.12.0",
+    "nconf": "^0.12.1",
     "nested-error-stacks": "^2.1.1",
     "object-hash": "^3.0.0",
     "pino-std-serializers": "^6.2.2",
@@ -90,25 +90,25 @@
     "smpte-timecode": "^1.3.3",
     "split-string": "^6.0.0",
     "toobusy-js": "^0.5.1",
-    "undici": "^5.25.4",
+    "undici": "^5.27.1",
     "url-join": "^4.0.0"
   },
   "devDependencies": {
-    "@types/node": "^20.8.2",
-    "eslint": "^8.50.0",
+    "@types/node": "^20.8.10",
+    "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.0.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-n": "^16.1.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-n": "^16.2.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
     "husky": "^8.0.3",
-    "lint-staged": "^14.0.1",
+    "lint-staged": "^15.0.2",
     "pinst": "^3.0.0",
     "prettier": "^3.0.3",
     "rxjs": "^7.5.6",
     "send": "^0.18.0",
-    "tap": "^18.4.2"
+    "tap": "^18.5.6"
   },
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.6.0",