@nxtedition/lib 21.0.15 → 21.0.17

package/http.js

@@ -52,20 +52,7 @@ export async function request(ctx, next) {
     ctx.signal = ac.signal
     ctx.method = req.method
     ctx.query = ctx.url.search.length > 1 ? querystring.parse(ctx.url.search.slice(1)) : {}
-    ctx.logger =
-      req.log =
-      res.log =
-        logger.child({
-          req: {
-            id: req.id,
-            url: req.url,
-            scheme: ctx.url.protocol,
-            host: ctx.url.hostname,
-            port: ctx.url.port,
-            path: ctx.url.pathname,
-            query: ctx.query,
-          },
-        })
+    ctx.logger = req.log = res.log = logger.child({ req: { id: req.id, url: req.url } })
 
     if (req.method === 'GET' || req.method === 'HEAD') {
       req.resume() // Dump the body if there is one.
@@ -80,28 +67,19 @@ export async function request(ctx, next) {
       reqLogger.debug('request started')
     }
 
-    await Promise.all([
-      next(),
-      new Promise((resolve, reject) => {
-        req.on('timeout', onRequestTimeout).on('error', function (err) {
-          reject(err)
-        })
-        res
-          .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 () {
-            this.log.debug('request closed')
-            resolve(null)
-            ac.abort()
-          })
-      }),
-    ])
+    try {
+      await Promise.all([
+        next(),
+        new Promise((resolve, reject) => {
+          req.on('timeout', onRequestTimeout).on('error', reject)
+          res.on('timeout', onResponseTimeout).on('error', reject).on('close', resolve)
+        }),
+      ])
+    } finally {
+      ac.abort()
+    }
 
-    const elapsedTime = Math.round(performance.now() - startTime)
+    const elapsedTime = Math.ceil(performance.now() - startTime)
 
     if (isHealthcheck) {
       // Do nothing...
@@ -116,7 +94,7 @@ export async function request(ctx, next) {
     }
   } catch (err) {
     const statusCode = err.statusCode || err.$metadata?.httpStatusCode || 500
-    const responseTime = Math.round(performance.now() - startTime)
+    const responseTime = Math.ceil(performance.now() - startTime)
 
     if (!res.headersSent && !res.destroyed) {
       res.statusCode = statusCode
@@ -146,24 +124,20 @@ export async function request(ctx, next) {
         res.write(JSON.stringify(err.body))
       }
 
-      reqLogger = reqLogger.child({ res, err, responseTime })
-
       if (statusCode < 500) {
-        reqLogger.warn('request failed')
+        reqLogger.warn({ res, err, responseTime }, 'request failed')
       } else {
-        reqLogger.error('request error')
+        reqLogger.error({ res, err, responseTime }, 'request error')
       }
 
       res.end()
     } else {
-      reqLogger = reqLogger.child({ res, err, responseTime })
-
       if (req.aborted || !res.writableEnded || err.name === 'AbortError') {
-        reqLogger.debug('request aborted')
+        reqLogger.debug({ res, err, responseTime }, 'request aborted')
       } else if (statusCode < 500) {
-        reqLogger.warn('request failed')
+        reqLogger.warn({ res, err, responseTime }, 'request failed')
       } else {
-        reqLogger.error('request error')
+        reqLogger.error({ res, err, responseTime }, 'request error')
       }
 
       if (!res.writableEnded) {

package/package.json

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