fix: check status and version to find peers (#30)

* fix: check status and version to find peers * test: fix peer version in v2 test * refactor: use cloneDeep for peer list * fix: clonedeep instead of cloneDeep * chore: bump version * docs: update changelog
ArkEcosystem · Jan 29, 2019 · 0f008f8 · 0f008f8
1 parent 3dc0386
commit 0f008f8
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 0.1.20 - 2019-01-28
+
+### Fixed
+- Check status and version to find peers
+- Clone peer list as to not overwrite default network peers
+
 ## 0.1.19 - 2019-01-25
 
 ### Changed

diff --git a/__tests__/client.test.js b/__tests__/client.test.js
@@ -105,7 +105,8 @@ describe('API - Client', () => {
         const apiPeers = peers.map(peer => {
           return {
             ...peer,
-            status: 200
+            status: 200,
+            version: '2.0.0'
           }
         })
 

diff --git a/lib/index.js b/lib/index.js
@@ -1,4 +1,5 @@
 const shuffle = require('lodash.shuffle')
+const cloneDeep = require('lodash.clonedeep')
 const HttpClient = require('./http')
 const resources = require('./resources')
 const initialPeers = require('./peers')
@@ -19,6 +20,10 @@ const mergePeerArrays = (oldArray, newArray) => {
   return peers
 }
 
+const getPeerVersion = (peer) => {
+  return !peer.version || /^1\./.test(peer.version) ? 1 : 2
+}
+
 module.exports = class ApiClient {
   /**
    * Finds all the available peers, sorted by block height and delay
@@ -38,10 +43,7 @@ module.exports = class ApiClient {
     shuffle(networkPeers)
 
     const selfIps = ['127.0.0.1', '::ffff:127.0.0.1', '::1']
-    const versionStatus = {
-      1: 'OK',
-      2: 200
-    }
+    const versionStatus = ['OK', 200]
 
     // Connect to each peer to get an updated list of peers until a success response
     const client = new ApiClient('http://', version)
@@ -69,7 +71,7 @@ module.exports = class ApiClient {
         if (responsePeers.length) {
           // Ignore local and unavailable peers
           responsePeers = responsePeers.filter(peer => {
-            return selfIps.indexOf(peer.ip) === -1 && peer.status === versionStatus[version]
+            return selfIps.indexOf(peer.ip) === -1 && versionStatus.includes(peer.status) && getPeerVersion(peer) === version
           })
 
           peers = mergePeerArrays(peers, responsePeers)
@@ -86,7 +88,7 @@ module.exports = class ApiClient {
     }
 
     // Return at least the initial (hardcoded) peers
-    return sortPeers(peers && peers.length ? peers : networkPeers)
+    return cloneDeep(sortPeers(peers && peers.length ? peers : networkPeers))
   }
 
   /**

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@arkecosystem/client",
   "description": "A JavaScript library to interact with the Ark Blockchain",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "contributors": [
     "Brian Faust <brian@ark.io>",
     "Alex Barnsley <alex@ark.io>",
@@ -30,6 +30,7 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
+    "lodash.clonedeep": "^4.5.0",
     "lodash.orderby": "^4.6.0",
     "lodash.shuffle": "^4.2.0"
   },

diff --git a/yarn.lock b/yarn.lock
@@ -4208,6 +4208,11 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"