nock 13.5.3 → 13.5.5

package/lib/common.js

@@ -593,31 +593,35 @@ function deepEqual(expected, actual) {
   return expected === actual
 }
 
-const timeouts = []
-const intervals = []
-const immediates = []
+const timeouts = new Set()
+const immediates = new Set()
 
 const wrapTimer =
   (timer, ids) =>
-  (...args) => {
-    const id = timer(...args)
-    ids.push(id)
+  (callback, ...timerArgs) => {
+    const cb = (...callbackArgs) => {
+      try {
+        // eslint-disable-next-line n/no-callback-literal
+        callback(...callbackArgs)
+      } finally {
+        ids.delete(id)
+      }
+    }
+    const id = timer(cb, ...timerArgs)
+    ids.add(id)
     return id
   }
 
 const setTimeout = wrapTimer(timers.setTimeout, timeouts)
-const setInterval = wrapTimer(timers.setInterval, intervals)
 const setImmediate = wrapTimer(timers.setImmediate, immediates)
 
 function clearTimer(clear, ids) {
-  while (ids.length) {
-    clear(ids.shift())
-  }
+  ids.forEach(clear)
+  ids.clear()
 }
 
 function removeAllTimers() {
   clearTimer(clearTimeout, timeouts)
-  clearTimer(clearInterval, intervals)
   clearTimer(clearImmediate, immediates)
 }
 
@@ -762,7 +766,6 @@ module.exports = {
   removeAllTimers,
   restoreOverriddenRequests,
   setImmediate,
-  setInterval,
   setTimeout,
   stringifyRequest,
 }

package/lib/interceptor.js

@@ -198,10 +198,16 @@ module.exports = class Interceptor {
     if (!fs) {
       throw new Error('No fs')
     }
-    const readStream = fs.createReadStream(filePath)
-    readStream.pause()
     this.filePath = filePath
-    return this.reply(statusCode, readStream, headers)
+    return this.reply(
+      statusCode,
+      () => {
+        const readStream = fs.createReadStream(filePath)
+        readStream.pause()
+        return readStream
+      },
+      headers,
+    )
   }
 
   // Also match request headers
@@ -453,15 +459,6 @@ module.exports = class Interceptor {
   markConsumed() {
     this.interceptionCounter++
 
-    if (
-      (this.scope.shouldPersist() || this.counter > 0) &&
-      this.interceptionCounter > 1 &&
-      this.filePath
-    ) {
-      this.body = fs.createReadStream(this.filePath)
-      this.body.pause()
-    }
-
     remove(this)
 
     if (!this.scope.shouldPersist() && this.counter < 1) {

package/package.json

@@ -7,7 +7,7 @@
     "testing",
     "isolation"
   ],
-  "version": "13.5.3",
+  "version": "13.5.5",
   "author": "Pedro Teixeira <pedro.teixeira@gmail.com>",
   "repository": {
     "type": "git",
@@ -45,10 +45,10 @@
     "mocha": "^9.1.3",
     "npm-run-all": "^4.1.5",
     "nyc": "^15.0.0",
-    "prettier": "3.1.0",
+    "prettier": "3.2.5",
     "proxyquire": "^2.1.0",
     "rimraf": "^3.0.0",
-    "semantic-release": "^22.0.5",
+    "semantic-release": "^23.0.2",
     "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
     "typescript": "^5.0.4"