Merge pull request #25 from WilfredTA/nodeAliveTest

getClosestBatNodeToShard filters out nodes w/ same host and port then…

batnode.js

@@ -106,13 +106,20 @@ class BatNode {
     this.kadenceNode.iterativeFindNode(shardId, (err, res) => {
       let i = 0
       let targetKadNode = res[0]; // res is an array of these tuples: [id, {hostname, port}]
-      while (targetKadNode[1].hostname === this.kadenceNode.contact.hostname) { // change to identity and re-test
+      while (targetKadNode[1].hostname === this.kadenceNode.contact.hostname &&
+            targetKadNode[1].port === this.kadenceNode.contact.port) { // change to identity and re-test
         i += 1
         targetKadNode = res[i]
       }
 
-      this.kadenceNode.getOtherBatNodeContact(targetKadNode, (error, result) => { // res is contact info of batnode {port, host}
-        callback(result)
+      this.kadenceNode.ping(targetKadNode, (error) => { // Checks whether target kad node is alive
+        if (error) {
+          this.getClosestBatNodeToShard(shardId, callback) // if it's offline, re-calls method. This works because sendign RPCs to disconnected nodes
+        } else {                                          // will automatically remove the dead node's contact info from sending node's routing table
+          this.kadenceNode.getOtherBatNodeContact(targetKadNode, (error2, result) => { // res is contact info of batnode {port, host}
+            callback(result)
+          })
+        }
       })
     })
   }

seednode/seed.js

@@ -67,5 +67,6 @@ publicIp.v4().then(ip => {
 
 
   batNode.createServer(1756, ip, nodeConnectionCallback)
+  console.log(kademliaNode.router)
 
 })

start.js

@@ -85,6 +85,7 @@ publicIp.v4().then(ip => {
 
   kademliaNode.join(seed, () => {
     console.log('you have joined the network! Ready to accept commands from the CLI!')
+    console.log(kademliaNode.router)
   })