@nxtedition/lib 26.3.6 → 26.3.8

package/http.js

@@ -10,6 +10,9 @@ import tp from 'timers/promises'
 
 export const kAbortController = Symbol('abortController')
 
+const kEmptyObj = Object.freeze({})
+const kEmptyArr = Object.freeze([])
+
 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
 
@@ -483,12 +486,23 @@ export class ServerResponse extends http.ServerResponse {
     if (this.#headersObj === null) {
       throw new Error('headers already sent')
     } else if (this.#headersObj === undefined) {
-      return []
+      return kEmptyArr
     } else {
       return Object.keys(this.#headersObj)
     }
   }
 
+  /**
+   * @returns {Record<string, string>}
+   */
+  getHeaders() {
+    if (this.#headersObj === undefined) {
+      return kEmptyObj
+    } else {
+      return this.#headersObj
+    }
+  }
+
   /**
    * @returns {boolean}
    */

package/package.json

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

package/serializers.js

@@ -66,19 +66,6 @@ function getUrl(obj) {
   return null
 }
 
-function getTiming(obj) {
-  const timing = obj?.timing ?? obj.stats
-  if (!timing) {
-    return undefined
-  }
-  return {
-    connect: timing.connect > 0 ? Math.ceil(timing.connect * 1e3) : undefined,
-    headers: timing.headers > 0 ? Math.ceil(timing.headers * 1e3) : undefined,
-    data: timing.data > 0 ? Math.ceil(timing.data * 1e3) : undefined,
-    end: timing.end > 0 ? Math.ceil(timing.end * 1e3) : undefined,
-  }
-}
-
 function getTarget(obj) {
   if (!obj) {
     return undefined
@@ -115,9 +102,9 @@ export default {
   req: (req) =>
     req && {
       method: req.method,
-      headers: getHeaders(req),
+      headers: req.headers,
       target: getTarget(req),
-      timing: getTiming(req),
+      timing: req.timing,
       bytesRead: req.bytesRead >= 0 ? req.bytesRead : undefined,
       bytesReadPerSecond:
         req.bytesReadPerSecond ??
@@ -132,9 +119,9 @@ export default {
     },
   res: (res) =>
     res && {
-      headers: getHeaders(res),
+      headers: res.getHeaders(),
       statusCode: res.statusCode || res.status,
-      timing: getTiming(res),
+      timing: res.timing,
       bytesWritten: res.bytesWritten >= 0 ? res.bytesWritten : undefined,
       bytesWrittenPerSecond:
         res.bytesWrittenPerSecond ??
@@ -151,7 +138,7 @@ export default {
       url: getUrl(ureq),
       id: ureq.id || getHeader(ureq, 'request-id'),
       userAgent: ureq.userAgent ?? getHeader(ureq, 'user-agent'),
-      timing: getTiming(ureq),
+      timing: ureq.timing,
       method: ureq.method,
       body: typeof ureq.body === 'string' ? ureq.body : undefined,
       bytesWritten: ureq.bytesWritten,
@@ -167,7 +154,7 @@ export default {
     ures && {
       id: ures.id || getHeader(ures, 'request-id') || getHeader(ures.req, 'request-id'),
       userAgent: ures.userAgent ?? getHeader(ures, 'user-agent'),
-      timing: getTiming(ures),
+      timing: ures.timing,
       statusCode: ures.statusCode ?? ures.status,
       bytesRead: ures.bytesRead,
       bytesReadPerSecond: