grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to fix WS race condition connection (#4976)

Browse Source 
* Try to fix wrong token logic

* Linting
This commit is contained in:
Nicolas Gotchac 2017-03-21 17:01:33 +01:00 committed by Jaco Greeff
parent cb881108c3
commit c7e6992239
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
js/src/secureApi.js
View File

@ -241,7 +241,7 @@ export default class SecureApi extends Api {
this.transport.updateToken(token, false);
log.debug('connecting with token', token);
return this.transport.connect()
const connectPromise = this.transport.connect()
.then(() => {
log.debug('connected with', token);
@ -258,26 +258,35 @@ export default class SecureApi extends Api {
log.debug('did not connect ; error', error);
}
// Check if the Node is up
return this.isNodeUp()
.then((isNodeUp) => {
// If it's not up, try again in a few...
if (!isNodeUp) {
const timeout = this.transport.retryTimeout;
return false;
});
log.debug('node is not up ; will try again in', timeout, 'ms');
return Promise
.all([
connectPromise,
this.isNodeUp()
])
.then(([ connected, isNodeUp ]) => {
if (connected) {
return true;
}
return new Promise((resolve, reject) => {
window.setTimeout(() => {
this._connectWithToken(token).then(resolve).catch(reject);
}, timeout);
});
}
// If it's not up, try again in a few...
if (!isNodeUp) {
const timeout = this.transport.retryTimeout;
// The token is invalid
log.debug('tried with a wrong token', token);
return false;
log.debug('node is not up ; will try again in', timeout, 'ms');
return new Promise((resolve, reject) => {
window.setTimeout(() => {
this._connectWithToken(token).then(resolve).catch(reject);
}, timeout);
});
}
// The token is invalid
log.debug('tried with a wrong token', token);
return false;
});
}