dht-rpc 6.10.0 → 6.11.0

package/index.js

@@ -44,6 +44,7 @@ class DHT extends EventEmitter {
     this.adaptive = typeof opts.ephemeral !== 'boolean' && opts.adaptive !== false
     this.destroyed = false
     this.suspended = false
+    this.online = true
 
     this._nat = new NatSampler()
     this._quickFirewall = opts.quickFirewall !== false
@@ -420,6 +421,7 @@ class DHT extends EventEmitter {
 
   _onnetworkchange (interfaces) {
     this.emit('network-change', interfaces)
+    this.emit('network-update')
   }
 
   _repingAndSwap (newNode, oldNode) {
@@ -688,7 +690,7 @@ class DHT extends EventEmitter {
     // if no nodes are available, including bootstrappers - bail
     if (nodes.length === 0) return true
 
-    const hosts = []
+    const hosts = new Set()
     const value = b4a.allocUnsafe(2)
 
     c.uint16.encode({ start: 0, end: 2, buffer: value }, this.io.serverSocket.address().port)
@@ -697,11 +699,10 @@ class DHT extends EventEmitter {
     this.io.serverSocket.on('message', onmessage)
 
     const pongs = await requestAll(this, true, PING_NAT, value, nodes)
-    if (!pongs.length) return true
 
     let count = 0
     for (const res of pongs) {
-      if (hosts.indexOf(res.from.host) > -1) {
+      if (hosts.has(res.from.host)) {
         count++
         natSampler.add(res.to.host, res.to.port)
       }
@@ -709,7 +710,7 @@ class DHT extends EventEmitter {
 
     this.io.serverSocket.removeListener('message', onmessage)
 
-    // if we got very few replies, consider it a fluke
+    // if we got no or very few replies, consider it a fluke
     if (count < (nodes.length >= 5 ? 3 : 1)) return true
 
     // check that the server socket has the same ip as the client socket
@@ -722,7 +723,7 @@ class DHT extends EventEmitter {
     return false
 
     function onmessage (_, { host }) {
-      hosts.push(host)
+      hosts.add(host)
     }
   }
 
@@ -741,6 +742,20 @@ class DHT extends EventEmitter {
 
     return q
   }
+
+  // called by the query
+  _online () {
+    if (this.online) return
+    this.online = true
+    this.emit('network-update')
+  }
+
+  // called by the query
+  _offline () {
+    if (!this.online) return
+    this.online = false
+    this.emit('network-update')
+  }
 }
 
 DHT.OK = 0

package/lib/io.js

@@ -27,6 +27,7 @@ module.exports = class IO {
     this.ephemeral = true
     this.congestion = new CongestionWindow(maxWindow)
     this.networkInterfaces = udx.watchNetworkInterfaces()
+    this.suspended = false
 
     this.onrequest = onrequest
     this.onresponse = onresponse
@@ -47,7 +48,7 @@ module.exports = class IO {
   }
 
   onmessage (socket, buffer, { host, port }) {
-    if (buffer.byteLength < 2 || !(port > 0 && port < 65536)) return
+    if (buffer.byteLength < 2 || !(port > 0 && port < 65536) || this.suspended === true) return
 
     const from = { id: null, host, port }
     const state = { start: 1, end: buffer.byteLength, buffer }
@@ -73,6 +74,8 @@ module.exports = class IO {
         const req = this.inflight[i]
         if (req.tid !== res.tid) continue
 
+        res.rtt = Date.now() - req._timestamp
+
         if (i === this.inflight.length - 1) this.inflight.pop()
         else this.inflight[i] = this.inflight.pop()
 
@@ -151,6 +154,7 @@ module.exports = class IO {
   }
 
   suspend () {
+    this.suspended = true
     if (this._drainInterval) {
       clearInterval(this._drainInterval)
       this._drainInterval = null
@@ -158,6 +162,7 @@ module.exports = class IO {
   }
 
   resume () {
+    this.suspended = false
     const binding = this._binding
     this._binding = this._rebind(binding)
     return this._binding
@@ -281,6 +286,7 @@ class Request {
     this._buffer = null
     this._io = io
     this._timeout = null
+    this._timestamp = Date.now()
   }
 
   static decode (io, socket, from, state) {
@@ -485,7 +491,7 @@ function decodeReply (from, state) {
 
     if (id !== null) from.id = validateId(id, from)
 
-    return { tid, from, to, token, closerNodes, error, value }
+    return { tid, rtt: 0, from, to, token, closerNodes, error, value }
   } catch {
     return null
   }

package/lib/query.js

@@ -25,6 +25,7 @@ module.exports = class Query extends Readable {
     this.closestReplies = []
 
     this._slow = 0
+    this._online = false
     this._slowdown = false
     this._seen = new Map()
     this._pending = []
@@ -234,6 +235,9 @@ module.exports = class Query extends Readable {
   _onvisit (m, req) {
     this._dec(req)
 
+    this._online = true
+    if (!this.dht.online) this.dht._online()
+
     const addr = req.to.host + ':' + req.to.port
     this._seen.set(addr, DONE)
 
@@ -334,6 +338,7 @@ module.exports = class Query extends Readable {
   }
 
   _destroy (cb) {
+    if (!this._online && this.dht.online) this.dht._offline()
     if (this._autoDestroySession) this._session.destroy()
     cb(null)
   }

package/package.json

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