nock 14.0.12 → 14.0.14

package/lib/playback_interceptor.js

@@ -273,22 +273,27 @@ function playbackInterceptor({
   function continueWithResponseBody(rawBody) {
     prepareResponseHeaders(rawBody)
     const bodyAsStream = convertBodyToStream(rawBody)
-    bodyAsStream.pause()
+    // `replyWithFile` and similar reply callbacks hand back a paused stream,
+    // so force flowing mode here. `delayBody` gates only the end-of-response
+    // signal below; a slow body must present as a slow body — read timeouts
+    // on the response can fire — instead of as a slow connection.
+    bodyAsStream.resume()
 
     // IncomingMessage extends Readable so we can't simply pipe.
     bodyAsStream.on('data', function (chunk) {
       response.push(chunk)
     })
-    bodyAsStream.on('end', function () {
+    bodyAsStream.on('error', function (err) {
+      response.emit('error', err)
+    })
+
+    function emitEnd() {
       // https://nodejs.org/dist/latest-v10.x/docs/api/http.html#http_message_complete
       response.complete = true
       response.push(null)
 
       interceptor.scope.emit('replied', req, interceptor)
-    })
-    bodyAsStream.on('error', function (err) {
-      response.emit('error', err)
-    })
+    }
 
     const { delayBodyInMs, delayConnectionInMs } = interceptor
 
@@ -306,7 +311,17 @@ function playbackInterceptor({
       logger('emitting response')
       req.emit('response', response)
 
-      common.setTimeout(() => bodyAsStream.resume(), delayBodyInMs)
+      // Apply the body delay only after the response event has been emitted
+      // and the body source has finished, so `delay({ head, body })`
+      // compounds the two waits.
+      function scheduleEnd() {
+        common.setTimeout(emitEnd, delayBodyInMs)
+      }
+      if (bodyAsStream.readableEnded) {
+        scheduleEnd()
+      } else {
+        bodyAsStream.once('end', scheduleEnd)
+      }
     }
 
     socket.applyDelay(delayConnectionInMs)

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "14.0.12",
+  "version": "14.0.14",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",

package/types/index.d.ts

@@ -246,7 +246,12 @@ declare namespace nock {
     body?: RequestBodyMatcher
     reqheaders?: Record<string, RequestHeaderMatcher>
     response?: ReplyBody
-    headers?: ReplyHeaders
+    /**
+     * Response headers as recorded (object form). Values are strings; multi-value
+     * headers (e.g. set-cookie) may be string[] when definitions are loaded from
+     * fixtures or hand-written. This is what define() uses.
+     */
+    rawHeaders?: Record<string, string | string[]>
     options?: Options
   }