nock 13.2.2 → 13.2.5

package/lib/common.js

@@ -1,7 +1,8 @@
 'use strict'
 
 const debug = require('debug')('nock.common')
-const set = require('lodash.set')
+const isPlainObject = require('lodash/isPlainObject')
+const set = require('lodash/set')
 const timers = require('timers')
 const url = require('url')
 const util = require('util')
@@ -608,51 +609,6 @@ function deepEqual(expected, actual) {
   return expected === actual
 }
 
-/**
- * Checks if `value` is a plain object, that is, an object created by the
- * `Object` constructor or one with a `[[Prototype]]` of `null`.
- * https://github.com/lodash/lodash/blob/588bf3e20db0ae039a822a14a8fa238c5b298e65/isPlainObject.js
- *
- * @param {*} value The value to check.
- * @return {boolean}
- */
-function isPlainObject(value) {
-  const isObjectLike = typeof value === 'object' && value !== null
-  const tag = Object.prototype.toString.call(value)
-  if (!isObjectLike || tag !== '[object Object]') {
-    return false
-  }
-  if (Object.getPrototypeOf(value) === null) {
-    return true
-  }
-  let proto = value
-  while (Object.getPrototypeOf(proto) !== null) {
-    proto = Object.getPrototypeOf(proto)
-  }
-  return Object.getPrototypeOf(value) === proto
-}
-
-/**
- * Creates an object with the same keys as `object` and values generated
- * by running each own enumerable string keyed property of `object` thru
- * `iteratee`. (iteration order is not guaranteed)
- * The iteratee is invoked with three arguments: (value, key, object).
- * https://github.com/lodash/lodash/blob/588bf3e20db0ae039a822a14a8fa238c5b298e65/mapValue.js
- *
- * @param {Object} object The object to iterate over.
- * @param {Function} iteratee The function invoked per iteration.
- * @returns {Object} Returns the new mapped object.
- */
-function mapValue(object, iteratee) {
-  object = Object(object)
-  const result = {}
-
-  Object.keys(object).forEach(key => {
-    result[key] = iteratee(object[key], key, object)
-  })
-  return result
-}
-
 const timeouts = []
 const intervals = []
 const immediates = []
@@ -725,7 +681,6 @@ module.exports = {
   isRequestDestroyed,
   isStream,
   isUtf8Representable,
-  mapValue,
   matchStringOrRegexp,
   normalizeClientRequestArgs,
   normalizeOrigin,

package/lib/intercepted_request_router.js

@@ -51,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

@@ -156,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' &&
@@ -174,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)
       }
     }
 

package/lib/match_body.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const mapValues = require('lodash/mapValues')
 const querystring = require('querystring')
 
 const common = require('./common')
@@ -43,7 +44,7 @@ module.exports = function matchBody(options, spec, body) {
   }
 
   // strip line endings from both so that we get a match no matter what OS we are running on
-  // if Content-Type does not contains 'multipart'
+  // if Content-Type does not contain 'multipart'
   if (!isMultipart && typeof body === 'string') {
     body = body.replace(/\r?\n|\r/g, '')
   }
@@ -52,8 +53,8 @@ module.exports = function matchBody(options, spec, body) {
     spec = spec.replace(/\r?\n|\r/g, '')
   }
 
-  // Because the nature of URL encoding, all the values in the body have been cast to strings.
-  // dataEqual does strict checking so we we have to cast the non-regexp values in the spec too.
+  // Because the nature of URL encoding, all the values in the body must be cast to strings.
+  // dataEqual does strict checking, so we have to cast the non-regexp values in the spec too.
   if (isUrlencoded) {
     spec = mapValuesDeep(spec, val => (val instanceof RegExp ? val : `${val}`))
   }
@@ -70,7 +71,7 @@ function mapValuesDeep(obj, cb) {
     return obj.map(v => mapValuesDeep(v, cb))
   }
   if (common.isPlainObject(obj)) {
-    return common.mapValue(obj, v => mapValuesDeep(v, cb))
+    return mapValues(obj, v => mapValuesDeep(v, cb))
   }
   return cb(obj)
 }

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/package.json

@@ -7,14 +7,14 @@
     "testing",
     "isolation"
   ],
-  "version": "13.2.2",
+  "version": "13.2.5",
   "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"
@@ -24,33 +24,32 @@
   "dependencies": {
     "debug": "^4.1.0",
     "json-stringify-safe": "^5.0.1",
-    "lodash.set": "^4.3.2",
+    "lodash": "^4.17.21",
     "propagate": "^2.0.0"
   },
   "devDependencies": {
-    "@sinonjs/fake-timers": "^8.1.0",
+    "@definitelytyped/dtslint": "^0.0.112",
+    "@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": "^10.0.3",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-standard": "^5.0.0",
     "form-data": "^4.0.0",
-    "got": "^11.3.0",
+    "got": "^12.1.0",
     "mocha": "^9.1.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
-    "prettier": "2.5.1",
+    "prettier": "2.6.2",
     "proxyquire": "^2.1.0",
     "rimraf": "^3.0.0",
-    "semantic-release": "^18.0.1",
-    "sinon": "^12.0.1",
+    "semantic-release": "^19.0.2",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "typescript": "^4.2.2"
   },