@nxtedition/nxt-undici 2.0.17 → 2.0.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/interceptor/log.js +1 -1
  2. package/lib/interceptor/request-content.js +7 -7
  3. package/lib/interceptor/response-content.js +9 -11
  4. package/package.json +1 -1
package/lib/interceptor/log.js CHANGED
@@ -100,7 +100,7 @@ class Handler {
100
100
  )
101
101
  } else {
102
102
  this.logger.error(
103
- { bytesRead: this.pos, elapsedTime: this.stats.end, err },
103
+ { ureq: this.opts, bytesRead: this.pos, elapsedTime: this.stats.end, err },
104
104
  'upstream request failed',
105
105
  )
106
106
  }
package/lib/interceptor/request-content.js CHANGED
@@ -31,20 +31,20 @@ class Handler {
31
31
  onRequestSent() {
32
32
  const hash = this.hasher?.digest('base64')
33
33
 
34
- if (this.md5 != null && hash !== this.md5) {
34
+ if (this.length != null && this.pos !== Number(this.length)) {
35
35
  this.abort(
36
36
  Object.assign(new Error('Request Content-Length mismatch'), {
37
- expected: this.md5,
38
- actual: hash,
37
+ expected: Number(this.length),
38
+ actual: this.pos,
39
39
  }),
40
40
  )
41
41
  }
42
42
 
43
- if (this.length != null && this.pos !== Number(this.length)) {
43
+ if (this.md5 != null && hash !== this.md5) {
44
44
  this.abort(
45
- Object.assign(new Error('Request Content-Length mismatch'), {
46
- expected: Number(this.length),
47
- actual: this.pos,
45
+ Object.assign(new Error('Request Content-MD5 mismatch'), {
46
+ expected: this.md5,
47
+ actual: hash,
48
48
  }),
49
49
  )
50
50
  }
package/lib/interceptor/response-content.js CHANGED
@@ -44,15 +44,6 @@ class Handler {
44
44
  onComplete(rawTrailers) {
45
45
  const hash = this.hasher?.digest('base64')
46
46
 
47
- if (this.md5 != null && hash !== this.md5) {
48
- return this.handler.onError(
49
- Object.assign(new Error('Request Content-Length mismatch'), {
50
- expected: this.md5,
51
- actual: hash,
52
- }),
53
- )
54
- }
55
-
56
47
  if (this.length != null && this.pos !== Number(this.length)) {
57
48
  return this.handler.onError(
58
49
  Object.assign(new Error('Request Content-Length mismatch'), {
@@ -60,9 +51,16 @@ class Handler {
60
51
  actual: this.pos,
61
52
  }),
62
53
  )
54
+ } else if (this.md5 != null && hash !== this.md5) {
55
+ return this.handler.onError(
56
+ Object.assign(new Error('Request Content-MD5 mismatch'), {
57
+ expected: this.md5,
58
+ actual: hash,
59
+ }),
60
+ )
61
+ } else {
62
+ return this.handler.onComplete(rawTrailers)
63
63
  }
64
-
65
- return this.handler.onComplete(rawTrailers)
66
64
  }
67
65
 
68
66
  onError(err) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nxtedition/nxt-undici",
3
- "version": "2.0.17",
3
+ "version": "2.0.18",
4
4
  "license": "MIT",
5
5
  "author": "Robert Nagy <robert.nagy@boffins.se>",
6
6
  "main": "lib/index.js",