@nxtedition/lib 14.1.8 → 14.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "14.1.8",
+  "version": "14.1.10",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [
@@ -82,6 +82,7 @@
     "nconf": "^0.12.0",
     "nested-error-stacks": "^2.1.1",
     "object-hash": "^3.0.0",
+    "omit-empty": "^1.0.0",
     "pino-std-serializers": "^6.2.2",
     "qs": "^6.11.1",
     "request-target": "^1.0.2",

package/rxjs/firstValueFrom.js

@@ -5,11 +5,16 @@ const { AbortError } = require('../errors')
 module.exports = function firstValueFrom(x$, config) {
   const hasConfig = config && typeof config === 'object'
   const signal = hasConfig ? config.signal : undefined
+  const timeout = hasConfig ? config.timeout : undefined
 
   if (signal) {
     x$ = signal.aborted ? rxjs.EMPTY : x$.pipe(rx.takeUntil(rxjs.fromEvent(signal, 'abort')))
     x$ = x$.pipe(rx.throwIfEmpty(() => new AbortError()))
   }
 
+  if (timeout) {
+    x$ = x$.pipe(rx.timeout(timeout))
+  }
+
   return x$.pipe(rx.first(hasConfig ? config.defaultValue : undefined)).toPromise()
 }

package/undici.js

@@ -4,14 +4,16 @@ const xuid = require('xuid')
 const { isReadableNodeStream } = require('./stream')
 const undici = require('undici')
 const stream = require('stream')
+const omitEmpty = require('omit-empty')
 
 module.exports.request = async function request(
   url,
   {
     logger,
     id = xuid(),
-    retry: { count: maxRetries = 8, status = [] } = {},
-    redirect: { count: maxRedirections = 3 } = {},
+    retry,
+    maxRedirections: _maxRedirections,
+    redirect,
     dispatcher,
     signal,
     headersTimeout,
@@ -23,15 +25,30 @@ module.exports.request = async function request(
     headers,
   }
 ) {
+  if (retry === false) {
+    retry = { count: 0 }
+  } else if (typeof retry === 'number') {
+    retry = { count: retry }
+  }
+
+  if (redirect === false) {
+    redirect = { count: 0 }
+  } else if (typeof redirect === 'number') {
+    redirect = { count: redirect }
+  }
+
+  const { count: maxRedirections = _maxRedirections ?? 3 } = redirect ?? {}
+  const { count: maxRetries = 8, status = [] } = retry ?? {}
+
   const ureq = {
     url,
     method,
     body,
-    headers: {
+    headers: omitEmpty({
       'request-id': id,
       'user-agent': userAgent,
       ...headers,
-    },
+    }),
   }
 
   const upstreamLogger = logger?.child({ ureq })

package/util/template/index.js

@@ -6,6 +6,7 @@ const getJavascriptCompiler = require('./javascript')
 const JSON5 = require('json5')
 const objectHash = require('object-hash')
 const weakCache = require('../../weakCache')
+const firstValueFrom = require('../../rxjs/firstValueFrom')
 
 module.exports = ({ ds, proxify }) => {
   const compiler = {
@@ -226,8 +227,8 @@ module.exports = ({ ds, proxify }) => {
     return hash ? compileTemplateCache(template, hash) : null
   }
 
-  async function resolveTemplate(template, args$) {
-    return rxjs.firstValueFrom(onResolveTemplate(template, args$))
+  async function resolveTemplate(template, args$, options) {
+    return firstValueFrom(onResolveTemplate(template, args$), options)
   }
 
   function onResolveTemplate(template, args$) {