@nxtedition/nxt-undici 2.1.1 → 2.2.1

package/lib/interceptor/cache.js

@@ -24,14 +24,18 @@ class CacheHandler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage, headers = parseHeaders(rawHeaders)) {
-    // NOTE: Only cache 307 respones for now...
     if (statusCode !== 307) {
       return this.#handler.onHeaders(statusCode, rawHeaders, resume, statusMessage, headers)
     }
 
+    // TODO (fix): Support vary header.
     const cacheControl = parseCacheControl(headers['cache-control'])
 
+    const contentLength = headers['content-length'] ? Number(headers['content-length']) : Infinity
+    const maxEntrySize = this.#store.maxEntrySize ?? Infinity
+
     if (
+      contentLength < maxEntrySize &&
       cacheControl &&
       cacheControl.public &&
       !cacheControl.private &&
@@ -50,12 +54,15 @@ class CacheHandler extends DecoratorHandler {
 
       if (ttl > 0) {
         this.#value = {
-          statusCode,
-          statusMessage,
-          rawHeaders,
-          rawTrailers: null,
-          body: [],
-          size: 0,
+          data: {
+            statusCode,
+            statusMessage,
+            rawHeaders,
+            rawTrailers: null,
+            body: [],
+          },
+          size:
+            (rawHeaders?.reduce((xs, x) => xs + x.length) ?? 0) + (statusMessage?.length ?? 0) + 64,
           ttl: ttl * 1e3,
         }
       }
@@ -67,10 +74,12 @@ class CacheHandler extends DecoratorHandler {
   onData(chunk) {
     if (this.#value) {
       this.#value.size += chunk.bodyLength
-      if (this.#value.size > this.#store.maxEntrySize) {
+
+      const maxEntrySize = this.#store.maxEntrySize ?? Infinity
+      if (this.#value.size > maxEntrySize) {
         this.#value = null
       } else {
-        this.#value.body.push(chunk)
+        this.#value.data.body.push(chunk)
       }
     }
     return this.#handler.onData(chunk)
@@ -78,8 +87,9 @@ class CacheHandler extends DecoratorHandler {
 
   onComplete(rawTrailers) {
     if (this.#value) {
-      this.#value.rawTrailers = rawTrailers
-      this.#store.set(this.#key, this.#value, this.#value.ttl)
+      this.#value.size += rawTrailers?.reduce((xs, x) => xs + x.length) ?? 0
+      this.#value.data.rawTrailers = rawTrailers
+      this.#store.set(this.#key, this.#value.data, { ttl: this.#value.ttl, size: this.#value.size })
     }
     return this.#handler.onComplete(rawTrailers)
   }
@@ -87,17 +97,14 @@ class CacheHandler extends DecoratorHandler {
 
 // TODO (fix): Async filesystem cache.
 class CacheStore {
-  constructor({ maxSize, maxEntrySize }) {
+  constructor({ maxSize = 1024 * 1024, maxEntrySize = 128 * 1024 }) {
     this.maxSize = maxSize
     this.maxEntrySize = maxEntrySize
-    this.cache = new LRUCache({
-      maxSize,
-      sizeCalculation: (value) => value.size,
-    })
+    this.cache = new LRUCache({ maxSize })
   }
 
-  set(key, value, ttl) {
-    this.cache.set(key, value, ttl)
+  set(key, value, opts) {
+    this.cache.set(key, value, opts)
   }
 
   get(key) {

package/lib/interceptor/response-retry.js

@@ -153,7 +153,7 @@ class Handler extends DecoratorHandler {
     this.#error = err
 
     retryPromise
-      .then(() => {
+      .then((opts) => {
         if (this.#aborted) {
           this.#onError(this.#reason)
         } else if (isDisturbed(this.#opts.body)) {
@@ -167,8 +167,10 @@ class Handler extends DecoratorHandler {
 
           this.#opts = {
             ...this.#opts,
+            ...opts,
             headers: {
               ...this.#opts.headers,
+              ...opts?.headers,
               'if-match': this.#etag,
               range: `bytes=${this.#pos}-${this.#end ?? ''}`,
             },
@@ -204,25 +206,3 @@ export default (dispatch) => (opts, handler) => {
     ? dispatch(opts, new Handler(opts, { handler, dispatch }))
     : dispatch(opts, handler)
 }
-
-export function isConnectionError(err) {
-  // AWS compat.
-  const statusCode = err?.statusCode ?? err?.$metadata?.httpStatusCode
-  return err
-    ? err.code === 'ECONNRESET' ||
-        err.code === 'ECONNREFUSED' ||
-        err.code === 'ENOTFOUND' ||
-        err.code === 'ENETDOWN' ||
-        err.code === 'ENETUNREACH' ||
-        err.code === 'EHOSTDOWN' ||
-        err.code === 'EHOSTUNREACH' ||
-        err.code === 'EPIPE' ||
-        err.code === 'ETIMEDOUT' ||
-        err.message === 'other side closed' ||
-        statusCode === 420 ||
-        statusCode === 429 ||
-        statusCode === 502 ||
-        statusCode === 503 ||
-        statusCode === 504
-    : false
-}

package/package.json

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