Merge branch 'main' into Michael/support-fetch-content-encoding

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mswjs/interceptors",
   "description": "Low-level HTTP/HTTPS/XHR/fetch request interception library.",
-  "version": "0.35.0",
+  "version": "0.36.4",
   "main": "./lib/node/index.js",
   "module": "./lib/node/index.mjs",
   "types": "./lib/node/index.d.ts",

src/interceptors/ClientRequest/agents.ts

@@ -39,7 +39,11 @@ export class MockAgent extends http.Agent {
 
     const socket = new MockHttpSocket({
       connectionOptions: options,
-      createConnection: createConnection.bind(this, options, callback),
+      createConnection: createConnection.bind(
+        this.customAgent || this,
+        options,
+        callback
+      ),
       onRequest: this.onRequest.bind(this),
       onResponse: this.onResponse.bind(this),
     })
@@ -68,7 +72,11 @@ export class MockHttpsAgent extends https.Agent {
 
     const socket = new MockHttpSocket({
       connectionOptions: options,
-      createConnection: createConnection.bind(this, options, callback),
+      createConnection: createConnection.bind(
+        this.customAgent || this,
+        options,
+        callback
+      ),
       onRequest: this.onRequest.bind(this),
       onResponse: this.onResponse.bind(this),
     })

src/interceptors/ClientRequest/utils/recordRawHeaders.test.ts

@@ -118,6 +118,31 @@ it('records raw headers (Request / Headers as init)', () => {
   expect(getRawFetchHeaders(request.headers)).toEqual([['X-My-Header', '1']])
 })
 
+it('records raw headers (Reqest / Request as init)', () => {
+  recordRawFetchHeaders()
+  const init = new Request(url, { headers: [['X-My-Header', '1']] })
+  const request = new Request(init)
+
+  expect(getRawFetchHeaders(request.headers)).toEqual([['X-My-Header', '1']])
+})
+
+it('records raw headers (Request / Request+Headers as init)', () => {
+  recordRawFetchHeaders()
+  const init = new Request(url, { headers: [['X-My-Header', '1']] })
+  expect(getRawFetchHeaders(init.headers)).toEqual([['X-My-Header', '1']])
+
+  const request = new Request(init, {
+    headers: new Headers([['X-Another-Header', '2']]),
+  })
+
+  // Must merge the raw headers from the request init
+  // and the request instance itself.
+  expect(getRawFetchHeaders(request.headers)).toEqual([
+    ['X-My-Header', '1'],
+    ['X-Another-Header', '2'],
+  ])
+})
+
 it('records raw headers (Response / object as init)', () => {
   recordRawFetchHeaders()
   const response = new Response(null, {
@@ -157,3 +182,40 @@ it('stops recording once the patches are restored', () => {
   // Must return the normalized headers (no access to raw headers).
   expect(getRawFetchHeaders(headers)).toEqual([['x-my-header', '1']])
 })
+
+it('overrides an existing header when calling ".set()"', () => {
+  recordRawFetchHeaders()
+  const headers = new Headers([['a', '1']])
+  expect(headers.get('a')).toBe('1')
+
+  headers.set('a', '2')
+  expect(headers.get('a')).toBe('2')
+
+  const headersClone = new Headers(headers)
+  expect(headersClone.get('a')).toBe('2')
+})
+
+it('overrides an existing multi-value header when calling ".set()"', () => {
+  recordRawFetchHeaders()
+  const headers = new Headers([
+    ['a', '1'],
+    ['a', '2'],
+  ])
+  expect(headers.get('a')).toBe('1, 2')
+
+  headers.set('a', '3')
+  expect(headers.get('a')).toBe('3')
+})
+
+it('does not throw on using Headers before recording', () => {
+  // If the consumer constructs a Headers instance before
+  // the interceptor is enabled, it will have no internal symbol set.
+  const headers = new Headers()
+  recordRawFetchHeaders()
+  const request = new Request(url, { headers })
+
+  expect(getRawFetchHeaders(request.headers)).toEqual([])
+
+  request.headers.set('X-My-Header', '1')
+  expect(getRawFetchHeaders(request.headers)).toEqual([['X-My-Header', '1']])
+})