@nxtedition/nxt-undici 5.0.0 → 5.0.1

package/lib/interceptor/cache.js

@@ -31,7 +31,7 @@ class CacheHandler {
     const maxEntrySize = this.#store.maxEntrySize ?? Infinity
 
     if (
-      contentLength < maxEntrySize &&
+      (!contentLength || contentLength < maxEntrySize) &&
       cacheControl &&
       cacheControl.public &&
       !cacheControl.private &&

package/lib/interceptor/log.js

@@ -59,7 +59,7 @@ class Handler extends DecoratorHandler {
 
     this.#logger.debug(
       {
-        ureq: { id: this.#opts.id, url: this.#opts.url },
+        ureq: { id: this.#opts.id, url: String(this.#opts.url) },
         ures: { statusCode, headers },
         elapsedTime: this.#timing.headers,
       },

package/lib/request.js

@@ -6,7 +6,7 @@ import { BodyReadable as Readable } from './readable.js'
 function noop() {}
 
 export class RequestHandler {
-  constructor(opts, callback) {
+  constructor(opts, resolve) {
     if (!opts || typeof opts !== 'object') {
       throw new InvalidArgumentError('invalid opts')
     }
@@ -14,8 +14,8 @@ export class RequestHandler {
     const { signal, method, body, highWaterMark } = opts
 
     try {
-      if (typeof callback !== 'function') {
-        throw new InvalidArgumentError('invalid callback')
+      if (typeof resolve !== 'function') {
+        throw new InvalidArgumentError('invalid resolve')
       }
 
       if (highWaterMark && (typeof highWaterMark !== 'number' || highWaterMark < 0)) {
@@ -41,7 +41,7 @@ export class RequestHandler {
     }
 
     this.method = method
-    this.callback = callback
+    this.resolve = resolve
     this.res = null
     this.abort = null
     this.body = body
@@ -71,13 +71,13 @@ export class RequestHandler {
       return
     }
 
-    assert(this.callback)
+    assert(this.resolve)
 
     this.abort = abort
   }
 
   onHeaders(statusCode, rawHeaders, resume, headers = parseHeaders(rawHeaders)) {
-    const { callback, abort, highWaterMark } = this
+    const { resolve, abort, highWaterMark } = this
 
     if (statusCode < 200) {
       return true
@@ -98,11 +98,11 @@ export class RequestHandler {
       this.removeAbortListener = undefined
     }
 
-    this.callback = null
+    this.resolve = null
     this.res = res
 
-    if (callback !== null) {
-      callback(null, { statusCode, headers, body: res })
+    if (resolve !== null) {
+      resolve({ statusCode, headers, body: res })
     }
   }
 
@@ -115,13 +115,13 @@ export class RequestHandler {
   }
 
   onError(err) {
-    const { res, callback, body } = this
+    const { res, resolve, body } = this
 
-    if (callback) {
+    if (resolve) {
       // TODO: Does this need queueMicrotask?
-      this.callback = null
+      this.resolve = null
       queueMicrotask(() => {
-        callback(err)
+        resolve(Promise.reject(err))
       })
     }
 
@@ -149,7 +149,7 @@ export class RequestHandler {
 }
 
 export function request(dispatch, url, opts) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     if (typeof url === 'string') {
       opts = { url: new URL(url), ...opts }
     } else if (url instanceof URL) {
@@ -162,15 +162,6 @@ export function request(dispatch, url, opts) {
       opts = url
     }
 
-    dispatch(
-      opts,
-      new RequestHandler(opts, (err, res) => {
-        if (err) {
-          reject(err)
-        } else {
-          resolve(res)
-        }
-      }),
-    )
+    dispatch(opts, new RequestHandler(opts, resolve))
   })
 }

package/package.json

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