fix: result.Peers can be null, ensure callback is called

License: MIT Signed-off-by: Alan Shaw <alan@tableflip.io>
ipfs-inactive · May 16, 2018 · f5f2e83 · f5f2e83
1 parent faa51b4
commit f5f2e83
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/src/swarm/peers.js b/src/swarm/peers.js
@@ -21,9 +21,9 @@ module.exports = (send) => {
         return callback(err)
       }
 
+      // go-ipfs <= 0.4.4
       if (result.Strings) {
-        // go-ipfs <= 0.4.4
-        callback(null, result.Strings.map((p) => {
+        return callback(null, result.Strings.map((p) => {
           const res = {}
 
           if (verbose) {
@@ -40,26 +40,26 @@ module.exports = (send) => {
 
           return res
         }))
-      } else if (result.Peers) {
-        // go-ipfs >= 0.4.5
-        callback(null, result.Peers.map((p) => {
-          const res = {
-            addr: multiaddr(p.Addr),
-            peer: PeerId.createFromB58String(p.Peer),
-            muxer: p.Muxer
-          }
+      }
 
-          if (p.Latency) {
-            res.latency = p.Latency
-          }
+      // go-ipfs >= 0.4.5
+      callback(null, (result.Peers || []).map((p) => {
+        const res = {
+          addr: multiaddr(p.Addr),
+          peer: PeerId.createFromB58String(p.Peer),
+          muxer: p.Muxer
+        }
 
-          if (p.Streams) {
-            res.streams = p.Streams
-          }
+        if (p.Latency) {
+          res.latency = p.Latency
+        }
 
-          return res
-        }))
-      }
+        if (p.Streams) {
+          res.streams = p.Streams
+        }
+
+        return res
+      }))
     })
   })
 }