@nxtedition/nxt-undici 7.3.12 → 7.3.14

package/lib/interceptor/cache.js

@@ -113,7 +113,7 @@ class CacheHandler extends DecoratorHandler {
 
     const ttl = cacheControlDirectives.immutable
       ? 31556952
-      : Number(cacheControlDirectives['s-max-age'] ?? cacheControlDirectives['max-age'])
+      : Number(cacheControlDirectives['s-maxage'] ?? cacheControlDirectives['max-age'])
     if (!ttl || !Number.isFinite(ttl) || ttl <= 0) {
       return super.onHeaders(statusCode, headers, resume)
     }
@@ -186,7 +186,11 @@ export default () => (dispatch) => (opts, handler) => {
     return dispatch(opts, handler)
   }
 
-  const cacheControlDirectives = parseCacheControl(opts?.headers['cache-control']) ?? {}
+  const rawCacheControl = opts?.headers?.['cache-control']
+  const cacheControlDirectives = parseCacheControl(rawCacheControl) ?? {}
+  // cache-control-parser does not recognise 'only-if-cached', so check the raw string.
+  const onlyIfCached =
+    typeof rawCacheControl === 'string' && rawCacheControl.includes('only-if-cached')
 
   if (cacheControlDirectives['no-transform']) {
     // Do nothing. We don't transform requests...
@@ -213,19 +217,20 @@ export default () => (dispatch) => (opts, handler) => {
   } catch (err) {
     if (err.message === 'database is locked') {
       // Database is busy. We don't bother trying again...
-      opts.logger?.debug({ err }, 'failed to set cache entry')
+      opts.logger?.debug({ err }, 'failed to get cache entry')
     } else {
-      opts.logger?.error({ err }, 'failed to set cache entry')
+      opts.logger?.error({ err }, 'failed to get cache entry')
     }
   }
 
-  if (!entry && !cacheControlDirectives['only-if-cached']) {
+  if (!entry && !onlyIfCached) {
     return dispatch(
       opts,
       cacheControlDirectives['no-store']
         ? handler
         : new CacheHandler(undici.util.cache.makeCacheKey(opts), {
             maxEntrySize: opts.cache.maxEntrySize,
+            maxEntryTTL: opts.cache.maxEntryTTL,
             store,
             logger: opts.logger,
             handler,

package/lib/interceptor/dns.js

@@ -119,7 +119,7 @@ export default () => (dispatch) => {
         )
 
         for (let i = 0; i < records.length; i++) {
-          if (records[i].expires >= now) {
+          if (records[i].expires >= now && records[i].timeout < now) {
             record = records[i]
             break
           }

package/lib/interceptor/log.js

@@ -66,6 +66,7 @@ class Handler extends DecoratorHandler {
 
     socket.on('close', () => {
       this.#logger.debug('upstream request socket closed')
+      this.onDone()
     })
 
     super.onUpgrade(statusCode, headers, socket)
@@ -89,7 +90,7 @@ class Handler extends DecoratorHandler {
     return super.onData(chunk)
   }
 
-  onComplete() {
+  onComplete(trailers) {
     this.#timing.end = performance.now() - this.#created
 
     const data = {
@@ -117,7 +118,7 @@ class Handler extends DecoratorHandler {
 
     this.onDone()
 
-    super.onComplete()
+    super.onComplete(trailers)
   }
 
   onError(err) {

package/lib/interceptor/lookup.js

@@ -5,23 +5,27 @@ export default () => (dispatch) => async (opts, handler) => {
     return dispatch(opts, handler)
   }
 
-  const origin = await new Promise((resolve, reject) => {
-    const thenable = lookup(opts.origin, { signal: opts.signal ?? undefined }, (err, val) => {
-      if (err) {
-        reject(err)
-      } else {
-        resolve(val)
+  try {
+    const origin = await new Promise((resolve, reject) => {
+      const thenable = lookup(opts.origin, { signal: opts.signal ?? undefined }, (err, val) => {
+        if (err) {
+          reject(err)
+        } else {
+          resolve(val)
+        }
+      })
+
+      if (thenable != null) {
+        Promise.resolve(thenable).then(resolve, reject)
       }
     })
 
-    if (thenable != null) {
-      Promise.resolve(thenable).then(resolve, reject)
+    if (!origin) {
+      throw new Error('invalid origin: ' + origin)
     }
-  })
 
-  if (!origin) {
-    throw new Error('invalid origin: ' + origin)
+    return dispatch({ ...opts, origin }, handler)
+  } catch (err) {
+    handler.onError(err)
   }
-
-  return dispatch({ ...opts, origin }, handler)
 }

package/lib/interceptor/proxy.js

@@ -105,7 +105,9 @@ function reduceHeaders({ headers, proxyName, httpVersion, socket }, fn, acc) {
           socket.remoteAddress && `for=${printIp(socket.remoteAddress, socket.remotePort)}`,
           `proto=${socket.encrypted ? 'https' : 'http'}`,
           forwardedHost && `host="${forwardedHost}"`,
-        ].join(';'),
+        ]
+          .filter(Boolean)
+          .join(';'),
     )
   } else if (forwarded) {
     // The forwarded header should not be included in response.

package/lib/interceptor/redirect.js

@@ -69,6 +69,7 @@ class Handler extends DecoratorHandler {
       if (!this.#opts.follow(this.#location, this.#count, this.#opts)) {
         assert(!this.#headersSent)
         this.#headersSent = true
+        this.#location = null
         return super.onHeaders(statusCode, headers, resume)
       }
     } else {
@@ -144,7 +145,10 @@ class Handler extends DecoratorHandler {
       this.#location = null
 
       try {
-        this.#dispatch(this.#opts, this)?.catch((err) => this.onError(err))
+        const result = this.#dispatch(this.#opts, this)
+        if (result != null && typeof result.catch === 'function') {
+          result.catch((err) => this.onError(err))
+        }
       } catch (err) {
         this.onError(err)
       }

package/lib/interceptor/response-retry.js

@@ -176,7 +176,6 @@ class Handler extends DecoratorHandler {
     }
 
     if (this.#statusCode < 400) {
-      this.#retryCount = 0
       return super.onData(chunk)
     }
 
@@ -194,7 +193,6 @@ class Handler extends DecoratorHandler {
     this.#trailers = trailers
 
     if (this.#statusCode < 400) {
-      this.#retryCount = 0
       return super.onComplete(trailers)
     }
 

package/lib/interceptor/response-verify.js

@@ -41,7 +41,7 @@ class Handler extends DecoratorHandler {
     return super.onData(chunk)
   }
 
-  onComplete() {
+  onComplete(trailers) {
     const contentMD5 = this.#hasher?.digest('base64')
 
     if (this.#contentLength != null && this.#pos !== Number(this.#contentLength)) {
@@ -59,7 +59,7 @@ class Handler extends DecoratorHandler {
         }),
       )
     } else {
-      super.onComplete()
+      super.onComplete(trailers)
     }
   }
 }

package/lib/utils.js

@@ -59,8 +59,8 @@ export function parseContentRange(range) {
   return m
     ? {
         start: parseInt(m[1], 10),
-        end: m[2] ? parseInt(m[2]) + 1 : null,
-        size: m[3] === '*' ? null : parseInt(m[3]),
+        end: m[2] ? parseInt(m[2], 10) + 1 : null,
+        size: m[3] === '*' ? null : parseInt(m[3], 10),
       }
     : null
 }
@@ -83,8 +83,8 @@ export function parseRangeHeader(range) {
   const m = range.match(/^bytes=(\d+)-(\d+)?$/)
   return m
     ? {
-        start: parseInt(m[1]),
-        end: m[2] ? parseInt(m[2]) + 1 : null,
+        start: parseInt(m[1], 10),
+        end: m[2] ? parseInt(m[2], 10) + 1 : null,
         size: null,
       }
     : null
@@ -267,7 +267,6 @@ export class DecoratorHandler {
   onError(err) {
     if (!this.#errored && !this.#completed) {
       this.#errored = true
-      assert(!this.#completed)
       return this.#handler.onError?.(err)
     }
   }

package/package.json

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