@nxtedition/nxt-undici 7.3.18 → 7.3.19

package/lib/index.d.ts

@@ -155,7 +155,6 @@ export interface CacheValue {
   etag?: string
   vary?: Record<string, string | string[]>
   cachedAt: number
-  staleAt: number
   deleteAt?: number
 }
 
@@ -168,7 +167,6 @@ export interface CacheGetResult {
   cacheControlDirectives?: Record<string, unknown>
   vary?: Record<string, string | string[]>
   cachedAt: number
-  staleAt: number
   deleteAt: number
 }
 

package/lib/index.js

@@ -159,7 +159,7 @@ function wrapDispatch(dispatcher) {
             upgrade: opts.upgrade ?? false,
             follow: opts.follow ?? opts.redirect ?? 8,
             error: opts.error ?? opts.throwOnError ?? true,
-            verify: opts.verify ?? false,
+            verify: opts.verify ?? { size: true, hash: false },
             logger: opts.logger ?? null,
             dns: opts.dns ?? true,
             connect: opts.connect,

package/lib/interceptor/cache.js

@@ -135,7 +135,6 @@ class CacheHandler extends DecoratorHandler {
         etag: isEtagUsable(headers.etag) ? headers.etag : '',
         vary,
         cachedAt,
-        staleAt: 0,
         // Handler state.
         size: 0,
       }
@@ -192,6 +191,12 @@ export default () => (dispatch) => (opts, handler) => {
   const onlyIfCached =
     typeof rawCacheControl === 'string' && rawCacheControl.includes('only-if-cached')
 
+  // RFC 9111 Section 5.4: Pragma: no-cache should be treated as
+  // Cache-Control: no-cache when Cache-Control is absent.
+  if (rawCacheControl == null && opts?.headers?.pragma === 'no-cache') {
+    cacheControlDirectives['no-cache'] = true
+  }
+
   if (cacheControlDirectives['no-transform']) {
     // Do nothing. We don't transform requests...
   }
@@ -223,6 +228,37 @@ export default () => (dispatch) => (opts, handler) => {
     }
   }
 
+  // RFC 9111 Section 3.5: A shared cache must not use a cached response to a
+  // request with Authorization unless the response includes a public directive.
+  if (entry && opts.headers?.authorization && !entry.cacheControlDirectives?.public) {
+    entry = undefined
+  }
+
+  // RFC 9110 Section 13: Evaluate conditional request headers against cached entry.
+  if (entry && opts.headers?.['if-none-match']) {
+    if (entry.etag && weakMatch(opts.headers['if-none-match'], entry.etag)) {
+      return serveFromCache({ statusCode: 304, headers: entry.headers }, opts, handler)
+    }
+    // Etag didn't match — bypass to origin.
+    entry = undefined
+  } else if (entry && opts.headers?.['if-modified-since']) {
+    const lastModified = entry.headers?.['last-modified']
+    if (lastModified && new Date(lastModified) <= new Date(opts.headers['if-modified-since'])) {
+      return serveFromCache({ statusCode: 304, headers: entry.headers }, opts, handler)
+    }
+    // No last-modified or modified since — bypass to origin.
+    entry = undefined
+  }
+
+  if (
+    opts.headers?.['if-match'] ||
+    opts.headers?.['if-unmodified-since'] ||
+    opts.headers?.['if-range']
+  ) {
+    // TODO (fix): evaluate these conditional headers against cached entry.
+    return dispatch(opts, handler)
+  }
+
   if (!entry && !onlyIfCached) {
     return dispatch(
       opts,
@@ -238,7 +274,11 @@ export default () => (dispatch) => (opts, handler) => {
     )
   }
 
-  const { statusCode, headers, trailers, body } = entry ?? { statusCode: 504 }
+  return serveFromCache(entry ?? { statusCode: 504 }, opts, handler)
+}
+
+function serveFromCache(entry, opts, handler) {
+  const { statusCode, headers, trailers, body } = entry
 
   let aborted = false
   const abort = (reason) => {
@@ -275,6 +315,31 @@ export default () => (dispatch) => (opts, handler) => {
   }
 }
 
+/**
+ * RFC 9110 Section 8.8.3.2: Weak comparison — two etags match if their
+ * opaque-tags match, ignoring the W/ prefix.
+ *
+ * @param {string} ifNoneMatch - The If-None-Match header value (may contain multiple etags)
+ * @param {string} etag - The cached etag
+ * @returns {boolean}
+ */
+function weakMatch(ifNoneMatch, etag) {
+  if (ifNoneMatch === '*') {
+    return true
+  }
+
+  const normalize = (tag) => (tag.startsWith('W/') ? tag.slice(2) : tag)
+  const cached = normalize(etag)
+
+  for (const raw of ifNoneMatch.split(',')) {
+    if (normalize(raw.trim()) === cached) {
+      return true
+    }
+  }
+
+  return false
+}
+
 /**
  * Note: this deviates from the spec a little. Empty etags ("", W/"") are valid,
  *  however, including them in cached resposnes serves little to no purpose.

package/lib/interceptor/log.js

@@ -1,7 +1,7 @@
 import { DecoratorHandler } from '../utils.js'
 
-const kGlobalIndex = Symbol('globalIndex')
-const kGlobalArray = Symbol('globalArray')
+const kGlobalIndex = Symbol.for('@nxtedition/nxt-undici#globalIndex')
+const kGlobalArray = Symbol.for('@nxtedition/nxt-undici#globalArray')
 
 class Handler extends DecoratorHandler {
   #opts
@@ -35,7 +35,7 @@ class Handler extends DecoratorHandler {
     this.#logger.debug('upstream request started')
     this.#timing.created = this.#created + performance.timeOrigin
 
-    this[kGlobalArray] = globalThis.__undici_requests ??= []
+    this[kGlobalArray] = globalThis[kGlobalArray] ??= []
     this[kGlobalIndex] = this[kGlobalArray].push(this) - 1
   }
 

package/lib/interceptor/response-error.js

@@ -42,6 +42,8 @@ class Handler extends DecoratorHandler {
       this.#decoder = new TextDecoder('utf-8')
       this.#body = ''
     }
+
+    return true
   }
 
   onData(chunk) {

package/lib/interceptor/response-retry.js

@@ -177,11 +177,6 @@ class Handler extends DecoratorHandler {
   onData(chunk) {
     if (this.#pos != null) {
       this.#pos += chunk.byteLength
-
-      if (this.#end != null && this.#pos > this.#end) {
-        this.#maybeError(new Error('Response body exceeded Content-Range'))
-        return false
-      }
     }
 
     if (this.#statusCode < 400) {
@@ -202,10 +197,6 @@ class Handler extends DecoratorHandler {
     this.#trailers = trailers
 
     if (this.#statusCode < 400) {
-      if (this.#end != null && this.#pos !== this.#end && this.#opts.method !== 'HEAD') {
-        this.#maybeError(new Error('Response body length mismatch with Content-Range'))
-        return
-      }
       return super.onComplete(trailers)
     }
 

package/lib/interceptor/response-verify.js

@@ -1,10 +1,10 @@
 import crypto from 'node:crypto'
-import { DecoratorHandler } from '../utils.js'
+import { DecoratorHandler, parseContentRange } from '../utils.js'
 
 class Handler extends DecoratorHandler {
   #verifyOpts
   #contentMD5
-  #contentLength
+  #expectedSize
   #hasher
   #pos = 0
 
@@ -16,7 +16,7 @@ class Handler extends DecoratorHandler {
 
   onConnect(abort) {
     this.#contentMD5 = null
-    this.#contentLength = null
+    this.#expectedSize = null
     this.#hasher = null
     this.#pos = 0
 
@@ -25,7 +25,16 @@ class Handler extends DecoratorHandler {
 
   onHeaders(statusCode, headers, resume) {
     this.#contentMD5 = this.#verifyOpts.hash ? headers['content-md5'] : null
-    this.#contentLength = this.#verifyOpts.size ? headers['content-length'] : null
+
+    if (this.#verifyOpts.size) {
+      const contentRange = parseContentRange(headers['content-range'])
+      if (contentRange?.start != null && contentRange?.end != null) {
+        this.#expectedSize = contentRange.end - contentRange.start
+      } else if (headers['content-length'] != null) {
+        this.#expectedSize = Number(headers['content-length'])
+      }
+    }
+
     this.#hasher = this.#contentMD5 != null ? crypto.createHash('md5') : null
 
     return super.onHeaders(statusCode, headers, resume)
@@ -35,16 +44,26 @@ class Handler extends DecoratorHandler {
     this.#pos += chunk.length
     this.#hasher?.update(chunk)
 
+    if (this.#expectedSize != null && this.#pos > this.#expectedSize) {
+      super.onError(
+        Object.assign(new Error('Response body exceeded Content-Range'), {
+          expected: this.#expectedSize,
+          actual: this.#pos,
+        }),
+      )
+      return false
+    }
+
     return super.onData(chunk)
   }
 
   onComplete(trailers) {
     const contentMD5 = this.#hasher?.digest('base64')
 
-    if (this.#contentLength != null && this.#pos !== Number(this.#contentLength)) {
+    if (this.#expectedSize != null && this.#pos !== this.#expectedSize) {
       super.onError(
-        Object.assign(new Error('Response Content-Length mismatch'), {
-          expected: Number(this.#contentLength),
+        Object.assign(new Error('Response body size mismatch'), {
+          expected: this.#expectedSize,
           actual: this.#pos,
         }),
       )

package/lib/sqlite-cache-store.js

@@ -2,7 +2,7 @@ import { DatabaseSync } from 'node:sqlite'
 import { parseRangeHeader, getFastNow } from './utils.js'
 
 // Bump version when the URL key format or schema changes to invalidate old caches.
-const VERSION = 9
+const VERSION = 10
 
 /** @typedef {{ purgeStale: () => void } } */
 const stores = new Set()
@@ -33,7 +33,6 @@ const stores = new Set()
  *  etag?: string
  *  cacheControlDirectives?: string
  *  cachedAt: number
- *  staleAt: number
  *  deleteAt: number
  * }} SqliteStoreValue
  */
