fixup

lib/client.js

@@ -84,48 +84,6 @@ try {
  channels.connected = { hasSubscribers: false }
 }
 
-let fastNow = Date.now()
-const fastTimers = new Set()
-const fastNowInterval = setInterval(() => {
- fastNow = Date.now()
-
- // TODO (perf): This can probably be optimized.
- for (const timer of fastTimers) {
- if (fastNow >= timer.expires) {
- timer.expires = 0
- timer.callback(timer.opaque)
- }
- }
-}, 1e3)
-if (fastNowInterval.unref) {
- fastNowInterval.unref()
-}
-
-function setFastTimeout (callback, delay, opaque) {
- const timer = {
- callback,
- delay,
- expires: fastNow + delay,
- opaque
- }
-
- fastTimers.add(timer)
-
- return timer
-}
-
-function refreshFastTimeout (timer) {
- if (timer) {
- timer.expires = fastNow + timer.delay
- }
-}
-
-function clearFastTimeout (timer) {
- if (timer) {
- fastTimers.delete(timer)
- }
-}
-
 class Client extends DispatcherBase {
  constructor (url, {
  interceptors,
@@ -462,9 +420,14 @@ class Parser {
  this.ptr = this.llhttp.llhttp_alloc(constants.TYPE.RESPONSE)
  this.client = client
  this.socket = socket
- this.timeout = null
- this.timeoutValue = null
+
+ this.timeoutActive = false
+ this.timeoutValue = 0
  this.timeoutType = null
+ this.timeoutExpires = 0
+ this.timeoutNow = Date.now()
+ this.timeoutInterval = null
+
  this.statusCode = null
  this.statusText = ''
  this.upgrade = false
@@ -485,29 +448,42 @@ class Parser {
 
  setTimeout (value, type) {
  this.timeoutType = type
- if (value !== this.timeoutValue) {
- clearFastTimeout(this.timeout)
- if (value) {
- this.timeout = setFastTimeout(onParserTimeout, value, this)
- // istanbul ignore else: only for jest
- if (this.timeout.unref) {
- this.timeout.unref()
- }
- } else {
- this.timeout = null
- }
- this.timeoutValue = value
- } else {
- this.refreshTimeout()
+ this.timeoutValue = value
+ this.timeoutActive = true
+ this.refreshTimeout()
+ }
+
+ clearTimeout () {
+ this.timeoutActive = false
+
+ if (this.timeoutInterval) {
+ clearInterval(this.timeoutInterval)
+ this.timeoutInterval = null
  }
  }
 
  refreshTimeout () {
- refreshFastTimeout(this.timeout)
+ if (this.timeoutActive) {
+ this.startInterval()
+ this.timeoutExpires = this.timeoutNow + this.timeoutValue
+ }
  }
 
- clearTimeout () {
- clearFastTimeout(this.timeout)
+ startInterval () {
+ if (!this.timeoutInterval) {
+ this.timeoutNow = Date.now()
+ this.timeoutInterval = setInterval(() => {
+ this.timeoutNow = Date.now()
+ if (this.timeoutActive && this.timeoutExpires < this.timeoutNow) {
+ this.timeoutActive = false
+ onParserTimeout.call(this)
+ }
+ }, 1e3)
+
+ if (this.timeoutInterval.unref) {
+ this.timeoutInterval.unref()
+ }
+ }
  }
 
  resume () {