diff --git a/index.html b/index.html index c0750af..313addb 100644 --- a/index.html +++ b/index.html @@ -10216,37 +10216,40 @@ util: { serverList: floGlobals.apiURL[floGlobals.blockchain].slice(0), curPos: floCrypto.randInt(0, floGlobals.apiURL[floGlobals.blockchain].length - 1), - fetch_retry: function(apicall){ - return new Promise((resolve,reject) => { - this.serverList.splice(this.curPos, 1); - this.curPos = floCrypto.randInt(0, this.serverList.length - 1) - this.fetch_api(apicall) - .then(result => resolve(result)) - .catch(error => reject(error)); - }) - }, - fetch_api: function(apicall){ - return new Promise((resolve, reject) => { - if(this.serverList.length === 0) - reject("No floSight server working") - else{ - fetch(this.serverList[this.curPos] + apicall).then(response => { - if(response.ok) - response.json().then(data => resolve(data)); - else{ - this.fetch_retry(apicall) - .then(result => resolve(result)) - .catch(error => reject(error)); - } - }).catch(error => { - this.fetch_retry(apicall) + fetch_retry: function (apicall, rm_flosight) { + return new Promise((resolve, reject) => { + let i = this.serverList.indexOf(rm_flosight) + if(i != -1) + this.serverList.splice(i, 1); + this.curPos = floCrypto.randInt(0, this.serverList.length) + this.fetch_api(apicall) + .then(result => resolve(result)) + .catch(error => reject(error)); + }) + }, + fetch_api: function (apicall) { + return new Promise((resolve, reject) => { + if (this.serverList.length === 0) + reject("No floSight server working") + else { + let flosight = this.serverList[this.curPos]; + fetch(flosight + apicall).then(response => { + if (response.ok) + response.json().then(data => resolve(data)); + else { + this.fetch_retry(apicall, flosight) .then(result => resolve(result)) .catch(error => reject(error)); - }) - } - }) - } - }, + } + }).catch(error => { + this.fetch_retry(apicall, flosight) + .then(result => resolve(result)) + .catch(error => reject(error)); + }) + } + }) + } + }, //Promised function to get data from API promisedAPI: function (apicall) {