@nxtedition/nxt-undici 2.0.58 → 2.1.1

package/lib/index.js

@@ -4,6 +4,8 @@ import undici from 'undici'
 import { parseHeaders, AbortError, isStream } from './utils.js'
 import { BodyReadable } from './readable.js'
 
+export { parseHeaders } from './utils.js'
+
 const dispatcherCache = new WeakMap()
 
 export const interceptors = {
@@ -104,8 +106,8 @@ export async function request(url, opts) {
     dispatch = interceptors.requestId(dispatch)
     dispatch = interceptors.responseRetry(dispatch)
     dispatch = interceptors.responseVerify(dispatch)
-    dispatch = interceptors.cache(dispatch)
     dispatch = interceptors.redirect(dispatch)
+    dispatch = interceptors.cache(dispatch)
     dispatch = interceptors.proxy(dispatch)
     dispatcherCache.set(dispatcher, dispatch)
   }
@@ -134,6 +136,14 @@ export async function request(url, opts) {
         error: opts.error ?? true,
         verify: opts.verify ?? true,
         logger: opts.logger ?? null,
+        startTime: performance.now(),
+        stats: {
+          connect: -1,
+          headers: -1,
+          data: -1,
+          complete: -1,
+          error: -1,
+        },
       },
       {
         resolve,
@@ -145,6 +155,8 @@ export async function request(url, opts) {
         /** @type {Function | null} */ abort: null,
         /** @type {stream.Readable | null} */ body: null,
         onConnect(abort) {
+          this.stats.connect = performance.now() - this.startTime
+
           if (this.signal?.aborted) {
             abort(this.signal.reason)
           } else {
@@ -177,12 +189,17 @@ export async function request(url, opts) {
           statusMessage,
           headers = parseHeaders(rawHeaders),
         ) {
+          if (this.stats.headers === -1) {
+            this.stats.headers = performance.now() - this.startTime - this.stats.connect
+          }
+
           assert(statusCode >= 200)
 
           const contentLength = headers['content-length']
           const contentType = headers['content-type']
 
           this.body = new BodyReadable(this, {
+            stats: this.stats,
             resume,
             abort: this.abort,
             highWaterMark: this.highWaterMark,
@@ -208,12 +225,24 @@ export async function request(url, opts) {
           return true
         },
         onData(chunk) {
+          if (this.stats.data === -1) {
+            this.stats.data = performance.now() - this.startTime - this.stats.headers
+          }
+
           return this.body.push(chunk)
         },
         onComplete() {
+          if (this.stats.complete === -1) {
+            this.stats.complete = performance.now() - this.startTime - this.stats.data
+          }
+
           this.body.push(null)
         },
         onError(err) {
+          if (this.stats.error === -1) {
+            this.stats.error = performance.now() - this.startTime - this.stats.data
+          }
+
           this.signal?.removeEventListener('abort', this.onAbort)
           this.signal = null
 

package/lib/interceptor/cache.js

@@ -107,7 +107,7 @@ class CacheStore {
 
 function makeKey(opts) {
   // NOTE: Ignores headers...
-  return `${opts.method}:${opts.path}`
+  return `${opts.origin}:${opts.method}:${opts.path}`
 }
 
 const DEFAULT_CACHE_STORE = new CacheStore({ maxSize: 128 * 1024, maxEntrySize: 1024 })

package/lib/interceptor/proxy.js

@@ -20,7 +20,7 @@ class Handler extends DecoratorHandler {
         {
           headers: rawHeaders,
           httpVersion: this.#opts.httpVersion ?? this.#opts.req?.httpVersion,
-          socket: null,
+          socket: this.#opts.socket,
           proxyName: this.#opts.name,
         },
         (acc, key, val) => {
@@ -40,7 +40,7 @@ class Handler extends DecoratorHandler {
         {
           headers: rawHeaders,
           httpVersion: this.#opts.httpVersion ?? this.#opts.req?.httpVersion,
-          socket: null,
+          socket: this.#opts.socket,
           proxyName: this.#opts.name,
         },
         (acc, key, val) => {

package/lib/readable.js

@@ -4,6 +4,7 @@ import { errors as undiciErrors } from 'undici'
 
 const { RequestAbortedError, NotSupportedError, InvalidArgumentError, AbortError } = undiciErrors
 
+const kStats = Symbol('kStats')
 const kConsume = Symbol('kConsume')
 const kReading = Symbol('kReading')
 const kBody = Symbol('kBody')
@@ -26,6 +27,7 @@ export class BodyReadable extends Readable {
   constructor(
     handler,
     {
+      stats,
       contentType = '',
       method,
       statusCode,
@@ -45,6 +47,7 @@ export class BodyReadable extends Readable {
 
     this._readableState.dataEmitted = false
 
+    this[kStats] = stats
     this[kHandler] = handler
     this[kStatusCode] = statusCode
     this[kStatusMessage] = statusMessage
@@ -65,6 +68,10 @@ export class BodyReadable extends Readable {
     this[kReading] = false
   }
 
+  get stats() {
+    return this[kStats]
+  }
+
   get statusCode() {
     return this[kStatusCode]
   }

package/lib/utils.js

@@ -229,7 +229,7 @@ export function parseHeaders(headers, obj) {
       let val = obj[key]
 
       if (val) {
-        if (typeof val === 'string') {
+        if (!Array.isArray(val)) {
           val = [val]
           obj[key] = val
         }
@@ -260,7 +260,7 @@ export function parseHeaders(headers, obj) {
       let val = obj[key]
 
       if (val) {
-        if (typeof val === 'string') {
+        if (!Array.isArray(val)) {
           val = [val]
           obj[key] = val
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/nxt-undici",
-  "version": "2.0.58",
+  "version": "2.1.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",