@nxtedition/lib 19.8.7 → 19.8.9

package/couch.js

@@ -7,7 +7,7 @@ import tp from 'timers/promises'
 import { defaultDelay as delay } from './http.js'
 import urljoin from 'url-join'
 import { AbortError } from './errors.js'
-import { interceptors, Agent, Pool, parseHeaders } from '@nxtedition/nxt-undici'
+import { dispatch, Agent, Pool, parseHeaders } from '@nxtedition/nxt-undici'
 
 // https://github.com/fastify/fastify/blob/main/lib/reqIdGenFactory.js
 // 2,147,483,647 (2^31 − 1) stands for max SMI value (an internal optimization of V8).
@@ -1091,24 +1091,26 @@ class PromiseOutput {
   }
 }
 
-const dispatcherCache = new WeakMap()
 const defaultDispatcher = new Agent({
   pipelining: 4,
   connections: 8,
 })
+
 export function request(
   url,
   {
-    body,
+    body = null,
     method = body ? 'POST' : 'GET',
-    query,
-    headers,
+    query = null,
+    headers = null,
     dispatcher = defaultDispatcher,
-    signal,
-    logger,
-    stream,
+    signal = null,
+    logger = null,
+    stream = false,
     blocking = Boolean(stream),
-  },
+    headerTimeout,
+    bodyTimeout,
+  } = {},
 ) {
   signal?.throwIfAborted()
 
@@ -1118,41 +1120,29 @@ export function request(
   }
 
   const opts = {
-    origin: url.origin,
-    path: url.pathname + '?' + querystring.stringify(query),
+    url,
     method,
+    query,
     blocking,
     headers: {
       'content-type': body != null && typeof body === 'object' ? 'application/json' : 'plain/text',
-      'user-agent': globalThis.userAgent ?? 'nxt-lib',
       accept: 'application/json',
       ...headers,
     },
     logger,
     body: body != null && typeof body === 'object' ? JSON.stringify(body) : body,
-  }
-
-  let wrappedDispatcher = dispatcherCache.get(dispatcher)
-  if (!wrappedDispatcher) {
-    wrappedDispatcher = dispatcher.compose(
-      interceptors.responseError(),
-      interceptors.log(),
-      interceptors.dns(),
-      interceptors.requestId(),
-      interceptors.responseRetry(),
-      interceptors.responseVerify(),
-    )
-    dispatcherCache.set(dispatcher, wrappedDispatcher)
+    headerTimeout,
+    bodyTimeout,
   }
 
   if (stream) {
     const handler = new StreamOutput({ signal, ...stream })
-    wrappedDispatcher.dispatch(opts, handler)
+    dispatch(dispatcher, opts, handler)
     return handler
   } else {
     return new Promise((resolve, reject) => {
       const handler = new PromiseOutput({ resolve, reject, signal })
-      wrappedDispatcher.dispatch(opts, handler)
+      dispatch(dispatcher, opts, handler)
     })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.8.7",
+  "version": "19.8.9",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",
@@ -82,7 +82,7 @@
     "@aws-sdk/client-s3": "^3.600.0",
     "@elastic/elasticsearch": "^8.14.0",
     "@elastic/transport": "^8.6.1",
-    "@nxtedition/nxt-undici": "^3.2.0",
+    "@nxtedition/nxt-undici": "^3.3.1",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",