nock 13.2.2 → 13.2.3

package/lib/intercepted_request_router.js

@@ -51,8 +51,12 @@ 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.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/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.3",
   "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,19 +28,18 @@
     "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": "^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",
     "mocha": "^9.1.3",
@@ -50,7 +49,7 @@
     "proxyquire": "^2.1.0",
     "rimraf": "^3.0.0",
     "semantic-release": "^18.0.1",
-    "sinon": "^12.0.1",
+    "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "typescript": "^4.2.2"
   },