nock 13.2.0 → 13.2.4

package/lib/back.js

@@ -263,6 +263,7 @@ function removeFixture(fixture, options) {
   }
 
   if (fixture && fixtureExists(fixture)) {
+    /* istanbul ignore next - fs.unlinkSync is for node 10 support */
     fs.rmSync ? fs.rmSync(fixture) : fs.unlinkSync(fixture)
   }
   context.isLoaded = false

package/lib/common.js

@@ -194,7 +194,7 @@ function isJSONContent(headers) {
  *
  * Duplicates throw an error.
  */
-function headersFieldNamesToLowerCase(headers) {
+function headersFieldNamesToLowerCase(headers, throwOnDuplicate) {
   if (!isPlainObject(headers)) {
     throw Error('Headers must be provided as an object')
   }
@@ -203,9 +203,15 @@ function headersFieldNamesToLowerCase(headers) {
   Object.entries(headers).forEach(([fieldName, fieldValue]) => {
     const key = fieldName.toLowerCase()
     if (lowerCaseHeaders[key] !== undefined) {
-      throw Error(
-        `Failed to convert header keys to lower case due to field name conflict: ${key}`
-      )
+      if (throwOnDuplicate) {
+        throw Error(
+          `Failed to convert header keys to lower case due to field name conflict: ${key}`
+        )
+      } else {
+        debug(
+          `Duplicate header provided in request: ${key}. Only the last value can be matched.`
+        )
+      }
     }
     lowerCaseHeaders[key] = fieldValue
   })
@@ -547,7 +553,7 @@ function urlToOptions(url) {
  * Used for comparing decoded search parameters, request body JSON objects,
  * and URL decoded request form bodies.
  *
- * Performs a general recursive strict comparision with two caveats:
+ * Performs a general recursive strict comparison with two caveats:
  *  - The expected data can use regexp to compare values
  *  - JSON path notation and nested objects are considered equal
  */

package/lib/intercepted_request_router.js

@@ -40,7 +40,10 @@ class InterceptedRequestRouter {
       // affecting the user so we use a clone of the object.
       ...options,
       // We use lower-case header field names throughout Nock.
-      headers: common.headersFieldNamesToLowerCase(options.headers || {}),
+      headers: common.headersFieldNamesToLowerCase(
+        options.headers || {},
+        false
+      ),
     }
     this.interceptors = interceptors
 
@@ -48,8 +51,14 @@ class InterceptedRequestRouter {
 
     // support setting `timeout` using request `options`
     // https://nodejs.org/docs/latest-v12.x/api/http.html#http_http_request_url_options_callback
-    if (options.timeout) {
-      this.socket.setTimeout(options.timeout)
+    // any timeout in the request options override any timeout in the agent options.
+    // per https://github.com/nodejs/node/pull/21204
+    const timeout =
+      options.timeout ||
+      (options.agent && options.agent.options && options.agent.options.timeout)
+
+    if (timeout) {
+      this.socket.setTimeout(timeout)
     }
 
     this.response = new IncomingMessage(this.socket)

package/lib/interceptor.js

@@ -66,7 +66,8 @@ module.exports = class Interceptor {
 
     //  We use lower-case header field names throughout Nock.
     this.reqheaders = common.headersFieldNamesToLowerCase(
-      scope.scopeOptions.reqheaders || {}
+      scope.scopeOptions.reqheaders || {},
+      true
     )
     this.badheaders = common.headersFieldsArrayToLowerCase(
       scope.scopeOptions.badheaders || []
@@ -155,7 +156,7 @@ module.exports = class Interceptor {
     )
 
     //  If the content is not encoded we may need to transform the response body.
-    //  Otherwise we leave it as it is.
+    //  Otherwise, we leave it as it is.
     if (
       body &&
       typeof body !== 'string' &&
@@ -173,10 +174,14 @@ module.exports = class Interceptor {
         // https://tools.ietf.org/html/rfc7231#section-3.1.1.5
         this.rawHeaders.push('Content-Type', 'application/json')
       }
+    }
 
-      if (this.scope.contentLen) {
-        // https://tools.ietf.org/html/rfc7230#section-3.3.2
+    if (this.scope.contentLen) {
+      // https://tools.ietf.org/html/rfc7230#section-3.3.2
+      if (typeof body === 'string') {
         this.rawHeaders.push('Content-Length', body.length)
+      } else if (Buffer.isBuffer(body)) {
+        this.rawHeaders.push('Content-Length', body.byteLength)
       }
     }
 
@@ -412,6 +417,12 @@ module.exports = class Interceptor {
   }
 
   matchHostName(options) {
+    const { basePath } = this.scope
+
+    if (basePath instanceof RegExp) {
+      return basePath.test(options.hostname)
+    }
+
     return options.hostname === this.scope.urlParts.hostname
   }
 

package/lib/playback_interceptor.js

@@ -79,7 +79,7 @@ class ReadableBuffers extends stream.Readable {
     this.buffers = buffers
   }
 
-  _read(size) {
+  _read(_size) {
     while (this.buffers.length) {
       if (!this.push(this.buffers.shift())) {
         return
@@ -315,7 +315,7 @@ function playbackInterceptor({
 
   // Calling `start` immediately could take the request all the way to the connection delay
   // during a single microtask execution. This setImmediate stalls the playback to ensure the
-  // correct events are emitted first ('socket', 'finish') and any aborts in the in the queue or
+  // correct events are emitted first ('socket', 'finish') and any aborts in the queue or
   // called during a 'finish' listener can be called.
   common.setImmediate(() => {
     if (!common.isRequestDestroyed(req)) {

package/lib/recorder.js

@@ -168,7 +168,7 @@ let currentRecordingId = 0
 const defaultRecordOptions = {
   dont_print: false,
   enable_reqheaders_recording: false,
-  logging: console.log,
+  logging: console.log, // eslint-disable-line no-console
   output_objects: false,
   use_separator: true,
 }

package/package.json

@@ -7,14 +7,14 @@
     "testing",
     "isolation"
   ],
-  "version": "13.2.0",
+  "version": "13.2.4",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
     "url": "https://github.com/nock/nock.git"
   },
   "bugs": {
-    "url": "http://github.com/nock/nock/issues"
+    "url": "https://github.com/nock/nock/issues"
   },
   "engines": {
     "node": ">= 10.13"
@@ -28,29 +28,28 @@
     "propagate": "^2.0.0"
   },
   "devDependencies": {
-    "@sinonjs/fake-timers": "^8.1.0",
+    "@definitelytyped/dtslint": "^0.0.103",
+    "@sinonjs/fake-timers": "^9.0.0",
     "assert-rejects": "^1.0.0",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
-    "dtslint": "^4.0.4",
-    "eslint": "^7.3.1",
+    "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.1.0",
-    "eslint-config-standard": "^16.0.2",
+    "eslint-config-standard": "^17.0.0-0",
     "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-mocha": "^9.0.0",
+    "eslint-plugin-mocha": "^10.0.3",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-promise": "^4.1.1",
-    "eslint-plugin-standard": "^5.0.0",
+    "eslint-plugin-promise": "^6.0.0",
     "form-data": "^4.0.0",
     "got": "^11.3.0",
-    "mocha": "^8.0.1",
+    "mocha": "^9.1.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
-    "prettier": "2.4.1",
+    "prettier": "2.5.1",
     "proxyquire": "^2.1.0",
     "rimraf": "^3.0.0",
-    "semantic-release": "^17.0.2",
-    "sinon": "^12.0.1",
+    "semantic-release": "^18.0.1",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "typescript": "^4.2.2"
   },

package/types/index.d.ts

@@ -240,7 +240,7 @@ declare namespace nock {
     options?: Options
   }
 
-  type BackMode = 'wild' | 'dryrun' | 'record' | 'lockdown'
+  type BackMode = 'wild' | 'dryrun' | 'record' | 'update' | 'lockdown'
 
   interface Back {
     currentMode: BackMode

package/CHANGELOG.md

@@ -1,6 +0,0 @@
-# Changelog
-
-Nock’s changelog can be found directly in the [GitHub release notes](https://github.com/nock/nock/releases).  
-These are automatically created by [semantic-release](https://github.com/semantic-release/semantic-release) based on their [commit message conventions](https://semantic-release.gitbook.io/semantic-release#commit-message-format).
-
-Migration guides are available for major versions in the [migration guides directory](https://github.com/nock/nock/tree/main/migration_guides).