dht-rpc 6.26.3 → 6.27.0

package/lib/health.js

@@ -1,4 +1,5 @@
 const MAX_HEALTH_WINDOW = 4
+const OFFLINE_THRESHOLD = 2
 const IDLE_THRESHOLD = 4
 const DEGRADED_TIMEOUT_RATE_THRESHOLD = 0.5
 
@@ -7,6 +8,7 @@ module.exports = class NetworkHealth {
     this._dht = dht
     this._window = []
     this._head = -1
+    this._offlineTicks = 0
     this._degradedTicks = 0
     this._healthyTicks = 0
     this.online = true
@@ -48,14 +50,6 @@ module.exports = class NetworkHealth {
     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,
@@ -75,6 +69,7 @@ module.exports = class NetworkHealth {
   reset() {
     this._window = []
     this._head = -1
+    this._offlineTicks = 0
     this._degradedTicks = 0
     this._healthyTicks = 0
     this.online = true
@@ -83,26 +78,42 @@ module.exports = class NetworkHealth {
   }
 
   update() {
+    // update counters before dropping oldest
     if (this.oldest?.degraded) this._degradedTicks--
     else if (this.oldest?.degraded === false) this._healthyTicks--
 
+    // move window
     this._head = this._tail
     this._window[this._head] = {
       responses: this._dht.stats.requests.responses,
       timeouts: this._dht.stats.requests.timeouts
     }
 
+    // skip state changes
     if (this.cold || this.idle) return
 
-    this.newest.degraded = this.timeoutsRate > DEGRADED_TIMEOUT_RATE_THRESHOLD
+    // update newest
+    this.newest.offline = this.responses === 0
+    this.newest.degraded =
+      !this.newest.offline && this.timeoutsRate > DEGRADED_TIMEOUT_RATE_THRESHOLD
+
+    // update counters
+    if (this.newest.offline) this._offlineTicks++
+    else {
+      this._offlineTicks = 0
+      if (this.newest.degraded) this._degradedTicks++
+      else this._healthyTicks++
+    }
 
-    if (this.newest.degraded) this._degradedTicks++
-    else this._healthyTicks++
+    // check online/offline
+    if (!this.newest.offline) this.online = true
+    else if (this._offlineTicks >= OFFLINE_THRESHOLD) this.online = false
 
-    this.online = this.responses > 0
-    if (this.online && this.allDegraded) this.degraded = true
-    if (!this.online || this.allHealthy) this.degraded = false
+    // check degraded
+    if (!this.online || this._healthyTicks === MAX_HEALTH_WINDOW) this.degraded = false
+    else if (this._degradedTicks === MAX_HEALTH_WINDOW) this.degraded = true
 
+    // fire events
     if (this.online && !this.degraded) this._dht._online()
     else if (this.degraded) this._dht._degraded()
     else this._dht._offline()

package/lib/peer.js

@@ -1,12 +1,11 @@
 const sodium = require('sodium-universal')
 const c = require('compact-encoding')
-const net = require('compact-encoding-net')
 const b4a = require('b4a')
 
 const ipv4 = {
-  ...net.ipv4Address,
+  ...c.ipv4Address,
   decode(state) {
-    const ip = net.ipv4Address.decode(state)
+    const ip = c.ipv4Address.decode(state)
     return {
       id: null, // populated by the callee
       host: ip.host,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dht-rpc",
-  "version": "6.26.3",
+  "version": "6.27.0",
   "description": "Make RPC calls over a Kademlia based DHT",
   "main": "index.js",
   "files": [
@@ -17,7 +17,7 @@
     "adaptive-timeout": "^1.0.1",
     "b4a": "^1.6.1",
     "bare-events": "^2.2.0",
-    "compact-encoding": "^2.11.0",
+    "compact-encoding": "^3.0.0",
     "compact-encoding-net": "^1.2.0",
     "fast-fifo": "^1.1.0",
     "kademlia-routing-table": "^1.0.1",
@@ -43,12 +43,12 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/mafintosh/dht-rpc.git"
+    "url": "https://github.com/holepunchto/dht-rpc.git"
   },
   "author": "Mathias Buus (@mafintosh)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/mafintosh/dht-rpc/issues"
+    "url": "https://github.com/holepunchto/dht-rpc/issues"
   },
-  "homepage": "https://github.com/mafintosh/dht-rpc"
+  "homepage": "https://github.com/holepunchto/dht-rpc#"
 }