@@ -96,8 +95,7 @@ export class SqliteCacheStore {
         cacheControlDirectives TEXT NULL,
         etag TEXT NULL,
         vary TEXT NULL,
-        cachedAt INTEGER NOT NULL,
-        staleAt INTEGER NOT NULL
+        cachedAt INTEGER NOT NULL
       );
 
       CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_getValuesQuery ON cacheInterceptorV${VERSION}(url, method, start, deleteAt);
@@ -117,8 +115,7 @@ export class SqliteCacheStore {
         etag,
         cacheControlDirectives,
         vary,
-        cachedAt,
-        staleAt
+        cachedAt
       FROM cacheInterceptorV${VERSION}
       WHERE
         url = ?
@@ -143,9 +140,8 @@ export class SqliteCacheStore {
         etag,
         cacheControlDirectives,
         vary,
-        cachedAt,
-        staleAt
-      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        cachedAt
+      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
     `)
 
     this.#deleteExpiredValuesQuery = this.#db.prepare(
@@ -255,7 +251,6 @@ export class SqliteCacheStore {
         : null,
       vary: value.vary ? JSON.stringify(value.vary) : null,
       cachedAt: value.cachedAt,
-      staleAt: value.staleAt,
     })
   }
 
@@ -286,7 +281,6 @@ export class SqliteCacheStore {
               cacheControlDirectives,
               vary,
               cachedAt,
-              staleAt,
             } = this.#insertBatch[n++]
             this.#insertValueQuery.run(
               url,
@@ -302,7 +296,6 @@ export class SqliteCacheStore {
               cacheControlDirectives,
               vary,
               cachedAt,
-              staleAt,
             )
             if ((n & 0xf) === 0 && performance.now() - startTime > 10) {
               break
@@ -463,7 +456,6 @@ function makeResult(value) {
       ? JSON.parse(value.cacheControlDirectives)
       : undefined,
     cachedAt: value.cachedAt,
-    staleAt: value.staleAt,
     deleteAt: value.deleteAt,
   }
 }
@@ -503,7 +495,7 @@ function assertCacheValue(value) {
     throw new TypeError(`expected value to be object, got ${printType(value)}`)
   }
 
-  for (const property of ['statusCode', 'cachedAt', 'staleAt', 'deleteAt']) {
+  for (const property of ['statusCode', 'cachedAt', 'deleteAt']) {
     if (typeof value[property] !== 'number') {
       throw new TypeError(
         `expected value.${property} to be number, got ${printType(value[property])} [${value[property]}]`,

package/lib/utils.js

@@ -163,14 +163,6 @@ export function parseOrigin(url) {
   return url
 }
 
-export class AbortError extends Error {
-  constructor(message) {
-    super(message ?? 'The operation was aborted')
-    this.code = 'ABORT_ERR'
-    this.name = 'AbortError'
-  }
-}
-
 export function isStream(obj) {
   return (
     obj && typeof obj === 'object' && typeof obj.pipe === 'function' && typeof obj.on === 'function'

package/package.json

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