@nxtedition/nxt-undici 6.2.18 → 6.2.20

package/lib/interceptor/cache.js

@@ -10,12 +10,14 @@ class CacheHandler extends DecoratorHandler {
   #key
   #value
   #store
+  #logger
   #maxEntrySize
 
-  constructor(key, { store, handler, maxEntrySize }) {
+  constructor(key, { store, logger, handler, maxEntrySize }) {
     super(handler)
 
     this.#key = key
+    this.#logger = logger
     this.#value = null
     this.#store = store
     this.#maxEntrySize = maxEntrySize ?? store.maxEntrySize ?? DEFAULT_MAX_ENTRY_SIZE
@@ -156,7 +158,11 @@ class CacheHandler extends DecoratorHandler {
   onComplete(trailers) {
     if (this.#value && (!trailers || Object.keys(trailers).length === 0)) {
       this.#value.end ??= this.#value.start + this.#value.size
-      this.#store.set(this.#key, this.#value)
+      try {
+        this.#store.set(this.#key, this.#value)
+      } catch (err) {
+        this.#logger?.error({ err }, 'failed to set cache entry')
+      }
       this.#value = null
     }
 
@@ -194,7 +200,12 @@ export default () => (dispatch) => (opts, handler) => {
 
   // TODO (fix): enable range requests
 
-  const entry = store.get(opts)
+  let entry
+  try {
+    entry = store.get(opts)
+  } catch (err) {
+    opts.logger?.error({ err }, 'failed to get cache entry')
+  }
 
   if (!entry && !cacheControlDirectives['only-if-cached']) {
     return dispatch(
@@ -204,6 +215,7 @@ export default () => (dispatch) => (opts, handler) => {
         : new CacheHandler(undici.util.cache.makeCacheKey(opts), {
             maxEntrySize: opts.cache.maxEntrySize,
             store,
+            logger: opts.logger,
             handler,
           }),
     )

package/lib/request.js

@@ -163,7 +163,14 @@ export function request(dispatch, url, opts) {
   let origin = url.origin
   if (!origin) {
     const protocol = url.protocol ?? 'http:'
-    const host = url.host ?? `${url.hostname}:${url.port ?? (protocol === 'https:' ? 443 : 80)}`
+    const host =
+      url.host ??
+      (url.hostname ? `${url.hostname}:${url.port ?? (protocol === 'https:' ? 443 : 80)}` : null)
+
+    if (!host || !protocol) {
+      throw new InvalidArgumentError('invalid url')
+    }
+
     origin = `${protocol}//${host}`
   }
 

package/lib/sqlite-cache-store.js

@@ -407,22 +407,30 @@ function makeResult(value) {
   }
 }
 
+function printType(val) {
+  return val == null ? 'null' : typeof val === 'object' ? val.constructor.name : typeof val
+}
+
 /**
  * @param {any} key
  */
 function assertCacheKey(key) {
-  if (typeof key !== 'object') {
-    throw new TypeError(`expected key to be object, got ${typeof key}`)
+  if (typeof key !== 'object' || key == null) {
+    throw new TypeError(`expected key to be object, got ${typeof printType(key)} [${key}]`)
   }
 
   for (const property of ['origin', 'method', 'path']) {
     if (typeof key[property] !== 'string') {
-      throw new TypeError(`expected key.${property} to be string, got ${typeof key[property]}`)
+      throw new TypeError(
+        `expected key.${property} to be string, got ${printType(key[property])} [${key[property]}]`,
+      )
     }
   }
 
   if (key.headers !== undefined && typeof key.headers !== 'object') {
-    throw new TypeError(`expected headers to be object, got ${typeof key}`)
+    throw new TypeError(
+      `expected headers to be object, got ${typeof printType(key)} [${key.headers}]`,
+    )
   }
 }
 
@@ -430,31 +438,39 @@ function assertCacheKey(key) {
  * @param {any} value
  */
 function assertCacheValue(value) {
-  if (typeof value !== 'object') {
-    throw new TypeError(`expected value to be object, got ${typeof value}`)
+  if (typeof value !== 'object' || value == null) {
+    throw new TypeError(`expected value to be object, got ${typeof printType(value)}`)
   }
 
   for (const property of ['statusCode', 'cachedAt', 'staleAt', 'deleteAt']) {
     if (typeof value[property] !== 'number') {
-      throw new TypeError(`expected value.${property} to be number, got ${typeof value[property]}`)
+      throw new TypeError(
+        `expected value.${property} to be number, got ${printType(value[property])} [${value[property]}]`,
+      )
     }
   }
 
   if (typeof value.statusMessage !== 'string') {
     throw new TypeError(
-      `expected value.statusMessage to be string, got ${typeof value.statusMessage}`,
+      `expected value.statusMessage to be string, got ${printType(value.statusMessage)} [${value.statusMessage}]`,
     )
   }
 
   if (value.headers != null && typeof value.headers !== 'object') {
-    throw new TypeError(`expected value.rawHeaders to be object, got ${typeof value.headers}`)
+    throw new TypeError(
+      `expected value.rawHeaders to be object, got ${printType(value.headers)} [${value.headers}]`,
+    )
   }
 
   if (value.vary !== undefined && typeof value.vary !== 'object') {
-    throw new TypeError(`expected value.vary to be object, got ${typeof value.vary}`)
+    throw new TypeError(
+      `expected value.vary to be object, got ${printType(value.vary)} [${value.vary}]`,
+    )
   }
 
   if (value.etag !== undefined && typeof value.etag !== 'string') {
-    throw new TypeError(`expected value.etag to be string, got ${typeof value.etag}`)
+    throw new TypeError(
+      `expected value.etag to be string, got ${printType(value.etag)} [${value.etag}]`,
+    )
   }
 }

package/package.json

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