@nxtedition/lib 26.4.6 → 26.4.7

package/package.json

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

package/serializers.js

@@ -1,11 +1,12 @@
 import { SIGNALS } from './platform.js'
 import { parseHeaders } from '@nxtedition/nxt-undici'
 import requestTarget from 'request-target'
+import querystring from 'fast-querystring'
 
 function getHeader(obj, key) {
   return !obj || !key
     ? undefined
-    : obj.headers?.get?.(key) || obj.getHeader?.(key) || obj.headers?.[key]
+    : obj.headers?.[key] || obj.headers?.get?.(key) || obj.getHeader?.(key)
 }
 
 function getHeaders(obj) {
@@ -35,15 +36,15 @@ function getUrl(obj) {
 
   const { origin, path, hostname, protocol, port, url } = obj
 
+  if (typeof url === 'string' && url) {
+    return url
+  }
+
   const href = url?.href
   if (typeof href === 'string' && href) {
     return href
   }
 
-  if (typeof url === 'string' && url) {
-    return url
-  }
-
   if (origin && (!path || typeof path === 'string')) {
     if (typeof origin === 'object') {
       return `${origin.protocol || 'http:'}//${origin.hostname}:${origin.port || { 'http:': 80, 'https:': 443 }[origin.protocol]}${path || ''}`
@@ -81,6 +82,18 @@ function getTarget(obj) {
     if (typeof obj.url === 'string') {
       // TODO(fix): What if url is a full url?
       return requestTarget({ url: obj.url, headers: obj.headers ?? {}, socket: obj.socket })
+    } else {
+      const { origin, path, hostname, protocol, port, search, query } = obj
+      return {
+        origin,
+        protocol: protocol || undefined,
+        hostname: hostname || undefined,
+        port: port || undefined,
+        pathname: path || undefined,
+        search:
+          search ||
+          (typeof query === 'object' && query != null ? querystring.stringify(query) : undefined),
+      }
     }
   } catch {
     return undefined
@@ -104,15 +117,17 @@ export default {
     },
   req: (req) =>
     req && {
+      id: req.id || getHeader(req, 'request-id'),
       method: req.method,
-      headers: getHeaders(req),
       target: getTarget(req),
+      url: getUrl(req),
+      headers: getHeaders(req),
       timing: req.timing,
       bytesRead: req.bytesRead >= 0 ? req.bytesRead : undefined,
       bytesReadPerSecond:
         req.bytesReadPerSecond ??
-        (req.timing?.complete > 0 && req.bytesRead > 0
-          ? (req.bytesRead * 1e3) / req.timing.complete
+        (req.timing?.end > 0 && req.bytesRead > 0
+          ? (req.bytesRead * 1e3) / req.timing.end
           : undefined),
       remoteAddress: req.socket?.remoteAddress,
       remotePort: req.socket?.remotePort,
@@ -120,43 +135,45 @@ export default {
       closed: req.closed,
       destroyed: req.destroyed,
     },
+  ureq: (ureq) =>
+    ureq && {
+      id: ureq.id || getHeader(ureq, 'request-id'),
+      method: ureq.method,
+      target: getTarget(ureq),
+      url: getUrl(ureq),
+      headers: getHeaders(ureq),
+      timing: ureq.timing,
+      bytesWritten: ureq.bytesWritten,
+      bytesReadPerSecond:
+        ureq.bytesWrittenPerSecond ??
+        (ureq.timing && ureq.timing.data > 0 && ureq.timing.end > 0
+          ? (ureq.bytesWritten * 1e3) / (ureq.timing.end - ureq.timing.data)
+          : undefined),
+      body: typeof ureq.body === 'string' ? ureq.body : undefined,
+    },
   res: (res) =>
     res && {
+      id: res.id || getHeader(res, 'request-id') || getHeader(res.req, 'request-id'),
       headers: getHeaders(res),
       statusCode: res.statusCode || res.status,
       timing: res.timing,
       bytesWritten: res.bytesWritten >= 0 ? res.bytesWritten : undefined,
       bytesWrittenPerSecond:
         res.bytesWrittenPerSecond ??
-        (res.timing?.complete > 0 && res.bytesWritten > 0
-          ? (res.bytesWritten * 1e3) / res.timing.complete
+        (res.timing?.end > 0 && res.bytesWritten > 0
+          ? (res.bytesWritten * 1e3) / res.timing.end
           : undefined),
       headersSent: res.headersSent,
       aborted: res.aborted,
       closed: res.closed,
       destroyed: res.destroyed,
     },
-  ureq: (ureq) =>
-    ureq && {
-      url: getUrl(ureq),
-      id: ureq.id || getHeader(ureq, 'request-id'),
-      timing: ureq.timing,
-      method: ureq.method,
-      body: typeof ureq.body === 'string' ? ureq.body : undefined,
-      bytesWritten: ureq.bytesWritten,
-      bytesReadPerSecond:
-        ureq.bytesWrittenPerSecond ??
-        (ureq.timing && ureq.timing.data > 0 && ureq.timing.end > 0
-          ? (ureq.bytesWritten * 1e3) / (ureq.timing.end - ureq.timing.data)
-          : undefined),
-      headers: getHeaders(ureq),
-      query: ureq.query,
-    },
   ures: (ures) =>
     ures && {
       id: ures.id || getHeader(ures, 'request-id') || getHeader(ures.req, 'request-id'),
-      timing: ures.timing,
+      headers: getHeaders(ures),
       statusCode: ures.statusCode ?? ures.status,
+      timing: ures.timing,
       bytesRead: ures.bytesRead,
       bytesReadPerSecond:
         ures.bytesReadPerSecond ??
@@ -164,7 +181,6 @@ export default {
           ? (ures.bytesRead * 1e3) / (ures.timing.end - ures.timing.data)
           : undefined),
       body: typeof ures.body === 'string' ? ures.body : undefined,
-      headers: getHeaders(ures),
     },
 }
 

package/util/compare-rev.js

@@ -214,14 +214,18 @@ export function compareRevSliceSlice(a, b) {
   let lenA = endA
   a = a.buffer
 
-  if (
-    !Buffer.isBuffer(a) ||
-    !Number.isInteger(idxA) ||
-    idxA < 0 ||
-    !Number.isInteger(lenA) ||
-    lenA < 0
-  ) {
-    throw new Error('invalid argument: a')
+  if (!Buffer.isBuffer(a)) {
+    throw Object.assign(new Error('a is not a Buffer.'), {
+      data: a?.constructor?.name,
+    })
+  }
+
+  if (!Number.isInteger(idxA) || idxA < 0) {
+    throw Object.assign(new Error('a has invalid index'), { data: idxA })
+  }
+
+  if (!Number.isInteger(lenA) || lenA < 0) {
+    throw Object.assign(new Error('a has invalid length'), { data: lenA })
   }
 
   const endB = b.byteOffset + b.byteLength
@@ -229,14 +233,18 @@ export function compareRevSliceSlice(a, b) {
   let lenB = endB
   b = b.buffer
 
-  if (
-    !Buffer.isBuffer(b) ||
-    !Number.isInteger(idxB) ||
-    idxB < 0 ||
-    !Number.isInteger(lenB) ||
-    lenB < 0
-  ) {
-    throw new Error('invalid argument: b')
+  if (!Buffer.isBuffer(b)) {
+    throw Object.assign(new Error('b is not a Buffer.'), {
+      data: b?.constructor?.name,
+    })
+  }
+
+  if (!Number.isInteger(idxB) || idxB < 0) {
+    throw Object.assign(new Error('b has invalid index'), { data: idxB })
+  }
+
+  if (!Number.isInteger(lenB) || lenB < 0) {
+    throw Object.assign(new Error('b has invalid length'), { data: lenB })
   }
 
   // Handle INF-XXXXXXXX