@nxtedition/nxt-undici 6.0.23 → 6.1.1

package/lib/index.js

@@ -59,6 +59,7 @@ function wrapDispatch(dispatcher) {
   if (wrappedDispatcher == null) {
     wrappedDispatcher = compose(
       dispatcher,
+      interceptors.log({ bindings: { intercept: 'upstream' } }),
       interceptors.responseError(),
       interceptors.requestBodyFactory(),
       interceptors.dns(),
@@ -69,7 +70,7 @@ function wrapDispatch(dispatcher) {
       interceptors.proxy(),
       interceptors.cache(),
       interceptors.redirect(),
-      interceptors.log(),
+      interceptors.log({ bindings: { intercept: 'downstream' } }),
       (dispatch) => (opts, handler) => {
         const headers = parseHeaders(opts.headers)
 

package/lib/interceptor/cache.js

@@ -55,11 +55,17 @@ class CacheHandler extends DecoratorHandler {
       return super.onHeaders(statusCode, headers, resume)
     }
 
+    if (cacheControlDirectives['must-understand']) {
+      // Do nothing. We only cache responses that we understand...
+    }
+
+    if (cacheControlDirectives['no-transform']) {
+      // Do nothing. We don't transform responses...
+    }
+
     if (
-      cacheControlDirectives['no-transform'] ||
       cacheControlDirectives['must-revalidate'] ||
       cacheControlDirectives['proxy-revalidate'] ||
-      cacheControlDirectives['must-understand'] ||
       cacheControlDirectives['stale-while-revalidate'] ||
       cacheControlDirectives['stale-if-error'] ||
       cacheControlDirectives['no-cache']
@@ -142,12 +148,15 @@ export default () => (dispatch) => (opts, handler) => {
 
   const cacheControlDirectives = parseCacheControl(opts?.headers['cache-control']) ?? {}
 
+  if (cacheControlDirectives['no-transform']) {
+    // Do nothing. We don't transform requests...
+  }
+
   if (
     cacheControlDirectives['max-age'] ||
     cacheControlDirectives['max-stale'] ||
     cacheControlDirectives['min-fresh'] ||
     cacheControlDirectives['no-cache'] ||
-    cacheControlDirectives['no-transform'] ||
     cacheControlDirectives['stale-if-error']
   ) {
     // TODO (fix): Support all cache control directives...

package/lib/interceptor/dns.js

@@ -36,12 +36,14 @@ export default () => (dispatch) => {
   const cache = new Map()
   const promises = new Map()
 
-  function resolve(resolve4, hostname) {
+  function resolve(hostname, { resolve4, logger }) {
     let promise = promises.get(hostname)
     if (!promise) {
+      logger?.debug({ dns: { hostname } }, 'lookup started')
       promise = new Promise((resolve) =>
         resolve4(hostname, { ttl: true }, (err, records) => {
           if (err) {
+            logger?.error({ err, dns: { hostname } }, 'lookup failed')
             resolve([err, null])
           } else {
             const now = getFastNow()
@@ -53,6 +55,8 @@ export default () => (dispatch) => {
               counter: 0,
             }))
 
+            logger?.debug({ err, dns: { records } }, 'lookup completed')
+
             cache.set(hostname, val)
 
             resolve([null, val])
@@ -85,9 +89,10 @@ export default () => (dispatch) => {
       let records = cache.get(hostname)
 
       const resolve4 = opts.dns.resolve4 || dns.resolve4
+      const logger = opts.dns.logger ?? opts.logger
 
       if (records == null || records.every((x) => x.expires < now)) {
-        const [err, val] = await resolve(resolve4, hostname)
+        const [err, val] = await resolve(hostname, { resolve4, logger })
 
         if (err) {
           throw err
@@ -97,7 +102,7 @@ export default () => (dispatch) => {
 
         records = val
       } else if (records.some((x) => x.expires < now + 1e3)) {
-        resolve(resolve4, hostname)
+        resolve(hostname, { resolve4, logger })
       }
 
       records.sort(

package/lib/interceptor/log.js

@@ -19,12 +19,16 @@ class Handler extends DecoratorHandler {
   #statusCode
   #headers
 
-  constructor(opts, { handler }) {
+  constructor(logOpts, opts, { handler }) {
     super(handler)
 
     this.#opts = opts
     this.#logger = opts.logger.child({ ureq: opts })
 
+    if (logOpts?.bindings) {
+      this.#logger = this.#logger.child(logOpts?.bindings)
+    }
+
     this.#created = performance.now()
   }
 
@@ -128,5 +132,5 @@ class Handler extends DecoratorHandler {
   }
 }
 
-export default () => (dispatch) => (opts, handler) =>
-  opts.logger ? dispatch(opts, new Handler(opts, { handler })) : dispatch(opts, handler)
+export default (logOpts) => (dispatch) => (opts, handler) =>
+  opts.logger ? dispatch(opts, new Handler(logOpts, opts, { handler })) : dispatch(opts, handler)

package/lib/interceptor/response-retry.js

@@ -178,7 +178,7 @@ class Handler extends DecoratorHandler {
           this.#onError(this.#error)
         } else if (!this.#headersSent) {
           this.#retryCount++
-          this.#opts.logger?.debug({ retryCount: this.#retryCount }, 'retry response headers')
+          this.#opts.logger?.debug({ err, retryCount: this.#retryCount }, 'retry response headers')
           this.#dispatch(this.#opts, this)
         } else {
           assert(Number.isFinite(this.#pos))
@@ -196,7 +196,7 @@ class Handler extends DecoratorHandler {
           }
 
           this.#retryCount++
-          this.#opts.logger?.debug({ retryCount: this.#retryCount }, 'retry response body')
+          this.#opts.logger?.debug({ err, retryCount: this.#retryCount }, 'retry response body')
           this.#dispatch(this.#opts, this)
         }
       })

package/package.json

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