nock 13.0.8 → 13.1.0

package/README.md

@@ -640,6 +640,8 @@ const scope = nock('http://my.server.com:8081')
 
 You are able to specify the number of times to repeat the same response.
 
+**NOTE:** When request times is more than the number you specified, you will get an error before cleaning this interceptor.
+
 ```js
 nock('http://zombo.com').get('/').times(4).reply(200, 'Ok')
 
@@ -647,7 +649,15 @@ http.get('http://zombo.com/') // respond body "Ok"
 http.get('http://zombo.com/') // respond body "Ok"
 http.get('http://zombo.com/') // respond body "Ok"
 http.get('http://zombo.com/') // respond body "Ok"
-http.get('http://zombo.com/') // respond with zombo.com result
+
+// This code will get an error with message:
+// Nock: No match for request
+http.get('http://zombo.com/')
+
+// clean your interceptor
+nock.cleanAll()
+
+http.get('http://zombo.com/') // real respond with zombo.com result
 ```
 
 Sugar syntax
@@ -1213,13 +1223,12 @@ nocks.forEach(function (nock) {
     const recordedBodyResult = /timestamp:([0-9]+)/.exec(aRecordedBody)
     if (recordedBodyResult) {
       const recordedTimestamp = recordedBodyResult[1]
-      return body.replace(/(timestamp):([0-9]+)/g, function (
-        match,
-        key,
-        value
-      ) {
-        return key + ':' + recordedTimestamp
-      })
+      return body.replace(
+        /(timestamp):([0-9]+)/g,
+        function (match, key, value) {
+          return key + ':' + recordedTimestamp
+        }
+      )
     } else {
       return body
     }

package/lib/common.js

@@ -673,6 +673,34 @@ function removeAllTimers() {
   clearTimer(clearImmediate, immediates)
 }
 
+/**
+ * Check if the Client Request has been cancelled.
+ *
+ * Until Node 14 is the minimum, we need to look at both flags to see if the request has been cancelled.
+ * The two flags have the same purpose, but the Node maintainers are migrating from `abort(ed)` to
+ * `destroy(ed)` terminology, to be more consistent with `stream.Writable`.
+ * In Node 14.x+, Calling `abort()` will set both `aborted` and `destroyed` to true, however,
+ * calling `destroy()` will only set `destroyed` to true.
+ * Falling back on checking if the socket is destroyed to cover the case of Node <14.x where
+ * `destroy()` is called, but `destroyed` is undefined.
+ *
+ * Node Client Request history:
+ * - `request.abort()`: Added in: v0.3.8, Deprecated since: v14.1.0, v13.14.0
+ * - `request.aborted`: Added in: v0.11.14, Became a boolean instead of a timestamp: v11.0.0, Not deprecated (yet)
+ * - `request.destroy()`: Added in: v0.3.0
+ * - `request.destroyed`: Added in: v14.1.0, v13.14.0
+ *
+ * @param {ClientRequest} req
+ * @returns {boolean}
+ */
+function isRequestDestroyed(req) {
+  return !!(
+    req.destroyed === true ||
+    req.aborted ||
+    (req.socket && req.socket.destroyed)
+  )
+}
+
 module.exports = {
   contentEncoding,
   dataEqual,
@@ -686,6 +714,7 @@ module.exports = {
   isContentEncoded,
   isJSONContent,
   isPlainObject,
+  isRequestDestroyed,
   isStream,
   isUtf8Representable,
   mapValue,

package/lib/intercepted_request_router.js

@@ -103,8 +103,7 @@ class InterceptedRequestRouter {
   connectSocket() {
     const { req, socket } = this
 
-    // Until Node 14 is the minimum, we need to look at both flags to see if the request has been cancelled.
-    if (req.destroyed || req.aborted) {
+    if (common.isRequestDestroyed(req)) {
       return
     }
 
@@ -250,8 +249,7 @@ class InterceptedRequestRouter {
       return
     }
 
-    // Until Node 14 is the minimum, we need to look at both flags to see if the request has been cancelled.
-    if (!req.destroyed && !req.aborted && !playbackStarted) {
+    if (!common.isRequestDestroyed(req) && !playbackStarted) {
       this.startPlayback()
     }
   }

package/lib/interceptor.js

@@ -32,8 +32,9 @@ module.exports = class Interceptor {
     // When enabled filteringScope ignores the passed URL entirely so we skip validation.
 
     if (
-      !scope.scopeOptions.filteringScope &&
       uriIsStr &&
+      !scope.scopeOptions.filteringScope &&
+      !scope.basePathname &&
       !uri.startsWith('/') &&
       !uri.startsWith('*')
     ) {

package/lib/playback_interceptor.js

@@ -293,7 +293,7 @@ function playbackInterceptor({
     const { delayBodyInMs, delayConnectionInMs } = interceptor
 
     function respond() {
-      if (req.aborted) {
+      if (common.isRequestDestroyed(req)) {
         return
       }
 
@@ -318,7 +318,7 @@ function playbackInterceptor({
   // correct events are emitted first ('socket', 'finish') and any aborts in the in the queue or
   // called during a 'finish' listener can be called.
   common.setImmediate(() => {
-    if (!req.aborted) {
+    if (!common.isRequestDestroyed(req)) {
       start()
     }
   })

package/lib/recorder.js

@@ -309,8 +309,6 @@ function record(recOptions) {
 
       if (callback) {
         callback(res, options, callback)
-      } else {
-        res.resume()
       }
 
       debug('finished setting up intercepting')

package/lib/socket.js

@@ -92,6 +92,7 @@ module.exports = class Socket extends EventEmitter {
     debug('socket destroy')
     this.destroyed = true
     this.readable = this.writable = false
+    this.readableEnded = this.writableFinished = true
 
     process.nextTick(() => {
       if (err) {

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "13.0.8",
+  "version": "13.1.0",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -28,33 +28,31 @@
     "propagate": "^2.0.0"
   },
   "devDependencies": {
-    "@sinonjs/fake-timers": "^6.0.0",
+    "@sinonjs/fake-timers": "^7.0.2",
     "assert-rejects": "^1.0.0",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
     "dtslint": "^4.0.4",
     "eslint": "^7.3.1",
-    "eslint-config-prettier": "^6.0.0",
-    "eslint-config-standard": "^14.0.0",
+    "eslint-config-prettier": "^8.1.0",
+    "eslint-config-standard": "^16.0.2",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-mocha": "^8.0.0",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-promise": "^4.1.1",
-    "eslint-plugin-standard": "^4.0.0",
-    "form-data": "^3.0.0",
+    "eslint-plugin-standard": "^5.0.0",
+    "form-data": "^4.0.0",
     "got": "^11.3.0",
     "mocha": "^8.0.1",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
-    "prettier": "2.0.5",
+    "prettier": "2.2.1",
     "proxyquire": "^2.1.0",
-    "request": "^2.83.0",
     "rimraf": "^3.0.0",
     "semantic-release": "^17.0.2",
-    "sinon": "^9.0.0",
+    "sinon": "^10.0.0",
     "sinon-chai": "^3.3.0",
-    "superagent": "^6.1.0",
-    "tap": "14.6.1"
+    "typescript": "^4.2.2"
   },
   "scripts": {
     "format:fix": "prettier --write '**/*.{js,json,md,ts,yml,yaml}'",
@@ -63,19 +61,8 @@
     "lint:js": "eslint --cache --cache-location './.cache/eslint' '**/*.js'",
     "lint:js:fix": "eslint --cache --cache-location './.cache/eslint' --fix '**/*.js'",
     "lint:ts": "dtslint types",
-    "test": "run-s test:mocha test:tap",
-    "test:coverage": "tap --coverage-report=html && open coverage/lcov-report/index.html",
-    "test:mocha": "nyc mocha $(grep -lr '^\\s*it(' tests)",
-    "test:tap": "tap --100 --coverage --coverage-report=text ./tests/test_*.js"
-  },
-  "nyc": {
-    "reporter": [
-      "lcov",
-      "text-summary"
-    ],
-    "exclude": [
-      "tests/"
-    ]
+    "test": "nyc mocha tests",
+    "test:coverage": "open coverage/lcov-report/index.html"
   },
   "license": "MIT",
   "files": [