nock 12.0.2 → 12.0.3

package/lib/intercepted_request_router.js

@@ -142,6 +142,7 @@ class InterceptedRequestRouter {
     debug('req.end')
     const { req } = this
 
+    // handle the different overloaded param signatures
     if (typeof chunk === 'function') {
       callback = chunk
       chunk = null
@@ -150,19 +151,19 @@ class InterceptedRequestRouter {
       encoding = null
     }
 
+    if (typeof callback === 'function') {
+      req.once('finish', callback)
+    }
+
     if (!req.aborted && !this.playbackStarted) {
-      req.write(chunk, encoding, () => {
-        if (typeof callback === 'function') {
-          callback()
-        }
-        this.startPlayback()
-        req.emit('finish')
-        req.emit('end')
-      })
+      req.write(chunk, encoding)
+      this.startPlayback()
     }
     if (req.aborted) {
       this.emitError(new Error('Request aborted'))
     }
+
+    return req
   }
 
   handleFlushHeaders() {
@@ -271,6 +272,11 @@ class InterceptedRequestRouter {
     if (matchedInterceptor) {
       debug('interceptor identified, starting mocking')
 
+      // wait to emit the finish event until we know for sure an Interceptor is going to playback.
+      // otherwise an unmocked request might emit finish twice.
+      req.finished = true
+      req.emit('finish')
+
       playbackInterceptor({
         req,
         socket,

package/lib/playback_interceptor.js

@@ -72,7 +72,7 @@ function selectDefaultHeaders(existingHeaders, defaultHeaders) {
 }
 
 /**
- * Play back an intercepto using the given request and mock response.
+ * Play back an interceptor using the given request and mock response.
  */
 function playbackInterceptor({
   req,

package/lib/socket.js

@@ -13,6 +13,7 @@ module.exports = class Socket extends EventEmitter {
     }
 
     this.bufferSize = 0
+    this.writableLength = 0
     this.writable = true
     this.readable = true
     this.pending = false

package/package.json

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