@nxtedition/nxt-undici 4.2.21 → 4.2.23

package/lib/index.js

@@ -13,7 +13,6 @@ export const interceptors = {
   proxy: (await import('./interceptor/proxy.js')).default,
   cache: (await import('./interceptor/cache.js')).default,
   requestId: (await import('./interceptor/request-id.js')).default,
-  dns: (await import('./interceptor/dns.js')).default,
   lookup: (await import('./interceptor/lookup.js')).default,
 }
 
@@ -31,7 +30,6 @@ function wrapDispatcher(dispatcher) {
       interceptors.responseError(),
       interceptors.requestBodyFactory(),
       interceptors.log(),
-      interceptors.dns(),
       interceptors.lookup(),
       interceptors.requestId(),
       interceptors.responseRetry(),
@@ -72,7 +70,6 @@ function wrapDispatcher(dispatcher) {
             error: opts.error ?? true,
             verify: opts.verify ?? true,
             logger: opts.logger ?? null,
-            dns: opts.dns ?? true,
             connect: opts.connect,
             lookup: opts.lookup ?? defaultLookup,
             maxRedirections: 0, // TODO (fix): Ugly hack to disable undici redirections.

package/lib/interceptor/log.js

@@ -9,13 +9,12 @@ class Handler extends DecoratorHandler {
   #aborted = false
   #pos = 0
   #created = 0
-  #now = 0
   #timing = {
     created: -1,
     connect: -1,
     headers: -1,
     data: -1,
-    complete: -1,
+    end: -1,
   }
 
   constructor(opts, { handler }) {
@@ -26,21 +25,19 @@ class Handler extends DecoratorHandler {
     this.#logger = opts.logger
 
     this.#created = performance.now()
-    this.#now += this.#created
   }
 
   onConnect(abort) {
     this.#pos = 0
     this.#abort = abort
 
-    this.#timing.connect = performance.now() - this.#now
-    this.#now += this.#timing.connect
-
+    this.#timing.connect = performance.now() - this.#created
     this.#timing.headers = -1
     this.#timing.data = -1
-    this.#timing.complete = -1
+    this.#timing.end = -1
 
-    this.#logger.debug({ ureq: this.#opts }, 'upstream request started')
+    this.#logger = this.#logger.child({ ureq: this.#opts })
+    this.#logger.debug('upstream request started')
 
     return this.#handler.onConnect((reason) => {
       this.#aborted = true
@@ -58,8 +55,7 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    this.#timing.headers = performance.now() - this.#now
-    this.#now += this.#timing.headers
+    this.#timing.headers = performance.now() - this.#created
 
     this.#logger.debug(
       {
@@ -75,8 +71,7 @@ class Handler extends DecoratorHandler {
 
   onData(chunk) {
     if (this.#timing.data === -1) {
-      this.#timing.data = performance.now() - this.#now
-      this.#now += this.#timing.data
+      this.#timing.data = performance.now() - this.#created
     }
 
     this.#pos += chunk.length
@@ -85,17 +80,16 @@ class Handler extends DecoratorHandler {
   }
 
   onComplete(rawTrailers) {
-    this.#timing.complete = performance.now() - this.#created
+    this.#timing.end = performance.now() - this.#created
 
     this.#logger.debug(
       {
-        ureq: { id: this.#opts.id, url: this.#opts.url },
         ures: {
           bytesRead: this.#pos,
-          bytesReadPerSecond: (this.#pos * 1e3) / this.#timing.complete,
+          bytesReadPerSecond: (this.#pos * 1e3) / (this.#timing.end - this.#timing.data),
           timing: this.#timing,
         },
-        elapsedTime: this.#timing.complete,
+        elapsedTime: this.#timing.end,
       },
       'upstream request completed',
     )
@@ -104,16 +98,15 @@ class Handler extends DecoratorHandler {
   }
 
   onError(err) {
-    this.#timing.complete = performance.now() - this.#created
+    this.#timing.end = performance.now() - this.#created
 
     const data = {
-      ureq: this.#opts,
       ures: {
         bytesRead: this.#pos,
-        bytesReadPerSecond: (this.#pos * 1e3) / this.#timing.complete,
+        bytesReadPerSecond: (this.#pos * 1e3) / (this.#timing.end - this.#timing.data),
         timing: this.#timing,
       },
-      elapsedTime: this.#timing.complete,
+      elapsedTime: this.#timing.end,
       err,
     }
 

package/package.json

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

package/lib/interceptor/dns.js

@@ -1,125 +0,0 @@
-import { DecoratorHandler } from '../utils.js'
-import net from 'net'
-import { resolve4 } from 'node:dns/promises'
-
-let fastNow = Date.now()
-setInterval(() => {
-  fastNow = Date.now()
-}, 500)
-
-class Record {
-  address = ''
-  expires = 0
-  errored = 0
-
-  constructor({ address, ttl }) {
-    this.address = address
-    this.expires = fastNow + (ttl ?? 60) * 1e3
-  }
-}
-
-class Handler extends DecoratorHandler {
-  #handler
-  #record
-
-  constructor({ record }, { handler }) {
-    super(handler)
-
-    this.#handler = handler
-    this.#record = record
-  }
-
-  onError(err) {
-    if (
-      [
-        'ECONNRESET',
-        'ECONNREFUSED',
-        'ENOTFOUND',
-        'ENETDOWN',
-        'ENETUNREACH',
-        'EHOSTDOWN',
-        'EHOSTUNREACH',
-        'EHOSTNOTFOUND',
-        'ENODATA',
-        'EPIPE',
-        'UND_ERR_CONNECT_TIMEOUT',
-      ].includes(err.code) ||
-      [503].includes(err.statusCode)
-    ) {
-      this.#record.errored = fastNow
-
-      // TODO (fix): For how long do we "blacklist" the record?
-
-      if (err.code === 'UND_ERR_CONNECT_TIMEOUT') {
-        // We don't expect this address to ever work again...
-        this.#record.expires = Infinity
-      }
-    }
-
-    return super.onError(err)
-  }
-}
-
-export default (interceptorOpts) => (dispatch) => {
-  /** @type {Map<string, Array<Record>>} */
-  const dnsCache = new Map()
-
-  return async (opts, handler) => {
-    if (!opts.dns) {
-      return dispatch(opts, handler)
-    }
-
-    const { protocol, port, hostname, host } = new URL(opts.origin)
-
-    if (net.isIP(hostname) || opts.headers?.host || !port || !protocol) {
-      return dispatch(opts, handler)
-    }
-
-    const now = Date.now()
-    try {
-      /** @type {Array|undefined} */
-      let records = dnsCache.get(hostname)
-
-      if (!records?.some((record) => record.expires > now && !record.errored)) {
-        // TODO (fix): Re-use old records while fetching new ones or if fetching fails?
-        // TODO (fix): Background refresh + health checks?
-        // TODO (fix): What about old "blacklisted" records?
-        // TODO (fix): What about ipv6?
-
-        records = await resolve4(hostname, { ttl: true })
-        records = records.map((record) => new Record(record))
-
-        if (records.length > 0) {
-          // TODO (fix): Clear old hostnames?
-          dnsCache.set(hostname, records)
-        }
-      }
-
-      if (records.length === 0) {
-        return dispatch(opts, handler)
-      }
-
-      // TODO (perf): sort + Math.random is a bit naive...
-      records.sort((a, b) =>
-        a.errored !== b.errored ? a.errored - b.errored : Math.random() - 0.5,
-      )
-
-      const record = records.find((record) => record.expires > now)
-
-      if (!record) {
-        return dispatch(opts, handler)
-      }
-
-      return dispatch(
-        {
-          ...opts,
-          origin: `${protocol}//${record.address}:${port}`,
-          headers: { ...opts.headers, host },
-        },
-        new Handler({ record }, { handler }),
-      )
-    } catch (err) {
-      handler.onError(err)
-    }
-  }
-}