@nxtedition/lib 14.1.9 → 14.1.11

package/http.js

@@ -101,7 +101,7 @@ module.exports.request = async function request(ctx, next) {
       reqLogger.warn({ err }, 'request error')
     })
 
-    if (!res.headersSent && !res.destroyed) {
+    if (!req.aborted && !res.headersSent && !res.destroyed && !res.complete) {
       res.statusCode = err.statusCode || 500
 
       let reqId = req?.id || err.id
@@ -282,7 +282,7 @@ module.exports.upgrade = async function upgrade(ctx, next) {
     }
 
     req.on('error', (err) => {
-      reqLogger.warn({ err }, 'request error')
+      reqLogger.warn({ err }, 'stream error')
     })
     socket.on('error', (err) => {
       reqLogger.warn({ err }, 'stream error')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "14.1.9",
+  "version": "14.1.11",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [

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/serializers.js

@@ -43,6 +43,7 @@ module.exports = {
       statusCode: res.statusCode || res.status,
       bytesWritten: res.bytesWritten,
       headers: getHeaders(res),
+      headersSent: res.headersSent,
     },
   socket: (socket) =>
     socket && {

package/undici.js

@@ -11,8 +11,9 @@ module.exports.request = async function request(
   {
     logger,
     id = xuid(),
-    retry: { count: maxRetries = 8, status = [] } = {},
-    redirect: { count: maxRedirections = 3 } = {},
+    retry,
+    maxRedirections: _maxRedirections,
+    redirect,
     dispatcher,
     signal,
     headersTimeout,
@@ -24,6 +25,21 @@ 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,

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$) {