@nxtedition/lib 15.0.29 → 15.0.30

package/lib/undici/index.js

@@ -121,6 +121,18 @@ async function request(urlOrOpts, opts = {}) {
     logger: opts.logger,
   }
 
+  const expectsPayload = opts.method === 'PUT' || opts.method === 'POST' || opts.method === 'PATCH'
+
+  if (opts.headers['content-length'] === '0' && !expectsPayload) {
+    // https://tools.ietf.org/html/rfc7230#section-3.3.2
+    // A user agent SHOULD NOT send a Content-Length header field when
+    // the request message does not contain a payload body and the method
+    // semantics do not anticipate such a body.
+
+    // undici will error if provided an unexpected content-length: 0 header.
+    delete opts.headers['content-length']
+  }
+
   const dispatcher = opts.dispatcher ?? undici.getGlobalDispatcher()
 
   return new Promise((resolve) => {

package/lib/undici/interceptor/log.js

@@ -1,5 +1,6 @@
 const { parseHeaders } = require('../../../http.js')
 const xuid = require('xuid')
+const { performance } = require('perf_hooks')
 
 class Handler {
   constructor(opts, { handler }) {
@@ -9,10 +10,12 @@ class Handler {
     this.aborted = false
     this.logger = opts.logger.child({ ureq: { id: opts.id } })
     this.pos = 0
+    this.startTime = 0
   }
 
   onConnect(abort) {
     this.abort = abort
+    this.startTime = performance.now()
     this.logger.debug({ ureq: this.opts }, 'upstream request started')
     this.handler.onConnect?.((reason) => {
       this.aborted = true
@@ -26,7 +29,10 @@ class Handler {
 
   onHeaders(statusCode, rawHeaders, resume, statusMessage) {
     this.logger.debug(
-      { ures: { statusCode, headers: parseHeaders(rawHeaders) } },
+      {
+        ures: { statusCode, headers: parseHeaders(rawHeaders) },
+        elapsedTime: this.startTime - performance.now(),
+      },
       'upstream request response',
     )
     return this.handler.onHeaders?.(statusCode, rawHeaders, resume, statusMessage)
@@ -38,15 +44,24 @@ class Handler {
   }
 
   onComplete(rawTrailers) {
-    this.logger.debug({ bytesRead: this.pos }, 'upstream request completed')
+    this.logger.debug(
+      { bytesRead: this.pos, elapsedTime: this.startTime - performance.now() },
+      'upstream request completed',
+    )
     return this.handler.onComplete?.(rawTrailers)
   }
 
   onError(err) {
     if (this.aborted) {
-      this.logger.debug({ bytesRead: this.pos, err }, 'upstream request aborted')
+      this.logger.debug(
+        { bytesRead: this.pos, elapsedTime: this.startTime - performance.now(), err },
+        'upstream request aborted',
+      )
     } else {
-      this.logger.error({ bytesRead: this.pos, err }, 'upstream request failed')
+      this.logger.error(
+        { bytesRead: this.pos, elapsedTime: this.startTime - performance.now(), err },
+        'upstream request failed',
+      )
     }
     return this.handler.onError?.(err)
   }

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

@@ -136,6 +136,7 @@ class Handler {
       ...this.opts,
       headers: {
         ...this.opts.headers,
+        'if-match': this.etag,
         range: `bytes=${this.pos}-${this.end ?? ''}`,
       },
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "15.0.29",
+  "version": "15.0.30",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "files": [
@@ -9,7 +9,7 @@
     "rxjs/*",
     "util/*",
     "lib/*",
-    "undici/*",
+    "undici.js",
     "http-client.js",
     "subtract-ranges.js",
     "serializers.js",

package/undici.js

@@ -0,0 +1 @@
+module.exports = require('./lib/undici/index.js')