@nxtedition/nxt-undici 6.0.5 → 6.0.7

package/lib/interceptor/cache.js

@@ -5,14 +5,17 @@ const DEFAULT_STORE = new undici.cacheStores.SqliteCacheStore({ location: ':memo
 const MAX_ENTRY_SIZE = 128 * 1024
 
 class CacheHandler extends DecoratorHandler {
+  #key
   #value
-  #opts
   #store
 
-  constructor(opts, { store, handler }) {
+  constructor(key, { store, handler }) {
+    undici.util.cache.assertCacheKey(key)
+
     super(handler)
 
-    this.#opts = opts
+    this.#key = key
+    this.#value = null
     this.#store = store
   }
 
@@ -39,20 +42,26 @@ 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)
     }
 
@@ -61,7 +70,7 @@ class CacheHandler extends DecoratorHandler {
       for (const key of [headers.vary]
         .flat()
         .flatMap((vary) => vary.split(',').map((key) => key.trim().toLowerCase()))) {
-        const val = this.#opts.headers?.[key]
+        const val = this.#key.headers[key]
         if (!val) {
           // Expect vary headers to be present...
           return super.onHeaders(statusCode, headers, resume)
@@ -73,9 +82,9 @@ class CacheHandler extends DecoratorHandler {
       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)
     }
@@ -89,8 +98,8 @@ class CacheHandler extends DecoratorHandler {
       statusCode,
       statusMessage: '',
       headers,
-      cacheControlDirectives: '',
-      etag: '',
+      cacheControlDirectives,
+      etag: headers.etag,
       vary,
       cachedAt,
       staleAt: 0,
@@ -115,7 +124,7 @@ class CacheHandler extends DecoratorHandler {
 
   onComplete(trailers) {
     if (this.#value && (!trailers || Object.keys(trailers).length === 0)) {
-      this.#store.set(this.#opts, this.#value)
+      this.#store.set(this.#key, this.#value)
     }
 
     super.onComplete(trailers)
@@ -131,16 +140,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)
   }
 
@@ -149,8 +159,13 @@ export default () => (dispatch) => (opts, handler) => {
 
   const store = opts.cache.store ?? DEFAULT_STORE
   const entry = store.get(opts)
-  if (!entry) {
-    return dispatch(opts, new CacheHandler(opts.headers, { store, handler }))
+  if (!entry && !cacheControlDirectives['only-if-cached']) {
+    return dispatch(
+      opts,
+      cacheControlDirectives['no-store']
+        ? handler
+        : new CacheHandler(undici.util.cache.makeCacheKey(opts), { store, handler }),
+    )
   }
 
   let aborted = false
@@ -168,7 +183,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.5",
+  "version": "6.0.7",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "main": "lib/index.js",