@nxtedition/nxt-undici 6.1.6 → 6.2.0

package/lib/interceptor/cache.js

@@ -95,7 +95,6 @@ class CacheHandler extends DecoratorHandler {
     }
 
     const cachedAt = Date.now()
-
     this.#value = {
       body: [],
       size: 0,
@@ -104,7 +103,7 @@ class CacheHandler extends DecoratorHandler {
       statusMessage: '',
       headers,
       cacheControlDirectives,
-      etag: headers.etag,
+      etag: typeof headers.etag === 'string' && isEtagUsable(headers.etag) ? headers.etag : '',
       vary,
       cachedAt,
       staleAt: 0,
@@ -213,3 +212,37 @@ export default () => (dispatch) => (opts, handler) => {
     abort(err)
   }
 }
+
+/**
+ * Note: this deviates from the spec a little. Empty etags ("", W/"") are valid,
+ *  however, including them in cached resposnes serves little to no purpose.
+ *
+ * @see https://www.rfc-editor.org/rfc/rfc9110.html#name-etag
+ *
+ * @param {string} etag
+ * @returns {boolean}
+ */
+function isEtagUsable(etag) {
+  if (etag.length <= 2) {
+    // Shortest an etag can be is two chars (just ""). This is where we deviate
+    //  from the spec requiring a min of 3 chars however
+    return false
+  }
+
+  if (etag[0] === '"' && etag[etag.length - 1] === '"') {
+    // ETag: ""asd123"" or ETag: "W/"asd123"", kinda undefined behavior in the
+    //  spec. Some servers will accept these while others don't.
+    // ETag: "asd123"
+    return !(etag[1] === '"' || etag.startsWith('"W/'))
+  }
+
+  if (etag.startsWith('W/"') && etag[etag.length - 1] === '"') {
+    // ETag: W/"", also where we deviate from the spec & require a min of 3
+    //  chars
+    // ETag: for W/"", W/"asd123"
+    return etag.length !== 4
+  }
+
+  // Anything else
+  return false
+}

package/lib/interceptor/dns.js

@@ -28,11 +28,28 @@ class Handler extends DecoratorHandler {
   }
 }
 
+class DefaultCache {
+  #map = new Map()
+
+  set(hostname, records) {
+    this.#map.set(hostname, records)
+  }
+
+  get(hostname) {
+    return this.#map.get(hostname)
+  }
+
+  delete(hostname) {
+    this.#map.delete(hostname)
+  }
+}
+
+const DEFAULT_CACHE = new DefaultCache()
+
 export default () => (dispatch) => {
-  const cache = new Map()
   const promises = new Map()
 
-  function resolve(hostname, { resolve4, logger }) {
+  function resolve(hostname, { cache, resolve4, logger }) {
     let promise = promises.get(hostname)
     if (!promise) {
       logger?.debug({ dns: { hostname } }, 'lookup started')
@@ -51,7 +68,7 @@ export default () => (dispatch) => {
               counter: 0,
             }))
 
-            logger?.debug({ err, dns: { records } }, 'lookup completed')
+            logger?.debug({ err, dns: { hostname, records } }, 'lookup completed')
 
             cache.set(hostname, val)
 
@@ -79,6 +96,7 @@ export default () => (dispatch) => {
 
     try {
       const { host, hostname } = origin
+      const cache = opts.dns.cache ?? DEFAULT_CACHE
 
       const now = getFastNow()
 
@@ -88,7 +106,7 @@ export default () => (dispatch) => {
       const logger = opts.dns.logger ?? opts.logger
 
       if (records == null || records.every((x) => x.expires < now)) {
-        const [err, val] = await resolve(hostname, { resolve4, logger })
+        const [err, val] = await resolve(hostname, { cache, resolve4, logger })
 
         if (err) {
           throw err
@@ -98,7 +116,7 @@ export default () => (dispatch) => {
 
         records = val
       } else if (records.some((x) => x.expires < now + 1e3)) {
-        resolve(hostname, { resolve4, logger })
+        resolve(hostname, { cache, resolve4, logger })
       }
 
       records.sort(

package/lib/utils.js

@@ -202,6 +202,7 @@ export class DecoratorHandler {
   #aborted = false
   #errored = false
   #completed = false
+  #abort
 
   constructor(handler) {
     if (typeof handler !== 'object' || handler === null) {
@@ -214,23 +215,26 @@ export class DecoratorHandler {
     this.#aborted = false
     this.#errored = false
     this.#completed = false
+    this.#abort = abort
 
     return this.#handler.onConnect?.((reason) => {
       if (!this.#aborted && !this.#completed && !this.#errored) {
         this.#aborted = true
-        abort(reason)
+        this.#abort(reason)
       }
     })
   }
 
   onUpgrade(statusCode, headers, socket) {
     if (!this.#aborted && !this.#errored) {
+      assert(!this.#completed)
       return this.#handler.onUpgrade?.(statusCode, headers, socket)
     }
   }
 
   onHeaders(statusCode, headers, resume) {
     if (!this.#aborted && !this.#errored) {
+      assert(!this.#completed)
       return this.#handler.onHeaders?.(statusCode, headers, resume)
     }
   }
@@ -243,9 +247,12 @@ export class DecoratorHandler {
   }
 
   onComplete(trailers) {
-    if (!this.#aborted && !this.#completed) {
+    if (!this.#aborted && !this.#completed && !this.#errored) {
+<<<<<<< HEAD
+      this.#abort = null
+=======
+>>>>>>> 23823e3 (fix: decoerator)
       this.#completed = true
-      assert(!this.#errored)
       return this.#handler.onComplete?.(trailers)
     }
   }

package/package.json

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