dht-rpc 6.0.2 → 6.1.0

package/index.js

@@ -56,6 +56,7 @@ class DHT extends EventEmitter {
     this._tickInterval = setInterval(this._ontick.bind(this), TICK_INTERVAL)
     this._lastTick = Date.now()
     this._lastHost = null
+    this._shouldAddNode = opts.addNode || null
     this._onrow = (row) => row.on('full', (node) => this._onfullrow(node, row))
     this._nonePersistentSamples = []
     this._bootstrapping = this._bootstrap()
@@ -63,6 +64,7 @@ class DHT extends EventEmitter {
 
     this.table.on('row', this._onrow)
 
+    if (this.ephemeral === false) this.io.ephemeral = false
     this.io.networkInterfaces.on('change', (interfaces) => this._onnetworkchange(interfaces))
 
     if (opts.nodes) {
@@ -240,6 +242,10 @@ class DHT extends EventEmitter {
   }
 
   _addNodeFromNetwork (sample, from, to) {
+    if (this._shouldAddNode !== null && !this._shouldAddNode(from)) {
+      return
+    }
+
     if (from.id === null) {
       this._sampleBootstrapMaybe(from, to)
       return
@@ -502,9 +508,11 @@ class DHT extends EventEmitter {
 
     const { host, port } = this._nat
 
-    // remember what host we checked and reset the counter
-    this._stableTicks = MORE_STABLE_TICKS
-    this._lastHost = host
+    if (!onlyFirewall) {
+      // remember what host we checked and reset the counter
+      this._stableTicks = MORE_STABLE_TICKS
+      this._lastHost = host
+    }
 
     // check if we have a consistent host and port
     if (host === null || port === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dht-rpc",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "description": "Make RPC calls over a Kademlia based DHT",
   "main": "index.js",
   "dependencies": {

package/test.js

@@ -311,6 +311,25 @@ test('relay', async function (t) {
   t.is(res.to.port, a.address().port)
 })
 
+test('filter nodes from routing table', async function (t) {
+  const [a, b, c] = await makeSwarm(3, t)
+
+  const node = new DHT({
+    ephemeral: false,
+    bootstrap: [a],
+    addNode (from) {
+      return from.port !== b.port
+    }
+  })
+
+  t.teardown(() => node.destroy())
+
+  const q = node.findNode(c.id)
+  await q.finished()
+
+  t.absent(node.table.has(b.id), 'should not have b')
+})
+
 function freePort () {
   return new Promise(resolve => {
     const socket = dgram.createSocket('udp4')