@nxtedition/lib 15.0.5 → 15.0.7

package/package.json

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

package/undici/interceptor/abort.js

@@ -9,18 +9,18 @@ class Handler {
 
   onConnect(abort) {
     this.abort = abort
-    this.handler.onConnect((reason) => {
+    this.handler.onConnect?.((reason) => {
       this.reason = reason ?? new AbortError()
     })
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     if (this.reason == null) {
-      const ret = this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+      const ret = this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
       if (this.reason == null) {
         return ret
       }
@@ -31,7 +31,7 @@ class Handler {
 
   onData(chunk) {
     if (this.reason == null) {
-      const ret = this.handler.onData(chunk)
+      const ret = this.handler.onData?.(chunk)
       if (this.reason == null) {
         return ret
       }
@@ -49,12 +49,12 @@ class Handler {
 
   onComplete(rawTrailers) {
     return this.reason == null
-      ? this.handler.onComplete(rawTrailers)
-      : this.handler.onError(this.reason)
+      ? this.handler.onComplete?.(rawTrailers)
+      : this.handler.onError?.(this.reason)
   }
 
   onError(err) {
-    return this.handler.onError(err)
+    return this.handler.onError?.(err)
   }
 }
 

package/undici/interceptor/catch.js

@@ -6,7 +6,7 @@ class Handler {
   onConnect(abort) {
     this.abort = abort
     try {
-      return this.handler.onConnect(abort)
+      return this.handler.onConnect?.(abort)
     } catch (err) {
       this.abort(err)
     }
@@ -14,7 +14,7 @@ class Handler {
 
   onBodySent(chunk) {
     try {
-      return this.handler.onBodySent(chunk)
+      return this.handler.onBodySent?.(chunk)
     } catch (err) {
       this.abort(err)
     }
@@ -22,7 +22,7 @@ class Handler {
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     try {
-      return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+      return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
     } catch (err) {
       this.abort(err)
       return false
@@ -31,7 +31,7 @@ class Handler {
 
   onData(chunk) {
     try {
-      return this.handler.onData(chunk)
+      return this.handler.onData?.(chunk)
     } catch (err) {
       this.abort(err)
       return false
@@ -40,7 +40,7 @@ class Handler {
 
   onComplete(rawTrailers) {
     try {
-      return this.handler.onComplete(rawTrailers)
+      return this.handler.onComplete?.(rawTrailers)
     } catch (err) {
       this.abort(err)
       return false
@@ -48,7 +48,7 @@ class Handler {
   }
 
   onError(err) {
-    return this.handler.onError(err)
+    return this.handler.onError?.(err)
   }
 }
 

package/undici/interceptor/content.js

@@ -15,11 +15,11 @@ class Handler {
   }
 
   onConnect(abort) {
-    return this.handler.onConnect(abort)
+    return this.handler.onConnect?.(abort)
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
@@ -28,19 +28,19 @@ class Handler {
 
     this.hasher = this.md5 != null ? crypto.createHash('md5') : null
 
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+    return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
   }
 
   onData(chunk) {
     this.pos += chunk.length
     this.hasher?.update(chunk)
-    return this.handler.onData(chunk)
+    return this.handler.onData?.(chunk)
   }
 
   onComplete(rawTrailers) {
     const hash = this.hasher?.digest('base64')
     if (this.md5 != null && hash !== this.md5) {
-      this.handler.onError(
+      this.handler.onError?.(
         Object.assign(new Error('Request Content-Length mismatch'), {
           expected: this.md5,
           actual: hash,
@@ -48,18 +48,18 @@ class Handler {
       )
     }
     if (this.length != null && this.pos !== Number(this.length)) {
-      return this.handler.onError(
+      return this.handler.onError?.(
         Object.assign(new Error('Request Content-Length mismatch'), {
           expected: Number(this.length),
           actual: this.pos,
         }),
       )
     }
-    return this.handler.onComplete(rawTrailers)
+    return this.handler.onComplete?.(rawTrailers)
   }
 
   onError(err) {
-    this.handler.onError(err)
+    this.handler.onError?.(err)
   }
 }
 

package/undici/interceptor/log.js

@@ -4,25 +4,24 @@ const xuid = require('xuid')
 class Handler {
   constructor(opts, { handler }) {
     this.handler = handler
-    this.opts = opts
+    this.opts = opts.id ? opts : { ...opts, id: xuid() }
     this.abort = null
     this.aborted = false
-
-    this.logger = opts.logger.child({ ureq: { id: xuid() } })
+    this.logger = opts.logger.child({ ureq: { id: opts.id } })
     this.pos = 0
   }
 
   onConnect(abort) {
     this.abort = abort
     this.logger.debug({ ureq: this.opts }, 'upstream request started')
-    this.handler.onConnect((reason) => {
+    this.handler.onConnect?.((reason) => {
       this.aborted = true
       this.abort(reason)
     })
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
@@ -30,17 +29,17 @@ class Handler {
       { ures: { statusCode, headers: parseHeaders(rawHeaders) } },
       'upstream request response',
     )
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+    return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
   }
 
   onData(chunk) {
     this.pos += chunk.length
-    return this.handler.onData(chunk)
+    return this.handler.onData?.(chunk)
   }
 
   onComplete(rawTrailers) {
     this.logger.debug({ bytesRead: this.pos }, 'upstream request completed')
-    return this.handler.onComplete(rawTrailers)
+    return this.handler.onComplete?.(rawTrailers)
   }
 
   onError(err) {
@@ -49,7 +48,7 @@ class Handler {
     } else {
       this.logger.error({ bytesRead: this.pos, err }, 'upstream request failed')
     }
-    return this.handler.onError(err)
+    return this.handler.onError?.(err)
   }
 }
 

package/undici/interceptor/proxy.js

@@ -26,18 +26,18 @@ class Handler {
 
   onConnect(abort) {
     this.abort = abort
-    this.handler.onConnect((reason) => {
+    this.handler.onConnect?.((reason) => {
       this.aborted = true
       this.abort(reason)
     })
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    return this.handler.onHeaders(
+    return this.handler.onHeaders?.(
       statusCode,
       reduceHeaders(
         {
@@ -58,15 +58,15 @@ class Handler {
   }
 
   onData(chunk) {
-    return this.handler.onData(chunk)
+    return this.handler.onData?.(chunk)
   }
 
   onComplete(rawTrailers) {
-    return this.handler.onComplete(rawTrailers)
+    return this.handler.onComplete?.(rawTrailers)
   }
 
   onError(err) {
-    return this.handler.onError(err)
+    return this.handler.onError?.(err)
   }
 }
 

package/undici/interceptor/redirect.js

@@ -16,7 +16,7 @@ class Handler {
     this.count = 0
     this.location = null
 
-    this.handler.onConnect((reason) => {
+    this.handler.onConnect?.((reason) => {
       this.aborted = true
       if (this.abort) {
         this.abort(reason)
@@ -39,12 +39,12 @@ class Handler {
   }
 
   onError(error) {
-    this.handler.onError(error)
+    this.handler.onError?.(error)
   }
 
   onHeaders(statusCode, headers, resume, statusText) {
     if (redirectableStatusCodes.indexOf(statusCode) === -1) {
-      return this.handler.onHeaders(statusCode, headers, resume, statusText)
+      return this.handler.onHeaders?.(statusCode, headers, resume, statusText)
     }
 
     if (isDisturbed(this.opts.body)) {
@@ -110,7 +110,7 @@ class Handler {
         servers and browsers implementors, we ignore the body as there is no specified way to eventually parse it.
       */
     } else {
-      return this.handler.onData(chunk)
+      return this.handler.onData?.(chunk)
     }
   }
 
@@ -129,13 +129,13 @@ class Handler {
 
       this.dispatch(this.opts, this)
     } else {
-      this.handler.onComplete(trailers)
+      this.handler.onComplete?.(trailers)
     }
   }
 
   onBodySent(chunk) {
     if (this.handler.onBodySent) {
-      this.handler.onBodySent(chunk)
+      this.handler.onBodySent?.(chunk)
     }
   }
 }

package/undici/interceptor/response-body-dump.js

@@ -8,15 +8,15 @@ class Handler {
 
   onConnect(abort) {
     this.abort = abort
-    return this.handler.onConnect(abort)
+    return this.handler.onConnect?.(abort)
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+    return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
   }
 
   onData(chunk) {
@@ -25,7 +25,7 @@ class Handler {
       return true
     }
 
-    this.handler.onComplete([])
+    this.handler.onComplete?.([])
     this.handler = null
 
     this.abort(new AbortError('dump'))
@@ -34,11 +34,11 @@ class Handler {
   }
 
   onComplete(rawTrailers) {
-    return this.handler.onComplete([])
+    return this.handler.onComplete?.([])
   }
 
   onError(err) {
-    return this.handler?.onError(err)
+    return this.handler?.onError?.(err)
   }
 }
 

package/undici/interceptor/response-body-retry.js

@@ -21,7 +21,7 @@ class Handler {
     this.error = null
     this.etag = null
 
-    this.handler.onConnect((reason) => {
+    this.handler.onConnect?.((reason) => {
       this.aborted = true
       if (this.abort) {
         this.abort(reason)
@@ -40,7 +40,7 @@ class Handler {
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
@@ -77,7 +77,12 @@ class Handler {
       if (statusCode === 206) {
         const contentRange = parseContentRange(findHeader(rawHeaders, 'content-range'))
         if (!contentRange) {
-          return this.handler.onHeaders(statusCode, rawHeaders, () => this.resume(), statusMessage)
+          return this.handler.onHeaders?.(
+            statusCode,
+            rawHeaders,
+            () => this.resume(),
+            statusMessage,
+          )
         }
 
         const { start, size, end = size } = contentRange
@@ -97,17 +102,17 @@ class Handler {
 
     this.etag = etag
     this.resume = resume
-    return this.handler.onHeaders(statusCode, rawHeaders, () => this.resume(), statusMessage)
+    return this.handler.onHeaders?.(statusCode, rawHeaders, () => this.resume(), statusMessage)
   }
 
   onData(chunk) {
     this.pos += chunk.length
     this.count = 0
-    return this.handler.onData(chunk)
+    return this.handler.onData?.(chunk)
   }
 
   onComplete(rawTrailers) {
-    return this.handler.onComplete(rawTrailers)
+    return this.handler.onComplete?.(rawTrailers)
   }
 
   onError(err) {
@@ -117,12 +122,12 @@ class Handler {
     }
 
     if (!this.resume || this.aborted || !this.etag || isDisturbed(this.opts.body)) {
-      return this.handler.onError(err)
+      return this.handler.onError?.(err)
     }
 
     const retryAfter = retryAfterFn(err, this.count++, this.opts)
     if (retryAfter == null) {
-      return this.handler.onError(err)
+      return this.handler.onError?.(err)
     }
     assert(Number.isFinite(retryAfter), 'invalid retry')
 
@@ -142,7 +147,7 @@ class Handler {
       try {
         this.dispatch(this.opts, this)
       } catch (err) {
-        this.handler.onError(err)
+        this.handler.onError?.(err)
       }
     }, retryAfter)
   }

package/undici/interceptor/response-retry.js

@@ -13,7 +13,7 @@ class Handler {
     this.count = 0
     this.retryAfter = null
 
-    this.handler.onConnect((reason) => {
+    this.handler.onConnect?.((reason) => {
       this.aborted = true
       if (this.abort) {
         this.abort(reason)
@@ -32,20 +32,20 @@ class Handler {
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     this.aborted = true
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+    return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
   }
 
   onData(chunk) {
-    return this.handler.onData(chunk)
+    return this.handler.onData?.(chunk)
   }
 
   onComplete(rawTrailers) {
-    return this.handler.onComplete(rawTrailers)
+    return this.handler.onComplete?.(rawTrailers)
   }
 
   onError(err) {
@@ -55,12 +55,12 @@ class Handler {
     }
 
     if (this.aborted || isDisturbed(this.opts.body)) {
-      return this.handler.onError(err)
+      return this.handler.onError?.(err)
     }
 
     const retryAfter = retryAfterFn(err, this.count++, this.opts)
     if (retryAfter == null) {
-      return this.handler.onError(err)
+      return this.handler.onError?.(err)
     }
     assert(Number.isFinite(retryAfter), 'invalid retryAfter')
 
@@ -71,7 +71,7 @@ class Handler {
       try {
         this.dispatch(this.opts, this)
       } catch (err2) {
-        this.handler.onError(err)
+        this.handler.onError?.(err)
       }
     }, retryAfter)
     this.retryAfter = null

package/undici/interceptor/response-status-retry.js

@@ -16,7 +16,7 @@ class Handler {
     this.count = 0
     this.retryAfter = null
 
-    this.handler.onConnect((reason) => {
+    this.handler.onConnect?.((reason) => {
       this.aborted = true
       if (this.abort) {
         this.abort(reason)
@@ -35,19 +35,19 @@ class Handler {
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     if (statusCode < 400) {
-      return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+      return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
     }
 
     const err = createError(statusCode, { headers: parseHeaders(rawHeaders) })
 
     const retryAfter = retryAfterFn(err, this.count++, this.opts)
     if (retryAfter == null) {
-      return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+      return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
     }
     assert(Number.isFinite(retryAfter), 'invalid retryAfter')
 
@@ -59,11 +59,11 @@ class Handler {
   }
 
   onData(chunk) {
-    return this.handler.onData(chunk)
+    return this.handler.onData?.(chunk)
   }
 
   onComplete(rawTrailers) {
-    return this.handler.onComplete(rawTrailers)
+    return this.handler.onComplete?.(rawTrailers)
   }
 
   onError(err) {
@@ -73,7 +73,7 @@ class Handler {
     }
 
     if (this.retryAfter == null || this.aborted || isDisturbed(this.opts.body)) {
-      return this.handler.onError(err)
+      return this.handler.onError?.(err)
     }
 
     this.opts.logger?.debug('retrying response status', { retryAfter: this.retryAfter })
@@ -83,7 +83,7 @@ class Handler {
       try {
         this.dispatch(this.opts, this)
       } catch (err) {
-        this.handler.onError(err)
+        this.handler.onError?.(err)
       }
     }, this.retryAfter)
     this.retryAfter = null

package/undici/interceptor/signal.js

@@ -14,30 +14,30 @@ class Handler {
     if (this.signal.aborted) {
       abort(this.signal.reason)
     } else {
-      this.handler.onConnect(abort)
+      this.handler.onConnect?.(abort)
     }
   }
 
   onBodySent(chunk) {
-    return this.handler.onBodySent(chunk)
+    return this.handler.onBodySent?.(chunk)
   }
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
-    return this.handler.onHeaders(statusCode, rawHeaders, resume, statusMessage)
+    return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
   }
 
   onData(chunk) {
-    return this.handler.onData(chunk)
+    return this.handler.onData?.(chunk)
   }
 
   onComplete(rawTrailers) {
     this.signal.removeEventListener('abort', this.abort)
-    return this.handler.onComplete(rawTrailers)
+    return this.handler.onComplete?.(rawTrailers)
   }
 
   onError(err) {
     this.signal.removeEventListener('abort', this.abort)
-    return this.handler.onError(err)
+    return this.handler.onError?.(err)
   }
 }