@nxtedition/nxt-undici 6.2.10 → 6.2.12

package/lib/interceptor/cache.js

@@ -1,6 +1,6 @@
 import undici from '@nxtedition/undici'
 import { DecoratorHandler, parseCacheControl, parseContentRange } from '../utils.js'
-import { SqliteCacheStore, assertCacheKey } from '../sqlite-cache-store.js'
+import { SqliteCacheStore } from '../sqlite-cache-store.js'
 
 const DEFAULT_STORE = new SqliteCacheStore({ location: ':memory:' })
 const DEFAULT_MAX_ENTRY_SIZE = 128 * 1024
@@ -13,8 +13,6 @@ class CacheHandler extends DecoratorHandler {
   #maxEntrySize
 
   constructor(key, { store, handler, maxEntrySize }) {
-    assertCacheKey(key)
-
     super(handler)
 
     this.#key = key
@@ -211,7 +209,7 @@ export default () => (dispatch) => (opts, handler) => {
     )
   }
 
-  const { statusCode, headers, body } = entry ?? { statusCode: 504, headers: {} }
+  const { statusCode, headers, trailers, body } = entry ?? { statusCode: 504 }
 
   let aborted = false
   const abort = (reason) => {
@@ -230,7 +228,7 @@ export default () => (dispatch) => (opts, handler) => {
       return
     }
 
-    handler.onHeaders(statusCode, headers, NOOP)
+    handler.onHeaders(statusCode, headers ?? {}, NOOP)
     if (aborted) {
       return
     }
@@ -242,7 +240,7 @@ export default () => (dispatch) => (opts, handler) => {
       }
     }
 
-    handler.onComplete({})
+    handler.onComplete(trailers ?? {})
   } catch (err) {
     abort(err)
   }

package/lib/interceptor/dns.js

@@ -35,8 +35,8 @@ export default () => (dispatch) => {
   function resolve(hostname, { logger }) {
     let promise = promises.get(hostname)
     if (!promise) {
-      logger?.debug({ dns: { hostname } }, 'lookup started')
-      promise = new Promise((resolve) =>
+      promise = new Promise((resolve) => {
+        logger?.debug({ dns: { hostname } }, 'lookup started')
         dns.resolve4(hostname, { ttl: true }, (err, records) => {
           promises.delete(hostname)
 
@@ -59,8 +59,8 @@ export default () => (dispatch) => {
 
             resolve([null, val])
           }
-        }),
-      )
+        })
+      })
       promises.set(hostname, promise)
     }
     return promise

package/lib/interceptor/response-retry.js

@@ -338,6 +338,7 @@ async function retryFn(err, retryCount, opts) {
       'EHOSTDOWN',
       'EHOSTUNREACH',
       'EPIPE',
+      'ENODATA',
       'UND_ERR_CONNECT_TIMEOUT',
     ].includes(err.code)
   ) {

package/lib/sqlite-cache-store.js

@@ -2,7 +2,7 @@ import { DatabaseSync } from 'node:sqlite'
 import assert from 'node:assert'
 import { parseRangeHeader } from './utils.js'
 
-const VERSION = 5
+const VERSION = 6
 
 // 2gb
 const MAX_ENTRY_SIZE = 2 * 1000 * 1000 * 1000
@@ -133,7 +133,6 @@ export class SqliteCacheStore {
       CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_method ON cacheInterceptorV${VERSION}(method);
       CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_deleteAt ON cacheInterceptorV${VERSION}(deleteAt);
       CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_start ON cacheInterceptorV${VERSION}(start);
-      CREATE INDEX IF NOT EXISTS idx_cacheInterceptorV${VERSION}_end ON cacheInterceptorV${VERSION}(end);
     `)
 
     this.#getValuesQuery = this.#db.prepare(`
@@ -154,7 +153,6 @@ export class SqliteCacheStore {
         url = ?
         AND method = ?
         AND start <= ?
-        AND end >= ?
       ORDER BY
         deleteAt ASC
     `)
@@ -318,12 +316,7 @@ export class SqliteCacheStore {
     /**
      * @type {SqliteStoreValue[]}
      */
-    const values = this.#getValuesQuery.all(
-      makeValueUrl(key),
-      method,
-      range?.start ?? 0,
-      range?.end ?? Number.MAX_SAFE_INTEGER,
-    )
+    const values = this.#getValuesQuery.all(makeValueUrl(key), method, range?.start ?? 0)
 
     if (values.length === 0) {
       return undefined
@@ -417,7 +410,7 @@ function makeResult(value) {
 /**
  * @param {any} key
  */
-export function assertCacheKey(key) {
+function assertCacheKey(key) {
   if (typeof key !== 'object') {
     throw new TypeError(`expected key to be object, got ${typeof key}`)
   }
@@ -436,7 +429,7 @@ export function assertCacheKey(key) {
 /**
  * @param {any} value
  */
-export function assertCacheValue(value) {
+function assertCacheValue(value) {
   if (typeof value !== 'object') {
     throw new TypeError(`expected value to be object, got ${typeof value}`)
   }

package/package.json

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