dht-rpc 6.13.0 → 6.14.1

package/README.md

@@ -110,7 +110,7 @@ Options include:
 
 ``` js
 {
-  // A list of bootstrap nodes
+  // A list of bootstrap nodes. Optionally prefix a suggested-IP, i.e. '192.168.1.10@bootstrap-node.com:24242'
   bootstrap: [ 'bootstrap-node.com:24242', ... ],
   // Optionally pass in array of { host, port } to add to the routing table if you know any peers
   nodes: [{ host, port }, ...],

package/index.js

@@ -661,18 +661,34 @@ class DHT extends EventEmitter {
   }
 
   async * _resolveBootstrapNodes () {
-    for (const node of this.bootstrapNodes) {
-      let address
-      try {
-        address = await this.udx.lookup(node.host, { family: 4 })
-      } catch {
-        continue
+    for (let { host, port } of this.bootstrapNodes) {
+      let doLookup = false
+
+      if (host.indexOf('@') === -1) {
+        doLookup = true
+      } else {
+        const [suggestedIP, fallbackHost] = host.split('@')
+        try {
+          await this.ping({ host: suggestedIP, port })
+          host = suggestedIP
+        } catch {
+          host = fallbackHost
+          doLookup = true
+        }
+      }
+
+      if (doLookup) {
+        try {
+          host = UDX.isIPv4(host) ? host : (await this.udx.lookup(host, { family: 4 })).host
+        } catch {
+          continue
+        }
       }
 
       yield {
-        id: peer.id(address.host, node.port),
-        host: address.host,
-        port: node.port
+        id: peer.id(host, port),
+        host,
+        port
       }
     }
   }

package/lib/io.js

@@ -497,6 +497,6 @@ function decodeReply (from, state) {
 }
 
 function validateId (id, from) {
-  const expected = peer.id(from.host, from.port, b4a.allocUnsafeSlow(32))
+  const expected = peer.id(from.host, from.port)
   return b4a.equals(expected, id) ? expected : null
 }

package/lib/peer.js

@@ -17,7 +17,7 @@ const ipv4 = {
 
 module.exports = { id, ipv4, ipv4Array: c.array(ipv4) }
 
-function id (host, port, out = b4a.allocUnsafe(32)) {
+function id (host, port, out = b4a.allocUnsafeSlow(32)) {
   const addr = out.subarray(0, 6)
   ipv4.encode(
     { start: 0, end: 6, buffer: addr },

package/package.json

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