@nxtedition/nxt-undici 5.1.6 → 5.1.8

package/lib/index.js

@@ -15,6 +15,7 @@ export const interceptors = {
   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,
 }
 
 export { parseHeaders } from './utils.js'
@@ -57,6 +58,7 @@ function wrapDispatch(dispatcher) {
       interceptors.responseError(),
       interceptors.requestBodyFactory(),
       interceptors.dns(),
+      interceptors.lookup(),
       interceptors.requestId(),
       interceptors.responseRetry(),
       interceptors.responseVerify(),

package/lib/interceptor/cache.js

@@ -21,7 +21,7 @@ class CacheHandler {
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
     if (statusCode !== 307) {
-      return this.#handler.onHeaders(statusCode, null, resume, statusMessage, headers)
+      return this.#handler.onHeaders(statusCode, null, resume, null, headers)
     }
 
     // TODO (fix): Support vary header.
@@ -58,7 +58,7 @@ class CacheHandler {
       }
     }
 
-    return this.#handler.onHeaders(statusCode, null, resume, statusMessage, headers)
+    return this.#handler.onHeaders(statusCode, null, resume, null, headers)
   }
 
   onData(chunk) {
@@ -167,7 +167,7 @@ export default () => (dispatch) => (opts, handler) => {
     return dispatch(opts, new CacheHandler({ handler, store, key: makeKey(opts) }))
   }
 
-  const { statusCode, statusMessage, headers, body } = entry
+  const { statusCode, headers, body } = entry
 
   let aborted = false
   const abort = () => {
@@ -181,7 +181,7 @@ export default () => (dispatch) => (opts, handler) => {
       return true
     }
 
-    handler.onHeaders(statusCode, null, resume, statusMessage, headers)
+    handler.onHeaders(statusCode, null, resume, null, headers)
     if (aborted) {
       return true
     }

package/lib/interceptor/dns.js

@@ -1,9 +1,43 @@
 import net from 'node:net'
 import { resolve4 } from 'node:dns/promises'
+import { getFastNow } from '../utils.js'
 
 export default () => (dispatch) => {
+  const active = new Map()
+  const cache = new Map()
+
+  async function _refresh(hostname, now) {
+    const records = await resolve4(hostname, { ttl: true })
+    const ret = records.map(({ address, ttl }) => ({ address, expires: now + 1e3 * ttl }))
+
+    cache.set(hostname, ret)
+    active.delete(hostname)
+
+    return ret
+  }
+
+  async function refresh(hostname, now) {
+    let promise = active.get(hostname)
+    if (!promise) {
+      promise = _refresh(hostname, now)
+      active.set(hostname, promise)
+    }
+    return promise
+  }
+
+  async function resolve(hostname) {
+    const now = getFastNow()
+
+    let records = cache.get(hostname)?.filter(({ expires }) => expires > now)
+    if (records == null || records.length === 0) {
+      records = await refresh(hostname, now)
+    }
+
+    return records.map(({ address }) => address)
+  }
+
   return async (opts, handler) => {
-    if (!opts.dns) {
+    if (!opts || !opts.dns || !opts.origin) {
       return dispatch(opts, handler)
     }
 
@@ -13,8 +47,17 @@ export default () => (dispatch) => {
       return dispatch(opts, handler)
     }
 
+    const records = await resolve(origin.hostname)
+
+    if (records.length === 0) {
+      throw Object.assign(new Error('No DNS records found for the specified hostname.'), {
+        code: 'ENOTFOUND',
+        hostname: origin.hostname,
+      })
+    }
+
     const host = origin.host
-    const records = await resolve4(origin.hostname)
+
     origin.hostname = records[Math.floor(Math.random() * records.length)]
 
     return dispatch({ ...opts, origin, headers: { ...opts.headers, host } }, handler)

package/lib/interceptor/dns.test.js

@@ -0,0 +1,9 @@
+import { test } from 'tap'
+import { request } from '../index.js'
+
+test('retry destroy pre response', async (t) => {
+  const { body, statusCode } = await request(`http://google.com`)
+  await body.dump()
+  t.equal(statusCode, 200)
+  t.end()
+})

package/lib/interceptor/log.js

@@ -71,7 +71,7 @@ class Handler extends DecoratorHandler {
     this.#statusCode = statusCode
     this.#headers = headers
 
-    return this.#handler.onHeaders(statusCode, null, resume, statusMessage, headers)
+    return this.#handler.onHeaders(statusCode, null, resume, null, headers)
   }
 
   onData(chunk) {

package/lib/interceptor/lookup.js

@@ -0,0 +1,29 @@
+export default () => (dispatch) => (opts, handler) => {
+  const lookup = opts.lookup
+
+  if (!lookup) {
+    return dispatch(opts, handler)
+  }
+
+  const callback = (err, origin) => {
+    if (err) {
+      handler.onError(err)
+    } else {
+      dispatch({ ...opts, origin }, handler)
+    }
+  }
+
+  try {
+    const thenable = lookup(opts.origin, { signal: opts.signal }, callback)
+    if (typeof thenable?.then === 'function') {
+      thenable.then(
+        (val) => callback(null, val),
+        (err) => callback(err),
+      )
+    }
+  } catch (err) {
+    callback(err)
+  }
+
+  return true
+}

package/lib/interceptor/proxy.js

@@ -50,7 +50,7 @@ class Handler extends DecoratorHandler {
         [],
       ),
       resume,
-      statusMessage,
+      null,
     )
   }
 }

package/lib/interceptor/redirect.js

@@ -47,11 +47,11 @@ class Handler extends DecoratorHandler {
     return this.#handler.onUpgrade(statusCode, rawHeaders, socket, headers)
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusText, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
     if (redirectableStatusCodes.indexOf(statusCode) === -1) {
       assert(!this.#headersSent)
       this.#headersSent = true
-      return this.#handler.onHeaders(statusCode, null, resume, statusText, headers)
+      return this.#handler.onHeaders(statusCode, null, resume, null, headers)
     }
 
     if (isDisturbed(this.#opts.body)) {
@@ -71,7 +71,7 @@ class Handler extends DecoratorHandler {
       if (!this.#opts.follow(this.#location, this.#count, this.#opts)) {
         assert(!this.#headersSent)
         this.#headersSent = true
-        return this.#handler.onHeaders(statusCode, null, resume, statusText, headers)
+        return this.#handler.onHeaders(statusCode, null, resume, null, headers)
       }
     } else {
       if (this.#count >= this.#maxCount) {

package/lib/interceptor/response-error.js

@@ -36,7 +36,7 @@ class Handler extends DecoratorHandler {
     this.#contentType = headers['content-type']
 
     if (this.#statusCode < 400) {
-      return this.#handler.onHeaders(statusCode, null, resume, statusMessage, headers)
+      return this.#handler.onHeaders(statusCode, null, resume, null, headers)
     }
 
     // TODO (fix): Check content length

package/lib/interceptor/response-retry.js

@@ -77,18 +77,18 @@ class Handler extends DecoratorHandler {
       assert(this.#headersSent === false)
 
       if (headers.trailer) {
-        return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+        return this.#onHeaders(statusCode, null, resume, null, headers)
       }
 
       const contentLength = headers['content-length'] ? Number(headers['content-length']) : null
       if (contentLength != null && !Number.isFinite(contentLength)) {
-        return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+        return this.#onHeaders(statusCode, null, resume, null, headers)
       }
 
       if (statusCode === 206) {
         const range = parseRangeHeader(headers['content-range'])
         if (!range) {
-          return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+          return this.#onHeaders(statusCode, null, resume, null, headers)
         }
 
         const { start, size, end = size } = range
@@ -108,7 +108,7 @@ class Handler extends DecoratorHandler {
         this.#end = contentLength
         this.#etag = headers.etag
       } else {
-        return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+        return this.#onHeaders(statusCode, null, resume, null, headers)
       }
 
       // Weak etags are not useful for comparison nor cache
@@ -121,7 +121,7 @@ class Handler extends DecoratorHandler {
       assert(Number.isFinite(this.#pos))
       assert(this.#end == null || Number.isFinite(this.#end))
 
-      return this.#onHeaders(statusCode, null, resume, statusMessage, headers)
+      return this.#onHeaders(statusCode, null, resume, null, headers)
     } else if (statusCode === 206 || (this.#pos === 0 && statusCode === 200)) {
       assert(this.#etag != null || !this.#pos)
 

package/lib/interceptor/response-verify.js

@@ -39,7 +39,7 @@ class Handler extends DecoratorHandler {
     this.#contentLength = this.#verifyOpts.hash ? headers['content-length'] : null
     this.#hasher = this.#contentMD5 != null ? crypto.createHash('md5') : null
 
-    return this.#handler.onHeaders(statusCode, null, resume, statusMessage, headers)
+    return this.#handler.onHeaders(statusCode, null, resume, null, headers)
   }
 
   onData(chunk) {

package/lib/request.js

@@ -70,7 +70,7 @@ export class RequestHandler {
     this.abort = abort
   }
 
-  onHeaders(statusCode, rawHeaders, resume, headers = parseHeaders(rawHeaders)) {
+  onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
     const { resolve, abort, highWaterMark } = this
 
     if (statusCode < 200) {

package/lib/utils.js

@@ -3,6 +3,16 @@ import cacheControlParser from 'cache-control-parser'
 import stream from 'node:stream'
 import { util } from 'undici'
 
+let fastNow = Date.now()
+
+setInterval(() => {
+  fastNow = Date.now()
+}, 1e3).unref()
+
+export function getFastNow() {
+  return fastNow
+}
+
 export function parseCacheControl(str) {
   return str ? cacheControlParser.parse(str) : null
 }

package/package.json

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