From d39886c87156f9073b84b303b4ee8a87aacacaa7 Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Thu, 30 Nov 2017 19:49:06 +0700 Subject: [PATCH] Ensure relays/bridges are always an array --- lib/tor.js | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/tor.js b/lib/tor.js index ead2d2b..4cdf8a2 100644 --- a/lib/tor.js +++ b/lib/tor.js @@ -14,27 +14,25 @@ module.exports = { return onionoo .details(query) .then(response => { - const details = response.body; - if (details.relays) { - details.relays.forEach(setNodeType('relay')); - } - if (details.bridges) { - details.bridges.forEach(setNodeType('bridge')); - } - return details.relays.concat(details.bridges); + const relays = response.body.relays || []; + const bridges = response.body.bridges || []; + relays.forEach(setNodeType('relay')); + bridges.forEach(setNodeType('bridge')); + return relays.concat(bridges); }); }, node: id => { return onionoo .details({ lookup: id }) .then(response => { - const details = response.body; - if (details.relays && details.relays[0]) { - details.relays[0].type = 'relay'; - return details.relays[0]; - } else if (details.bridges && details.bridges[0]) { - details.bridges[0].type = 'bridge'; - return details.bridges[0]; + const relays = response.body.relays || []; + const bridges = response.body.bridges || []; + if (relays[0]) { + relays[0].type = 'relay'; + return relays[0]; + } else if (bridges[0]) { + bridges[0].type = 'bridge'; + return bridges[0]; } }); },