@nxtedition/nxt-undici 6.0.20 → 6.0.22

package/lib/interceptor/cache.js

@@ -3,6 +3,8 @@ import { DecoratorHandler, parseCacheControl } from '../utils.js'
 
 const DEFAULT_STORE = new undici.cacheStores.SqliteCacheStore({ location: ':memory:' })
 const MAX_ENTRY_SIZE = 128 * 1024
+const EMPTY_BUFFER = Buffer.alloc(0)
+const NOOP = () => {}
 
 class CacheHandler extends DecoratorHandler {
   #key
@@ -164,40 +166,30 @@ export default () => (dispatch) => (opts, handler) => {
     )
   }
 
+  const { statusCode, headers, body } = entry ?? { statusCode: 504, headers: {} }
+
   let aborted = false
-  let paused = false
   const abort = (reason) => {
     if (!aborted) {
       aborted = true
       handler.onError(reason)
     }
   }
-  const resume = () => {
-    if (paused && !aborted) {
-      handler.onComplete()
-      paused = false
-    }
-  }
 
-  const { statusCode, headers } = entry ?? { statusCode: 504, headers: {} }
-  try {
-    handler.onConnect(abort)
-    if (aborted) {
-      return
-    }
-
-    if (handler.onHeaders(statusCode, headers, resume) === false) {
-      paused = true
-    }
+  handler.onConnect(abort)
+  if (aborted) {
+    return
+  }
 
-    if (aborted) {
-      return
-    }
+  handler.onHeaders(statusCode, headers, NOOP)
+  if (aborted) {
+    return
+  }
 
-    if (!paused) {
-      handler.onComplete()
-    }
-  } catch (err) {
-    abort(err)
+  handler.onData(body ?? EMPTY_BUFFER)
+  if (aborted) {
+    return
   }
+
+  handler.onComplete({})
 }

package/lib/interceptor/response-retry.js

@@ -64,8 +64,6 @@ class Handler extends DecoratorHandler {
   }
 
   onHeaders(statusCode, headers, resume) {
-    this.#resume = resume
-
     if (this.#error == null) {
       assert(this.#etag == null)
       assert(this.#pos == null)
@@ -73,18 +71,18 @@ class Handler extends DecoratorHandler {
       assert(this.#headersSent === false)
 
       if (headers.trailer) {
-        return this.#onHeaders(statusCode, headers)
+        return this.#onHeaders(statusCode, headers, resume)
       }
 
       const contentLength = headers['content-length'] ? Number(headers['content-length']) : null
       if (contentLength != null && !Number.isFinite(contentLength)) {
-        return this.#onHeaders(statusCode, headers)
+        return this.#onHeaders(statusCode, headers, resume)
       }
 
       if (statusCode === 206) {
         const range = parseRangeHeader(headers['content-range'])
         if (!range) {
-          return this.#onHeaders(statusCode, headers)
+          return this.#onHeaders(statusCode, headers, resume)
         }
 
         const { start, size, end = size } = range
@@ -104,7 +102,7 @@ class Handler extends DecoratorHandler {
         this.#end = contentLength
         this.#etag = headers.etag
       } else {
-        return this.#onHeaders(statusCode, headers)
+        return this.#onHeaders(statusCode, headers, resume)
       }
 
       // Weak etags are not useful for comparison nor cache
@@ -117,7 +115,9 @@ class Handler extends DecoratorHandler {
       assert(Number.isFinite(this.#pos))
       assert(this.#end == null || Number.isFinite(this.#end))
 
-      return this.#onHeaders(statusCode, headers)
+      this.#resume = resume
+
+      return this.#onHeaders(statusCode, headers, () => this.#resume?.())
     } else if (statusCode === 206 || (this.#pos === 0 && statusCode === 200)) {
       assert(this.#etag != null || !this.#pos)
 
@@ -134,6 +134,8 @@ class Handler extends DecoratorHandler {
       assert(this.#pos === start, 'content-range mismatch')
       assert(this.#end == null || this.#end === end, 'content-range mismatch')
 
+      this.#resume = resume
+
       // TODO (fix): What if we were paused before the error?
       return true
     } else {
@@ -211,10 +213,10 @@ class Handler extends DecoratorHandler {
     super.onError(err)
   }
 
-  #onHeaders(statusCode, headers) {
+  #onHeaders(statusCode, headers, resume) {
     assert(!this.#headersSent)
     this.#headersSent = true
-    return super.onHeaders(statusCode, headers, () => this.#resume?.())
+    return super.onHeaders(statusCode, headers, resume)
   }
 }
 

package/lib/utils.js

@@ -256,6 +256,8 @@ export function bodyLength(body) {
 
 export class DecoratorHandler {
   #handler
+  #aborted = false
+  #errored = false
 
   constructor(handler) {
     if (typeof handler !== 'object' || handler === null) {
@@ -264,28 +266,45 @@ export class DecoratorHandler {
     this.#handler = handler
   }
 
-  onConnect(...args) {
-    return this.#handler.onConnect?.(...args)
+  onConnect(abort) {
+    this.#aborted = false
+    this.#errored = false
+
+    return this.#handler.onConnect?.((reason) => {
+      this.#aborted = true
+      abort(reason)
+    })
   }
 
-  onUpgrade(...args) {
-    return this.#handler.onUpgrade?.(...args)
+  onUpgrade(statusCode, headers, socket) {
+    if (!this.#aborted && !this.#errored) {
+      return this.#handler.onUpgrade?.(statusCode, headers, socket)
+    }
   }
 
-  onHeaders(...args) {
-    return this.#handler.onHeaders?.(...args)
+  onHeaders(statusCode, headers, resume) {
+    if (!this.#aborted && !this.#errored) {
+      return this.#handler.onHeaders?.(statusCode, headers, resume)
+    }
   }
 
-  onData(...args) {
-    return this.#handler.onData?.(...args)
+  onData(data) {
+    if (!this.#aborted && !this.#errored && data != null) {
+      return this.#handler.onData?.(data)
+    }
   }
 
-  onComplete(...args) {
-    return this.#handler.onComplete?.(...args)
+  onComplete(trailers) {
+    if (!this.#aborted && !this.#errored) {
+      return this.#handler.onComplete?.(trailers)
+    }
   }
 
-  onError(...args) {
-    return this.#handler.onError?.(...args)
+  onError(err) {
+    if (!this.#errored) {
+      this.#errored = true
+      return this.#handler.onError?.(err)
+    }
   }
 }
 

package/package.json

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