Merge pull request #5 from avishkarabhishek786/master

Updated to SZ latest blockchainCloud_client.html version
This commit is contained in:
Abhishek Sinha 2020-01-31 22:52:35 +05:30 committed by GitHub
commit 5bc1d51fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8585,48 +8585,48 @@
return false; return false;
}, },
getInnerNodes: function (flo_addr1, flo_addr2, KB = this.supernodeKBucket) { getInnerNodes: function(flo_addr1, flo_addr2, KB = this.supernodeKBucket){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let kArrayFloIds = KB.toArray().map(k => k.floID); let kArrayFloIds = KB.toArray().map(k => k.floID);
var innerNodes = [] var innerNodes = []
if (kArrayFloIds.includes(flo_addr1) && kArrayFloIds.includes(flo_addr2)) { if(kArrayFloIds.includes(flo_addr1) && kArrayFloIds.includes(flo_addr2)){
for (var i = kArrayFloIds.indexOf(flo_addr1); i != flo_addr2; i++) { for(var i = kArrayFloIds.indexOf(flo_addr1); i!= flo_addr2; i++){
if (i >= kArrayFloIds.length) if(i >= kArrayFloIds.length)
i = -1 i = -1
else else
innerNodes.push(kArrayFloIds[i]) innerNodes.push(kArrayFloIds[i])
} }
resolve(innerNodes) resolve(innerNodes)
} else }else
reject('Given nodes are not in KBucket') reject('Given nodes are not in KBucket')
}); });
}, },
getOuterNodes: function (flo_addr1, flo_addr2, KB = this.supernodeKBucket) { getOuterNodes: function(flo_addr1, flo_addr2, KB = this.supernodeKBucket){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let kArrayFloIds = KB.toArray().map(k => k.floID); let kArrayFloIds = KB.toArray().map(k => k.floID);
var outterNodes = [] var outterNodes = []
if (kArrayFloIds.includes(flo_addr1) && kArrayFloIds.includes(flo_addr2)) { if(kArrayFloIds.includes(flo_addr1) && kArrayFloIds.includes(flo_addr2)){
for (var i = kArrayFloIds.indexOf(flo_addr2); i != flo_addr1; i++) { for(var i = kArrayFloIds.indexOf(flo_addr2); i!= flo_addr1; i++){
if (i >= kArrayFloIds.length) if(i >= kArrayFloIds.length)
i = -1 i = -1
else else
outterNodes.push(kArrayFloIds[i]) outterNodes.push(kArrayFloIds[i])
} }
resolve(outterNodes) resolve(outterNodes)
} else }else
reject('Given nodes are not in KBucket') reject('Given nodes are not in KBucket')
}); });
}, },
getPrevSupernode: function (flo_addr, n = 1, KB = this.supernodeKBucket) { getPrevSupernode: function(flo_addr, n = 1, KB = this.supernodeKBucket){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
let kArrayFloIds = KB.toArray().map(k => k.floID); let kArrayFloIds = KB.toArray().map(k => k.floID);
let pos = kArrayFloIds.indexOf(flo_addr) let pos = kArrayFloIds.indexOf(flo_addr)
var prevSupernode = [] var prevSupernode = []
for (var i = 1; i <= n; i++) { for(var i = 1; i <= n; i++){
if (pos - i < 0) if(pos - i < 0)
var prev = pos - i + kArrayFloIds.length var prev = pos - i + kArrayFloIds.length
else else
var prev = pos - i var prev = pos - i
@ -8639,14 +8639,14 @@
}); });
}, },
getNextSupernode: function (flo_addr, n = 1, KB = this.supernodeKBucket) { getNextSupernode: function(flo_addr, n = 1, KB = this.supernodeKBucket){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
try { try {
let kArrayFloIds = KB.toArray().map(k => k.floID); let kArrayFloIds = KB.toArray().map(k => k.floID);
let pos = kArrayFloIds.indexOf(flo_addr) let pos = kArrayFloIds.indexOf(flo_addr)
var nextSupernode = [] var nextSupernode = []
for (var i = 1; i <= n; i++) { for(var i = 1; i <= n; i++){
if (pos + i >= kArrayFloIds.length) if(pos + i >= kArrayFloIds.length)
var next = pos + i - kArrayFloIds.length var next = pos + i - kArrayFloIds.length
else else
var next = pos + i var next = pos + i
@ -8675,28 +8675,32 @@
} }
}, },
sendDataToSN(data, snfloID) { sendDataToSN(data, snfloID){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log(snfloID) console.log(snfloID)
var websocket = new WebSocket("wss://" + floGlobals.supernodes[snfloID].uri + "/ws"); var websocket = new WebSocket("wss://" + floGlobals.supernodes[snfloID].uri + "/ws");
websocket.onmessage = (evt => { websocket.onmessage = (evt => {
if (evt.data == '$+') { if(evt.data == '$+'){
websocket.send(data); websocket.send(data);
resolve(`Data sent to supernode : ${snfloID}`); resolve(`Data sent to supernode : ${snfloID}`);
} else if (evt.data == '$-') { }else if(evt.data == '$-'){
this.kBucket.getNextSupernode(snfloID) this.kBucket.getNextSupernode(snfloID).then(nextNode => {
.then(nextNode => this.sendDataToSN(data, nextNode[0])) this.sendDataToSN(data, nextNode[0])
.then(result => resolve(result))
.catch(error => reject(error)) .catch(error => reject(error))
} else { }).catch(error => reject(error))
}else{
console.log(evt.data) console.log(evt.data)
reject(evt.data) reject(evt.data)
} }
websocket.close(); websocket.close();
}) })
websocket.onerror = (evt) => { websocket.onerror = (evt) => {
this.kBucket.getNextSupernode(snfloID) this.kBucket.getNextSupernode(snfloID).then(nextNode => {
.then(nextNode => this.sendDataToSN(data, nextNode[0])) this.sendDataToSN(data, nextNode[0])
.then(result => resolve(result))
.catch(error => reject(error)) .catch(error => reject(error))
}).catch(error => reject(error))
}; };
}) })
}, },
@ -8715,26 +8719,30 @@
}); });
}, },
requestDataFromSN(request, snfloID) { requestDataFromSN(request, snfloID){
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
var websocket = new WebSocket("wss://" + floGlobals.supernodes[snfloID].uri + "/ws"); var websocket = new WebSocket("wss://" + floGlobals.supernodes[snfloID].uri + "/ws");
websocket.onmessage = (evt => { websocket.onmessage = (evt => {
if (evt.data == '$+') { if(evt.data == '$+'){
websocket.send(`?${request}`); websocket.send(`?${request}`);
} else if (evt.data == '$-') { }else if(evt.data == '$-'){
this.kBucket.getNextSupernode(snfloID) this.kBucket.getNextSupernode(snfloID).then(nextNode => {
.then(nextNode => this.requestDataFromSN(request, nextNode[0])) this.requestDataFromSN(request, nextNode[0])
.then(result => resolve(result))
.catch(error => reject(error)) .catch(error => reject(error))
}).catch(error => reject(error))
websocket.close() websocket.close()
} else { }else{
resolve(evt.data); resolve(evt.data);
websocket.close(); websocket.close();
} }
}) })
websocket.onerror = (evt) => { websocket.onerror = (evt) => {
this.kBucket.getNextSupernode(snfloID) this.kBucket.getNextSupernode(snfloID).then(nextNode => {
.then(nextNode => this.requestDataFromSN(request, nextNode[0])) this.requestDataFromSN(request, nextNode[0])
.then(result => resolve(result))
.catch(error => reject(error)) .catch(error => reject(error))
}).catch(error => reject(error))
}; };
}) })
}, },
@ -9767,7 +9775,7 @@
} }
</script> </script>
<script> <script>
const cloudArticleApp = { const cloudArticleApp = {
@ -10268,7 +10276,7 @@
} }
</script> </script>
</body> </body>