@nxtedition/lib 23.6.13 → 23.6.15

package/http.js

@@ -24,7 +24,7 @@ const maxInt = 2147483647
 let nextReqId = Math.floor(Math.random() * maxInt)
 export function genReqId() {
   nextReqId = (nextReqId + 1) & maxInt
-  return `req-${nextReqId.toString(36)}`
+  return nextReqId.toString(36)
 }
 
 let timeoutError
@@ -59,8 +59,8 @@ export class Context {
     this.#query = undefined
 
     // TODO (fix): This should not be necessary...
-    req.target ??= this.#target
-    req.userAgent ??= this.#userAgent
+    // req.target ??= this.#target
+    // req.userAgent ??= this.#userAgent
     req.id ??= this.#id
     req.logger ??= this.#logger
   }

package/package.json

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

package/serializers.js

@@ -1,5 +1,6 @@
 import { SIGNALS } from './platform.js'
 import { parseHeaders } from '@nxtedition/nxt-undici'
+import requestTarget from 'request-target'
 
 function getHeader(obj, key) {
   return !obj || !key
@@ -96,8 +97,8 @@ export default {
       id: res.id ?? res.req?.id ?? getHeader(res, 'request-id') ?? getHeader(res.req, 'request-id'),
       url: res.req?.url,
       method: res.req?.method,
+      headers: getHeaders(res),
       statusCode: res.statusCode || res.status,
-      userAgent: res.userAgent ?? res.req?.userAgent ?? getHeader(res.req, 'user-agent'),
       timing: getTiming(res),
       bytesWritten: res.bytesWritten,
       bytesWrittenPerSecond:
@@ -105,7 +106,6 @@ export default {
         (res.timing?.complete > 0 && res.bytesWritten
           ? (res.bytesWritten * 1e3) / res.timing.complete
           : undefined),
-      headers: getHeaders(res),
       headersSent: res.headersSent,
       aborted: res.aborted,
       closed: res.closed,
@@ -116,11 +116,9 @@ export default {
       id: req.id || getHeader(req, 'request-id'),
       url: req.url,
       method: req.method,
-      target: req.target,
-      userAgent: req.userAgent ?? getHeader(req, 'user-agent'),
-      timing: getTiming(req),
       headers: getHeaders(req),
-      query: req.query,
+      target: req.target ?? requestTarget(req),
+      timing: getTiming(req),
       bytesRead: req.bytesRead,
       bytesReadPerSecond:
         req.bytesReadPerSecond ??