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

Fixes signer errors throwing // MaterialUI Update errors too (#2867) (#2876)

Browse Source
This commit is contained in:
Nicolas Gotchac
2016-10-26 11:56:38 +02:00
committed by Jaco Greeff
parent 3cd724d056
commit c05430e25e
8 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
js/src/api/transport/ws/ws.js
View File

@@ -93,21 +93,30 @@ export default class Ws extends JsonRpcBase {
}
_onMessage = (event) => {
const result = JSON.parse(event.data);
const { method, params, json, resolve, reject } = this._messages[result.id];
Logging.send(method, params, { json, result });
if (result.error) {
this.error(event.data);
reject(new Error(`${result.error.code}: ${result.error.message}`));
delete this._messages[result.id];
return;
// Event sent by Signer Broadcaster
if (event.data === 'new_message') {
return false;
}
resolve(result.result);
delete this._messages[result.id];
try {
const result = JSON.parse(event.data);
const { method, params, json, resolve, reject } = this._messages[result.id];
Logging.send(method, params, { json, result });
if (result.error) {
this.error(event.data);
reject(new Error(`${result.error.code}: ${result.error.message}`));
delete this._messages[result.id];
return;
}
resolve(result.result);
delete this._messages[result.id];
} catch (e) {
console.error('ws::_onMessage', event.data, e);
}
}
_send = (id) => {