@nxtedition/nxt-undici 6.0.22 → 6.1.0

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

@@ -2,7 +2,7 @@ import undici from '@nxtedition/undici'
 import { DecoratorHandler, parseCacheControl } from '../utils.js'
 
 const DEFAULT_STORE = new undici.cacheStores.SqliteCacheStore({ location: ':memory:' })
-const MAX_ENTRY_SIZE = 128 * 1024
+const DEFAULT_MAX_ENTRY_SIZE = 128 * 1024
 const EMPTY_BUFFER = Buffer.alloc(0)
 const NOOP = () => {}
 
@@ -10,8 +10,9 @@ class CacheHandler extends DecoratorHandler {
   #key
   #value
   #store
+  #maxEntrySize
 
-  constructor(key, { store, handler }) {
+  constructor(key, { store, handler, maxEntrySize }) {
     undici.util.cache.assertCacheKey(key)
 
     super(handler)
@@ -19,6 +20,7 @@ class CacheHandler extends DecoratorHandler {
     this.#key = key
     this.#value = null
     this.#store = store
+    this.#maxEntrySize = maxEntrySize ?? store.maxEntrySize ?? DEFAULT_MAX_ENTRY_SIZE
   }
 
   onConnect(abort) {
@@ -38,7 +40,7 @@ class CacheHandler extends DecoratorHandler {
     }
 
     const contentLength = headers['content-length'] ? Number(headers['content-length']) : Infinity
-    if (Number.isFinite(contentLength) && contentLength > MAX_ENTRY_SIZE) {
+    if (Number.isFinite(contentLength) && contentLength > DEFAULT_MAX_ENTRY_SIZE) {
       // We don't support caching responses with body...
       return super.onHeaders(statusCode, headers, resume)
     }
@@ -53,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']
@@ -111,7 +119,7 @@ class CacheHandler extends DecoratorHandler {
       this.#value.size += chunk.length
       this.#value.body.push(chunk)
 
-      if (this.#value.size > MAX_ENTRY_SIZE) {
+      if (this.#value.size > this.#maxEntrySize) {
         this.#value = null
         this.#value.size = 0
       }
@@ -140,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...
@@ -162,7 +173,11 @@ export default () => (dispatch) => (opts, handler) => {
       opts,
       cacheControlDirectives['no-store']
         ? handler
-        : new CacheHandler(undici.util.cache.makeCacheKey(opts), { store, handler }),
+        : new CacheHandler(undici.util.cache.makeCacheKey(opts), {
+            maxEntrySize: opts.cache.maxEntrySize,
+            store,
+            handler,
+          }),
     )
   }
 

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.22",
+  "version": "6.1.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",