DHT: only parse node/peer info when that key exists in response

1 files changed, 12 insertions, 8 deletions

diff --git a/lib/bittorrent-dht/index.js b/lib/bittorrent-dht/index.js
index d83e761..1422e12 100644
--- a/lib/bittorrent-dht/index.js
+++ b/lib/bittorrent-dht/index.js
@@ -136,19 +136,23 @@ DHT.prototype._onData = function (data, host, port) {
     return
   }
 
-  if (!message.t || (bops.from(message.t) !== self.requestId.toString())) {
-    console.log(message.t)
-    console.log(self.requestId)
-    console.log('wrong message requestId')
+  if (!message.t || (bops.to(message.t) !== self.requestId.toString())) {
+    log(message.t)
+    log(self.requestId)
+    log('wrong message requestId')
     return
   }
 
   var r = message && message.r
-  var nodes = r && r.nodes || []
-  var values = r && r.values || []
 
-  parseNodeInfo(nodes).forEach(self._onNode.bind(self))
-  parsePeerInfo(values).forEach(self._onPeer.bind(self))
+  if (r && bops.is(r.nodes)) {
+    log('nodes')
+    parseNodeInfo(r.nodes).forEach(self._onNode.bind(self))
+  }
+  if (r && bops.is(r.values)) {
+    log('peers')
+    parsePeerInfo(r.values).forEach(self._onPeer.bind(self))
+  }
 }
 
 DHT.prototype.query = function (addr) {