dht-rpc 6.26.1 → 6.26.3

package/index.js

@@ -26,7 +26,6 @@ const OLD_NODE = 360 // if an node has been around more than 30 min we consider
 const DEFAULTS = {
   concurrency: 10,
   maxWindow: IO.DEFAULT_MAX_WINDOW,
-  maxHealthWindow: NetworkHealth.DEFAULT_MAX_HEALTH_WINDOW,
   maxPingDelay: 10_000
 }
 
@@ -44,7 +43,7 @@ class DHT extends EventEmitter {
       onresponse: this._onresponse.bind(this),
       ontimeout: this._ontimeout.bind(this)
     })
-    this.health = new NetworkHealth(this, opts)
+    this.health = new NetworkHealth(this)
 
     this.concurrency = opts.concurrency || DEFAULTS.concurrency
     this.maxPingDelay = opts.maxPingDelay || DEFAULTS.maxPingDelay
@@ -179,7 +178,6 @@ class DHT extends EventEmitter {
     this._onwakeup()
     log('Resuming io')
     await this.io.resume()
-    this.health.reset()
     log('Done, dht resumed')
     this.io.networkInterfaces.on('change', (interfaces) => this._onnetworkchange(interfaces))
     this.refresh()
@@ -557,6 +555,7 @@ class DHT extends EventEmitter {
     this._stableTicks = MORE_STABLE_TICKS
     this._refreshTicks = 1 // triggers a refresh next tick (allow network time to wake up also)
     this._lastHost = null // clear network cache check
+    this.health.reset()
 
     if (this.adaptive) {
       // TODO: re-enable this as soon as we find out why this is over triggering in some edge cases

package/lib/health.js

@@ -1,14 +1,14 @@
 const MAX_HEALTH_WINDOW = 4
-const TIMEOUTS_THRESHOLD = 0.5
+const IDLE_THRESHOLD = 4
+const DEGRADED_TIMEOUT_RATE_THRESHOLD = 0.5
 
 module.exports = class NetworkHealth {
-  static DEFAULT_MAX_HEALTH_WINDOW = MAX_HEALTH_WINDOW
-
-  constructor(dht, { maxHealthWindow = MAX_HEALTH_WINDOW } = {}) {
+  constructor(dht) {
     this._dht = dht
-    this._maxHealthWindow = maxHealthWindow
     this._window = []
     this._head = -1
+    this._degradedTicks = 0
+    this._healthyTicks = 0
     this.online = true
     this.degraded = false
   }
@@ -18,78 +18,90 @@ module.exports = class NetworkHealth {
   }
 
   get previous() {
-    return this._window[(this._head - 1 + this._maxHealthWindow) % this._maxHealthWindow]
+    return this._window[(this._head - 1 + MAX_HEALTH_WINDOW) % MAX_HEALTH_WINDOW]
   }
 
   get newest() {
     return this._window[this._head]
   }
 
-  get recentResponses() {
+  get responses() {
     if (!this.newest || !this.previous) return 0
     return this.newest.responses - this.previous.responses
   }
 
-  get recentTimeouts() {
+  get timeouts() {
     if (!this.newest || !this.previous) return 0
     return this.newest.timeouts - this.previous.timeouts
   }
 
-  get responses() {
-    if (!this.newest || !this.oldest) return 0
-    return this.newest.responses - this.oldest.responses
-  }
-
-  get timeouts() {
-    if (!this.newest || !this.oldest) return 0
-    return this.newest.timeouts - this.oldest.timeouts
-  }
-
   get timeoutsRate() {
     if (this.timeouts === 0) return 0
     return this.timeouts / (this.responses + this.timeouts)
   }
 
+  get cold() {
+    return this._window.length < MAX_HEALTH_WINDOW
+  }
+
   get idle() {
-    return this.recentResponses === 0 && this.recentTimeouts === 0
+    return this.responses + this.timeouts < IDLE_THRESHOLD
+  }
+
+  get allDegraded() {
+    return this._degradedTicks === MAX_HEALTH_WINDOW
+  }
+
+  get allHealthy() {
+    return this._healthyTicks === MAX_HEALTH_WINDOW
   }
 
   get stats() {
     return {
       online: this.online,
       degraded: this.degraded,
+      cold: this.cold,
       idle: this.idle,
       responses: this.responses,
       timeouts: this.timeouts,
-      timeoutsRate: this.timeoutsRate,
-      recentResponses: this.recentResponses,
-      recentTimeouts: this.recentTimeouts
+      timeoutsRate: this.timeoutsRate
     }
   }
 
   get _tail() {
-    return (this._head + 1) % this._maxHealthWindow
+    return (this._head + 1) % MAX_HEALTH_WINDOW
   }
 
   reset() {
     this._window = []
     this._head = -1
+    this._degradedTicks = 0
+    this._healthyTicks = 0
     this.online = true
     this.degraded = false
     this._dht._online()
   }
 
   update() {
+    if (this.oldest?.degraded) this._degradedTicks--
+    else if (this.oldest?.degraded === false) this._healthyTicks--
+
     this._head = this._tail
     this._window[this._head] = {
       responses: this._dht.stats.requests.responses,
       timeouts: this._dht.stats.requests.timeouts
     }
 
-    if (this.idle) return
+    if (this.cold || this.idle) return
+
+    this.newest.degraded = this.timeoutsRate > DEGRADED_TIMEOUT_RATE_THRESHOLD
+
+    if (this.newest.degraded) this._degradedTicks++
+    else this._healthyTicks++
 
-    this.online = this.recentResponses > 0
-    this.degraded = this.online && this.timeoutsRate > TIMEOUTS_THRESHOLD
+    this.online = this.responses > 0
+    if (this.online && this.allDegraded) this.degraded = true
+    if (!this.online || this.allHealthy) this.degraded = false
 
     if (this.online && !this.degraded) this._dht._online()
     else if (this.degraded) this._dht._degraded()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dht-rpc",
-  "version": "6.26.1",
+  "version": "6.26.3",
   "description": "Make RPC calls over a Kademlia based DHT",
   "main": "index.js",
   "files": [