@nxtedition/lib 19.8.6 → 19.8.8

package/couch.js

@@ -6,9 +6,8 @@ import { makeWeakCache } from './weakCache.js'
 import tp from 'timers/promises'
 import { defaultDelay as delay } from './http.js'
 import urljoin from 'url-join'
-import undici, { util as undiciUtil } from 'undici'
 import { AbortError } from './errors.js'
-import { interceptors } 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).
@@ -23,23 +22,6 @@ function genReqId() {
   return `req-${nextReqId.toString(36)}`
 }
 
-function parseHeaders(headers, obj = {}) {
-  for (let i = 0; i < headers.length; i += 2) {
-    const key = headers[i].toString().toLowerCase()
-    let val = obj[key]
-    if (!val) {
-      obj[key] = headers[i + 1].toString()
-    } else {
-      if (!Array.isArray(val)) {
-        val = [val]
-        obj[key] = val
-      }
-      val.push(headers[i + 1].toString())
-    }
-  }
-  return obj
-}
-
 export function makeCouch(opts) {
   let config
   if (typeof opts === 'string') {
@@ -75,13 +57,13 @@ export function makeCouch(opts) {
   }
 
   const userAgent = config.userAgent || globalThis.userAgent
-  const defaultClient = new undici.Pool(dbOrigin, defaultClientOpts)
+  const defaultClient = new Pool(dbOrigin, defaultClientOpts)
 
   const getClient =
     config.getClient ??
     makeWeakCache(
       () =>
-        new undici.Pool(dbOrigin, {
+        new Pool(dbOrigin, {
           ...defaultClientOpts,
           connections: 4, // TODO (fix): Global limit?
           pipelining: 2,
@@ -133,7 +115,12 @@ export function makeCouch(opts) {
     })
   }
 
-  async function* changes({ client = defaultClient, signal, highWaterMark, ...options } = {}) {
+  async function* changes({
+    client = defaultClient,
+    signal = null,
+    highWaterMark = 128 * 1024,
+    ...options
+  } = {}) {
     const params = {}
 
     let body
@@ -594,7 +581,12 @@ export function makeCouch(opts) {
     return res.data
   }
 
-  async function put(pathname, params, body, { client, signal, idempotent = true, headers } = {}) {
+  async function put(
+    pathname,
+    params,
+    body,
+    { client = defaultClient, signal = null, idempotent = true, headers = null } = {},
+  ) {
     const req = {
       pathname,
       params,
@@ -639,7 +631,7 @@ export function makeCouch(opts) {
     pathname,
     params,
     body,
-    { client = getClient('_all_docs'), signal, idempotent = true, headers } = {},
+    { client = getClient('_all_docs'), signal = null, idempotent = true, headers = null } = {},
   ) {
     const req = {
       pathname,
@@ -664,7 +656,7 @@ export function makeCouch(opts) {
     pathname,
     params,
     body,
-    { client, signal, idempotent = true, headers } = {},
+    { client = defaultClient, signal = null, idempotent = true, headers = null } = {},
   ) {
     const req = {
       pathname,
@@ -685,7 +677,11 @@ export function makeCouch(opts) {
     return res.data
   }
 
-  async function info(params, body, { client, signal, idempotent = true, headers } = {}) {
+  async function info(
+    params,
+    body,
+    { client = defaultClient, signal = null, idempotent = true, headers = null } = {},
+  ) {
     const req = {
       pathname: null,
       params,
@@ -705,7 +701,7 @@ export function makeCouch(opts) {
     return res.data
   }
 
-  async function up(params, body, { client = defaultClient, signal } = {}) {
+  async function up(params, body, { client = defaultClient, signal = null } = {}) {
     const res = await client.request({
       path: '/_up',
       method: 'GET',
@@ -714,7 +710,8 @@ export function makeCouch(opts) {
     })
     return await res.body.json()
   }
-  async function upsert(pathname, diffFun, { client, signal } = {}) {
+
+  async function upsert(pathname, diffFun, { client = defaultClient, signal = null } = {}) {
     while (true) {
       let doc
       try {
@@ -949,7 +946,7 @@ class StreamOutput extends stream.Readable {
     }
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusText) {
+  onHeaders(statusCode, rawHeaders, resume, statusText, headers = parseHeaders(rawHeaders)) {
     if (this.#stats.headers === -1) {
       this.#stats.headers = performance.now() - this.#startTime - this.#stats.connect
     }
@@ -958,7 +955,7 @@ class StreamOutput extends stream.Readable {
       throw new Error('invalid status code: ' + statusCode)
     }
 
-    this.#headers = Array.isArray(rawHeaders) ? undiciUtil.parseHeaders(rawHeaders) : rawHeaders
+    this.#headers = headers
     this.#resume = resume
   }
 
@@ -1042,7 +1039,7 @@ class PromiseOutput {
     }
   }
 
-  onHeaders(statusCode, rawHeaders, resume, statusText) {
+  onHeaders(statusCode, rawHeaders, resume, statusText, headers = parseHeaders(rawHeaders)) {
     if (this.#stats.headers === -1) {
       this.#stats.headers = performance.now() - this.#startTime - this.#stats.connect
     }
@@ -1050,7 +1047,8 @@ class PromiseOutput {
     if (statusCode >= 300 || statusCode < 200) {
       throw new Error('invalid status code: ' + statusCode)
     }
-    this.#headers = Array.isArray(rawHeaders) ? undiciUtil.parseHeaders(rawHeaders) : rawHeaders
+
+    this.#headers = headers
   }
 
   onData(data) {
@@ -1093,19 +1091,24 @@ 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,
-    dispatcher = undici.getGlobalDispatcher(),
-    signal,
-    logger,
-    stream,
-  },
+    query = null,
+    headers = null,
+    dispatcher = defaultDispatcher,
+    signal = null,
+    logger = null,
+    stream = false,
+    blocking = Boolean(stream),
+  } = {},
 ) {
   signal?.throwIfAborted()
 
@@ -1115,12 +1118,12 @@ 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,
     },
@@ -1128,27 +1131,14 @@ export function request(
     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)
-  }
-
   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.6",
+  "version": "19.8.8",
   "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.1.3",
+    "@nxtedition/nxt-undici": "^3.3.1",
     "content-type": "^1.0.5",
     "date-fns": "^3.6.0",
     "fast-querystring": "^1.1.1",