@nxtedition/nxt-undici 6.0.6 → 6.0.8

package/lib/interceptor/cache.js

@@ -26,8 +26,7 @@ class CacheHandler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, headers, resume) {
-    if (statusCode !== 307) {
-      // Only cache redirects...
+    if (statusCode !== 307 && statusCode !== 200) {
       return super.onHeaders(statusCode, headers, resume)
     }
 
@@ -42,28 +41,36 @@ class CacheHandler extends DecoratorHandler {
       return super.onHeaders(statusCode, headers, resume)
     }
 
-    const cacheControl = parseCacheControl(headers['cache-control'])
+    const cacheControlDirectives = parseCacheControl(headers['cache-control']) ?? {}
+
+    if (this.#key.headers.authorization && !cacheControlDirectives.public) {
+      return super.onHeaders(statusCode, headers, resume)
+    }
+
+    if (cacheControlDirectives.private || cacheControlDirectives['no-store']) {
+      return super.onHeaders(statusCode, headers, resume)
+    }
+
     if (
-      !cacheControl ||
-      !cacheControl.public ||
-      cacheControl.private ||
-      cacheControl['no-store'] ||
-      // TODO (fix): Support all cache control directives...
-      // cacheControl['no-transform'] ||
-      cacheControl['no-cache'] ||
-      cacheControl['must-understand'] ||
-      cacheControl['must-revalidate'] ||
-      cacheControl['proxy-revalidate']
+      cacheControlDirectives['no-transform'] ||
+      cacheControlDirectives['must-revalidate'] ||
+      cacheControlDirectives['proxy-revalidate'] ||
+      cacheControlDirectives['must-understand'] ||
+      cacheControlDirectives['stale-while-revalidate'] ||
+      cacheControlDirectives['stale-if-error'] ||
+      cacheControlDirectives['no-cache']
     ) {
-      // Not cacheble...
+      // TODO (fix): Support all cache control directives...
       return super.onHeaders(statusCode, headers, resume)
     }
 
     const vary = {}
     if (headers.vary) {
-      for (const key of [headers.vary]
-        .flat()
-        .flatMap((vary) => vary.split(',').map((key) => key.trim().toLowerCase()))) {
+      if (typeof headers.vary !== 'string') {
+        return super.onHeaders(statusCode, headers, resume)
+      }
+
+      for (const key of headers.varyvary.split(',').map((key) => key.trim().toLowerCase())) {
         const val = this.#key.headers[key]
         if (!val) {
           // Expect vary headers to be present...
@@ -71,14 +78,11 @@ class CacheHandler extends DecoratorHandler {
         }
         vary[key] = val
       }
-
-      // Unexpected vary header type...
-      return super.onHeaders(statusCode, headers, resume)
     }
 
-    const ttl = cacheControl.immutable
+    const ttl = cacheControlDirectives.immutable
       ? 31556952
-      : Number(cacheControl['s-max-age'] ?? cacheControl['max-age'])
+      : Number(cacheControlDirectives['s-max-age'] ?? cacheControlDirectives['max-age'])
     if (!ttl || !Number.isFinite(ttl) || ttl <= 0) {
       return super.onHeaders(statusCode, headers, resume)
     }
@@ -92,8 +96,8 @@ class CacheHandler extends DecoratorHandler {
       statusCode,
       statusMessage: '',
       headers,
-      cacheControlDirectives: '',
-      etag: '',
+      cacheControlDirectives,
+      etag: headers.etag,
       vary,
       cachedAt,
       staleAt: 0,
@@ -134,16 +138,17 @@ export default () => (dispatch) => (opts, handler) => {
     return dispatch(opts, handler)
   }
 
-  if (opts.headers?.['cache-control'] || opts.headers?.authorization) {
+  const cacheControlDirectives = parseCacheControl(opts?.headers['cache-control']) ?? {}
+
+  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...
-    // const cacheControl = cacheControlParser.parse(opts.headers['cache-control'])
-    // cacheControl['no-cache']
-    // cacheControl['no-store']
-    // cacheControl['max-age']
-    // cacheControl['max-stale']
-    // cacheControl['min-fresh']
-    // cacheControl['no-transform']
-    // cacheControl['only-if-cached']
     return dispatch(opts, handler)
   }
 
@@ -152,10 +157,12 @@ export default () => (dispatch) => (opts, handler) => {
 
   const store = opts.cache.store ?? DEFAULT_STORE
   const entry = store.get(opts)
-  if (!entry) {
+  if (!entry && !cacheControlDirectives['only-if-cached']) {
     return dispatch(
       opts,
-      new CacheHandler(undici.util.cache.makeCacheKey(opts), { store, handler }),
+      cacheControlDirectives['no-store']
+        ? handler
+        : new CacheHandler(undici.util.cache.makeCacheKey(opts), { store, handler }),
     )
   }
 
@@ -174,7 +181,7 @@ export default () => (dispatch) => (opts, handler) => {
     }
   }
 
-  const { statusCode, headers } = entry
+  const { statusCode, headers } = entry ?? { statusCode: 504, headers: {} }
   try {
     handler.onConnect(abort)
     if (aborted) {

package/lib/interceptor/log.js

@@ -60,7 +60,7 @@ class Handler extends DecoratorHandler {
       this.#logger.debug('upstream request socket closed')
     })
 
-    super.onUpgrade(statusCode, null, socket, headers)
+    super.onUpgrade(statusCode, headers, socket)
   }
 
   onHeaders(statusCode, headers, resume) {

package/lib/interceptor/redirect.js

@@ -41,8 +41,8 @@ class Handler extends DecoratorHandler {
     }
   }
 
-  onUpgrade(statusCode, rawHeaders, socket, headers) {
-    super.onUpgrade(statusCode, rawHeaders, socket, headers)
+  onUpgrade(statusCode, headers, socket) {
+    super.onUpgrade(statusCode, headers, socket)
   }
 
   onHeaders(statusCode, headers, resume) {

package/lib/utils.js

@@ -265,10 +265,6 @@ export class DecoratorHandler {
     return this.#handler.onConnect?.(...args)
   }
 
-  onError(...args) {
-    return this.#handler.onError?.(...args)
-  }
-
   onUpgrade(...args) {
     return this.#handler.onUpgrade?.(...args)
   }
@@ -284,6 +280,10 @@ export class DecoratorHandler {
   onComplete(...args) {
     return this.#handler.onComplete?.(...args)
   }
+
+  onError(...args) {
+    return this.#handler.onError?.(...args)
+  }
 }
 
 /**

package/package.json

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