Merge pull request #52 from TrustyFund/feature/nodes-manager-ping-nod…

…es-fix fx nodes pinging
TrustyFund · Apr 2, 2018 · 1d0f75a · 1d0f75a
2 parents 81465df + acbb8d0
commit 1d0f75a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/services/api/chain-listener.js b/src/services/api/chain-listener.js
@@ -9,13 +9,13 @@ class ChainListener {
     this._subscribers = [];
     this._enabled = false;
   }
-  enable() {
-    if (this._enabled) this.disable();
+  async enable() {
+    if (this._enabled) await this.disable();
     Apis.instance().db_api().exec('set_subscribe_callback', [this._mainCallback.bind(this), true]);
     this._enabled = true;
   }
   disable() {
-    Apis.instance().db_api().exec('cancel_all_subscriptions', []).then(() => {
+    return Apis.instance().db_api().exec('cancel_all_subscriptions', []).then(() => {
       this._enabled = false;
     });
   }

diff --git a/src/services/api/nodes-manager.js b/src/services/api/nodes-manager.js
@@ -14,6 +14,7 @@ class NodesManager {
   // gets nodes ping data from storage
   _retrieveCachedNodesData() {
     const cachedData = PersistentStorage.getSavedNodesData();
+    if (!cachedData) return;
     Object.keys(this._nodes).forEach(url => {
       const cachedNode = cachedData[url];
       if (cachedNode && cachedNode.ping && typeof (cachedNode.ping) === 'number') {
@@ -54,16 +55,13 @@ class NodesManager {
   testNodesPings() {
     const cachedData = PersistentStorage.getSavedNodesData();
     if (cachedData) return;
-    // return new Promise((resolve) => {
     Promise.all(Object.keys(this._nodes).map(async (url) => {
       if (url !== this._selectedNodeUrl) {
         this._nodes[url].ping = await NodesManager._pingNode(url);
       }
     })).then(() => {
-      PersistentStorage.saveNodesData({ data: this._nodes }, { expires: 1 });
-      // resolve();
+      PersistentStorage.saveNodesData({ data: this._nodes });
     });
-    // });
   }
 
   // retrieves nodes data from cache, selects fastest & returns it's url

diff --git a/src/services/persistent-storage.js b/src/services/persistent-storage.js
@@ -38,14 +38,14 @@ const PersistentStorage = {
     Cookies.remove('BITSHARES_USER_BRAINKEY');
   },
   saveNodesData: ({ data }) => {
-    Cookies.set('BITSHARES_NODES', data);
+    Cookies.set('BITSHARES_NODES', data, { expires: 1 });
   },
   getSavedNodesData: () => {
     const cachedData = Cookies.getJSON('BITSHARES_NODES');
     if (typeof (cachedData) === 'object' && cachedData !== null) {
       return cachedData;
     }
-    return {};
+    return null;
   },
   getOpenledgerAddresses: () => {
     const cachedData = Cookies.getJSON('BITSHARES_OPENLEDGER_ADDRESSES');