dht-rpc 6.26.0 → 6.26.2

package/index.js

@@ -179,7 +179,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 +556,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,7 +1,6 @@
-const MAX_HEALTH_WINDOW = 2
-const RESPONSES_SANITY = 0
-const TIMEOUTS_SANITY = 0
+const MAX_HEALTH_WINDOW = 4
 const TIMEOUTS_THRESHOLD = 0.5
+const IDLE_THRESHOLD = 4
 
 module.exports = class NetworkHealth {
   static DEFAULT_MAX_HEALTH_WINDOW = MAX_HEALTH_WINDOW
@@ -19,17 +18,31 @@ module.exports = class NetworkHealth {
     return this._window[this._tail]
   }
 
+  get previous() {
+    return this._window[(this._head - 1 + this._maxHealthWindow) % this._maxHealthWindow]
+  }
+
   get newest() {
     return this._window[this._head]
   }
 
+  get recentResponses() {
+    if (!this.newest || !this.previous) return 0
+    return this.newest.responses - this.previous.responses
+  }
+
+  get recentTimeouts() {
+    if (!this.newest || !this.previous) return 0
+    return this.newest.timeouts - this.previous.timeouts
+  }
+
   get responses() {
-    if (!this.newest) return 0
+    if (!this.newest || !this.oldest) return 0
     return this.newest.responses - this.oldest.responses
   }
 
   get timeouts() {
-    if (!this.newest) return 0
+    if (!this.newest || !this.oldest) return 0
     return this.newest.timeouts - this.oldest.timeouts
   }
 
@@ -38,13 +51,25 @@ module.exports = class NetworkHealth {
     return this.timeouts / (this.responses + this.timeouts)
   }
 
+  get cold() {
+    return this._window.length < this._maxHealthWindow
+  }
+
+  get idle() {
+    return this.recentResponses + this.recentTimeouts < IDLE_THRESHOLD
+  }
+
   get stats() {
     return {
       online: this.online,
       degraded: this.degraded,
+      cold: this.cold,
+      idle: this.idle,
       responses: this.responses,
       timeouts: this.timeouts,
-      timeoutsRate: this.timeoutsRate
+      timeoutsRate: this.timeoutsRate,
+      recentResponses: this.recentResponses,
+      recentTimeouts: this.recentTimeouts
     }
   }
 
@@ -52,16 +77,9 @@ module.exports = class NetworkHealth {
     return (this._head + 1) % this._maxHealthWindow
   }
 
-  get cold() {
-    return this._window.length < this._maxHealthWindow
-  }
-
   reset() {
     this._window = []
     this._head = -1
-    this.online = true
-    this.degraded = false
-    this._dht._online()
   }
 
   update() {
@@ -71,24 +89,10 @@ module.exports = class NetworkHealth {
       timeouts: this._dht.stats.requests.timeouts
     }
 
-    if (this.cold) return
+    if (this.cold || this.idle) return
 
-    const responses = this.responses
-    const timeouts = this.timeouts
-    const timeoutsRate = this.timeoutsRate
-
-    if (responses > 0) {
-      this.online = true
-    }
-
-    if (responses > RESPONSES_SANITY * this._window.length) {
-      this.degraded = timeoutsRate > TIMEOUTS_THRESHOLD
-    }
-
-    if (responses === 0 && timeouts > TIMEOUTS_SANITY * this._window.length) {
-      this.online = false
-      this.degraded = false
-    }
+    this.online = this.recentResponses > 0
+    this.degraded = this.online && this.timeoutsRate > TIMEOUTS_THRESHOLD
 
     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.0",
+  "version": "6.26.2",
   "description": "Make RPC calls over a Kademlia based DHT",
   "main": "index.js",
   "files": [