@nxtedition/lib 20.2.2 → 20.3.0

package/couch.js

@@ -1136,53 +1136,35 @@ const defaultDispatcher = new Agent({
   connections: 8,
 })
 
-export function request(
-  url,
-  {
-    body = null,
-    method = body ? 'POST' : 'GET',
-    query = null,
-    headers = null,
-    dispatcher = defaultDispatcher,
-    signal = null,
-    logger = null,
-    stream = false,
-    blocking = Boolean(stream),
-    headerTimeout,
-    bodyTimeout,
-  } = {},
-) {
-  signal?.throwIfAborted()
-
+export function request(url, { dispatcher = defaultDispatcher, signal, ...opts } = {}) {
   url = new URL(url)
   if (url.search) {
     throw new Error('invalid url: ' + url.href)
   }
 
-  const opts = {
+  const ureq = {
+    ...opts,
     url,
-    method,
-    query,
-    blocking,
+    method: opts.method ?? (opts.body ? 'POST' : 'GET'),
+    blocking: opts.blocking ?? Boolean(stream),
     headers: {
-      'content-type': body != null && typeof body === 'object' ? 'application/json' : 'plain/text',
+      'content-type':
+        opts.body != null && typeof opts.body === 'object' ? 'application/json' : 'plain/text',
       accept: 'application/json',
-      ...headers,
+      ...opts.headers,
     },
-    logger,
-    body: body != null && typeof body === 'object' ? JSON.stringify(body) : body,
-    headerTimeout,
-    bodyTimeout,
+    body:
+      opts.body != null && typeof opts.body === 'object' ? JSON.stringify(opts.body) : opts.body,
   }
 
   if (stream) {
     const handler = new StreamOutput({ signal, ...stream })
-    dispatch(dispatcher, opts, handler)
+    dispatch(dispatcher, ureq, handler)
     return handler
   } else {
     return new Promise((resolve, reject) => {
       const handler = new PromiseOutput({ resolve, reject, signal })
-      dispatch(dispatcher, opts, handler)
+      dispatch(dispatcher, ureq, handler)
     })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "20.2.2",
+  "version": "20.3.0",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/serializers.js

@@ -181,6 +181,10 @@ function errSerializer(err) {
     _err.data = JSON.stringify(_err.data, undefined, 2)
   }
 
+  if (_err.body != null && typeof _err.body !== 'string') {
+    _err.body = JSON.stringify(_err.body, undefined, 2)
+  }
+
   if (_err.code != null && typeof _err.code !== 'string') {
     _err.code = String(_err.code)
   }