From 2bf166ffd16765a9553b42c47bc2e73cc3df4367 Mon Sep 17 00:00:00 2001 From: sairajzero Date: Fri, 31 Jan 2020 20:22:35 +0530 Subject: [PATCH] bug fix: floSupernode module --- standard_Operations.html | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/standard_Operations.html b/standard_Operations.html index e073766..1a2a1e1 100644 --- a/standard_Operations.html +++ b/standard_Operations.html @@ -7638,16 +7638,17 @@ Bitcoin.Util = { sendDataToSN(data, snfloID){ return new Promise((resolve, reject) => { - console.log(snfloID) var websocket = new WebSocket("wss://" + floGlobals.supernodes[snfloID].uri + "/ws"); websocket.onmessage = (evt => { if(evt.data == '$+'){ websocket.send(data); resolve(`Data sent to supernode : ${snfloID}`); }else if(evt.data == '$-'){ - this.kBucket.getNextSupernode(snfloID) - .then(nextNode => this.sendDataToSN(data, nextNode[0])) - .catch(error => reject(error)) + this.kBucket.getNextSupernode(snfloID).then(nextNode => { + this.sendDataToSN(data, nextNode[0]) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) }else{ console.log(evt.data) reject(evt.data) @@ -7655,9 +7656,11 @@ Bitcoin.Util = { websocket.close(); }) websocket.onerror = (evt) => { - this.kBucket.getNextSupernode(snfloID) - .then(nextNode => this.sendDataToSN(data, nextNode[0])) - .catch(error => reject(error)) + this.kBucket.getNextSupernode(snfloID).then(nextNode => { + this.sendDataToSN(data, nextNode[0]) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) }; }) }, @@ -7682,9 +7685,11 @@ Bitcoin.Util = { if(evt.data == '$+'){ websocket.send(`?${request}`); }else if(evt.data == '$-'){ - this.kBucket.getNextSupernode(snfloID) - .then(nextNode => this.requestDataFromSN(request, nextNode[0])) - .catch(error => reject(error)) + this.kBucket.getNextSupernode(snfloID).then(nextNode => { + this.requestDataFromSN(request, nextNode[0]) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) websocket.close() }else{ resolve(evt.data); @@ -7692,9 +7697,11 @@ Bitcoin.Util = { } }) websocket.onerror = (evt) => { - this.kBucket.getNextSupernode(snfloID) - .then(nextNode => this.requestDataFromSN(request, nextNode[0])) - .catch(error => reject(error)) + this.kBucket.getNextSupernode(snfloID).then(nextNode => { + this.requestDataFromSN(request, nextNode[0]) + .then(result => resolve(result)) + .catch(error => reject(error)) + }).catch(error => reject(error)) }; }) },