dht-rpc 6.12.1 → 6.14.0

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 }, ...],
@@ -339,9 +339,9 @@ Shutdown the DHT node.
 
 Boolean indicating if this has been destroyed.
 
-#### `node.toArray()`
+#### `node.toArray([options])`
 
-Get the routing table peers out as an array of `{ host, port }`
+Get the routing table peers out as an array of `{ host, port }`. Use `options.limit` to get a subset.
 
 #### `node.addNode({ host, port })`
 

package/index.js

@@ -175,8 +175,10 @@ class DHT extends EventEmitter {
     })
   }
 
-  toArray () {
-    return this.nodes.toArray().map(({ host, port }) => ({ host, port }))
+  toArray (opts) {
+    const limit = (opts && opts.limit)
+    if (limit === 0) return []
+    return this.nodes.toArray(limit).map(({ host, port }) => ({ host, port }))
   }
 
   ready () {
@@ -659,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/package.json

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