Initial new UI source code import (#2607)
* address -> name mappings * expanding, loading all coin details * send use only actual BasicCoin tokens registered (any reg) * sending token & accounts * form styling updates * send form layout in place * coin send working as expected * api subscriptions on multiple addresses * bring in events * simplify * basic events display in-place, functionally complete * basic functionality in-place * fix horrible event address issue * rwork display of events slightly * test TLA availability * table for owner -> tokens * fix signature lookup address * fix signature lookup address * basic overview styling * txhash links * page layout adjustments * background import * adjust colors * no global registration, simplify color selection * updated styling * connection dialog for "busy connecting" * initial token connection - WIP * init token updates take place * basic test for manual token * rework connection display * allow updates of the secure token * first stab at making the build build * update runner tags * fix linting issues * skip tests requiring network (should be e2e, TODO) * re-enable javascript tag/runner * release push does the trick * push to any branch, CI name * javscript-test runner as well * swap dependencies build requires test * revert stages swap * retrieve images associated with tokens * remove js build deps order * null image when hash = 0x0 * 6x64 images (hashes for registries) * don't pass tokens as prop to IdentityIcon * check images against content hash pictures * cleanup signer after connection changes * fix naming typo * display unknownImages for balances (not available as content hash) * unknownImage for transfer dialog * basic githubhint layout * single input for commit/filename * ethcore_hashContent call * lookup hash * registration in place * fixes * events is using a proper table * pass value through as-is * stop wrongly using main app IdentityIcon * NEVER export class instance functions * alignment back to normal * typo in definition * set & get images working (mostly) * show content retrieval info * set exitcode via || * use javascript:latest images * disable npm progress bar * rename phase I * rename phase II * only send build output to GitHub on major branches * also run the build step as part of the test (until comprehensive) * ci-specific build (no webpack progress) * allow for account creation via recovery phrase * display account uuid (where available), closes #2546 * connection dialog now shows up in dapps as well, closes #2538 * token images show up as expected * IdentityName component added and deployed * fix padding tests * adjust tests to map to stricter 0x-prefixed hex * render names via common component for the address -> name * split lint into seperate script (early exit) * test phases changed to lint, test & pack * pack part of test phase * remove files marked for deletion (cleanup) * Signer cleanups, start moving in the direction of the rest * add personal signer methods * basic signer request subscription * don't poll blockNumber when not connected * missing return, creating massive ws queue backlogs * ΞTH -> ETH * fix failing tests * registry uses setAddress to actually set addresses now * bytes mapping operates on lowerCase hex strings * sha3 ids for each application * add dappreg to list of contracts * adjust alignment of queries * show gas estimation log * abi with payable for register function * add key as required * image retrieval from dappreg * use proper Image urls * embed and link apps from Parity, retrieved via /api/apps * filter apps that has been replaced * proxy entry for parity-utils * add basiccoin abi * add support for fallback abi type * capture constructor paramaters * merge master into js * move images to assets/images/ * add font assets * import fonts as part of build * don't inline woff files * Revert "merge master into js" This reverts commit cfcfa81bd26f1b3cbc748d3afa1eb5c670b363fe. * remove unused npm packages * information on gas estimates (like almost everywhere else) * don't pass gas & gasPrice to estimation * display account passwordhint when available * signer subscriptions based on polling & function trapping * pending requests retrieved via jsapi * update signer middleware * remove all web3 instances * remove web3 package * last web3 dependencies removed * no need to toChecksumAddress - api takes care of it * expand description for personal_confirmRequest * Signer conversion from web3 -> parity.js completed * explicit in no return * green circle background * remove generated background * convert /api/* paths to localhost:8080/api/* paths (hard-coded, temporary) * change dapps to load from localhost:8080/ui/* * remove dangling web3 files * update manager test for signer * /api/ping -> / * additional token images * additional token images * add missing styles.css for 8180 error pages * cater for txhash returning null/empty object * adjust output directories * Release merge with origin with ours strategy * additional token images * cater for development server * s/localhost/127.0.0.1/ (cater for origin) * Fix address selection for contract deployment * Adjust z-index for error overlay * better text on unique background pattern * fix signer rejections * Don't allow gavcoin transfer with no balance * fix txhash rendering in signer * remove unnecessary ParityBackground * script to update js-precompiled * Redirect from :8080 to :8180 * Remove extra return * Dapp logo images
This commit is contained in:
29
js/src/api/transport/http/http.e2e.js
Normal file
29
js/src/api/transport/http/http.e2e.js
Normal file
@@ -0,0 +1,29 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import Http from './http';
|
||||
|
||||
const http = new Http('http://localhost:8545');
|
||||
|
||||
describe('transport/Http', () => {
|
||||
it('connects and makes a call to web3_clientVersion', () => {
|
||||
return http.execute('web3_clientVersion').then((version) => {
|
||||
const [client] = version.split('/');
|
||||
|
||||
expect(client === 'Geth' || client === 'Parity').to.be.ok;
|
||||
});
|
||||
});
|
||||
});
|
||||
76
js/src/api/transport/http/http.js
Normal file
76
js/src/api/transport/http/http.js
Normal file
@@ -0,0 +1,76 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { Logging } from '../../subscriptions';
|
||||
import JsonRpcBase from '../jsonRpcBase';
|
||||
|
||||
/* global fetch */
|
||||
export default class Http extends JsonRpcBase {
|
||||
constructor (url) {
|
||||
super();
|
||||
|
||||
this._connected = true;
|
||||
this._url = url;
|
||||
}
|
||||
|
||||
_encodeOptions (method, params) {
|
||||
const json = this.encode(method, params);
|
||||
|
||||
this.log(json);
|
||||
|
||||
return {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
'Content-Type': 'application/json',
|
||||
'Content-Length': json.length
|
||||
},
|
||||
body: json
|
||||
};
|
||||
}
|
||||
|
||||
execute (method, ...params) {
|
||||
const request = this._encodeOptions(method, params);
|
||||
|
||||
return fetch(this._url, request)
|
||||
.catch((error) => {
|
||||
this._connected = false;
|
||||
throw error;
|
||||
})
|
||||
.then((response) => {
|
||||
this._connected = true;
|
||||
|
||||
if (response.status !== 200) {
|
||||
this._connected = false;
|
||||
this.error(JSON.stringify({ status: response.status, statusText: response.statusText }));
|
||||
throw new Error(`${response.status}: ${response.statusText}`);
|
||||
}
|
||||
|
||||
return response.json();
|
||||
})
|
||||
.then((response) => {
|
||||
Logging.send(method, params, { request, response });
|
||||
|
||||
if (response.error) {
|
||||
this.error(JSON.stringify(response));
|
||||
throw new Error(`${response.error.code}: ${response.error.message}`);
|
||||
}
|
||||
|
||||
this.log(JSON.stringify(response));
|
||||
return response.result;
|
||||
});
|
||||
}
|
||||
}
|
||||
122
js/src/api/transport/http/http.spec.js
Normal file
122
js/src/api/transport/http/http.spec.js
Normal file
@@ -0,0 +1,122 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { TEST_HTTP_URL, mockHttp } from '../../../../test/mockRpc';
|
||||
import Http from './http';
|
||||
|
||||
const transport = new Http(TEST_HTTP_URL);
|
||||
|
||||
describe('api/transport/Http', () => {
|
||||
describe('instance', () => {
|
||||
it('encodes the options correctly', () => {
|
||||
const opt = transport._encodeOptions('someMethod', ['param']);
|
||||
const enc = {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Accept': 'application/json',
|
||||
'Content-Type': 'application/json',
|
||||
'Content-Length': 65
|
||||
},
|
||||
body: `{"jsonrpc":"2.0","method":"someMethod","params":["param"],"id":${transport._id - 1}}`
|
||||
};
|
||||
|
||||
expect(opt).to.deep.equal(enc);
|
||||
});
|
||||
});
|
||||
|
||||
describe('transport', () => {
|
||||
const RESULT = ['this is some result'];
|
||||
|
||||
let scope;
|
||||
let result;
|
||||
|
||||
beforeEach(() => {
|
||||
scope = mockHttp([{ method: 'eth_call', reply: { result: RESULT } }]);
|
||||
|
||||
return transport
|
||||
.execute('eth_call', 1, 2, 3, 'test')
|
||||
.then((_result) => {
|
||||
result = _result;
|
||||
});
|
||||
});
|
||||
|
||||
it('makes POST', () => {
|
||||
expect(scope.isDone()).to.be.true;
|
||||
});
|
||||
|
||||
it('sets jsonrpc', () => {
|
||||
expect(scope.body.eth_call.jsonrpc).to.equal('2.0');
|
||||
});
|
||||
|
||||
it('sets the method', () => {
|
||||
expect(scope.body.eth_call.method).to.equal('eth_call');
|
||||
});
|
||||
|
||||
it('passes the params', () => {
|
||||
expect(scope.body.eth_call.params).to.deep.equal([1, 2, 3, 'test']);
|
||||
});
|
||||
|
||||
it('increments the id', () => {
|
||||
expect(scope.body.eth_call.id).not.to.equal(0);
|
||||
});
|
||||
|
||||
it('passes the actual result back', () => {
|
||||
expect(result).to.deep.equal(RESULT);
|
||||
});
|
||||
});
|
||||
|
||||
describe('HTTP errors', () => {
|
||||
let scope;
|
||||
let error;
|
||||
|
||||
beforeEach(() => {
|
||||
scope = mockHttp([{ method: 'eth_call', reply: {}, code: 500 }]);
|
||||
|
||||
return transport
|
||||
.execute('eth_call')
|
||||
.catch((_error) => {
|
||||
error = _error;
|
||||
});
|
||||
});
|
||||
|
||||
it('returns HTTP errors as throws', () => {
|
||||
expect(scope.isDone()).to.be.true;
|
||||
expect(error.message).to.match(/Internal Server Error/);
|
||||
});
|
||||
});
|
||||
|
||||
describe('RPC errors', () => {
|
||||
const ERROR = { code: -1, message: 'ERROR: RPC failure' };
|
||||
|
||||
let scope;
|
||||
let error;
|
||||
|
||||
beforeEach(() => {
|
||||
scope = mockHttp([{ method: 'eth_call', reply: { error: ERROR } }]);
|
||||
|
||||
return transport
|
||||
.execute('eth_call')
|
||||
.catch((_error) => {
|
||||
error = _error;
|
||||
});
|
||||
});
|
||||
|
||||
it('returns RPC errors as throws', () => {
|
||||
expect(scope.isDone()).to.be.true;
|
||||
expect(error.message).to.match(/RPC failure/);
|
||||
});
|
||||
});
|
||||
});
|
||||
17
js/src/api/transport/http/index.js
Normal file
17
js/src/api/transport/http/index.js
Normal file
@@ -0,0 +1,17 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default from './http';
|
||||
18
js/src/api/transport/index.js
Normal file
18
js/src/api/transport/index.js
Normal file
@@ -0,0 +1,18 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export Http from './http';
|
||||
export Ws from './ws';
|
||||
62
js/src/api/transport/jsonRpcBase.js
Normal file
62
js/src/api/transport/jsonRpcBase.js
Normal file
@@ -0,0 +1,62 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default class JsonRpcBase {
|
||||
constructor () {
|
||||
this._id = 1;
|
||||
this._debug = false;
|
||||
this._connected = false;
|
||||
}
|
||||
|
||||
encode (method, params) {
|
||||
const json = JSON.stringify({
|
||||
jsonrpc: '2.0',
|
||||
method: method,
|
||||
params: params,
|
||||
id: this._id++
|
||||
});
|
||||
|
||||
return json;
|
||||
}
|
||||
|
||||
get id () {
|
||||
return this._id;
|
||||
}
|
||||
|
||||
get isDebug () {
|
||||
return this._debug;
|
||||
}
|
||||
|
||||
get isConnected () {
|
||||
return this._connected;
|
||||
}
|
||||
|
||||
setDebug (flag) {
|
||||
this._debug = flag;
|
||||
}
|
||||
|
||||
error (error) {
|
||||
if (this.isDebug) {
|
||||
console.error(error);
|
||||
}
|
||||
}
|
||||
|
||||
log (log) {
|
||||
if (this.isDebug) {
|
||||
console.log(log);
|
||||
}
|
||||
}
|
||||
}
|
||||
88
js/src/api/transport/jsonRpcBase.spec.js
Normal file
88
js/src/api/transport/jsonRpcBase.spec.js
Normal file
@@ -0,0 +1,88 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import sinon from 'sinon';
|
||||
|
||||
import JsonRpcBase from './jsonRpcBase';
|
||||
|
||||
const base = new JsonRpcBase();
|
||||
|
||||
describe('api/transport/JsonRpcBase', () => {
|
||||
describe('encode', () => {
|
||||
it('encodes the body correctly, incrementing id', () => {
|
||||
const id = base.id;
|
||||
const bdy = base.encode('someMethod', ['param1', 'param2']);
|
||||
const enc = `{"jsonrpc":"2.0","method":"someMethod","params":["param1","param2"],"id":${id}}`;
|
||||
|
||||
expect(bdy).to.equal(enc);
|
||||
expect(base.id - id).to.equal(1);
|
||||
});
|
||||
});
|
||||
|
||||
describe('setDebug', () => {
|
||||
it('starts with disabled flag', () => {
|
||||
expect(base.isDebug).to.be.false;
|
||||
});
|
||||
|
||||
it('true flag switches on', () => {
|
||||
base.setDebug(true);
|
||||
expect(base.isDebug).to.be.true;
|
||||
});
|
||||
|
||||
it('false flag switches off', () => {
|
||||
base.setDebug(true);
|
||||
expect(base.isDebug).to.be.true;
|
||||
base.setDebug(false);
|
||||
expect(base.isDebug).to.be.false;
|
||||
});
|
||||
|
||||
describe('logging', () => {
|
||||
beforeEach(() => {
|
||||
sinon.spy(console, 'log');
|
||||
sinon.spy(console, 'error');
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
console.log.restore();
|
||||
console.error.restore();
|
||||
});
|
||||
|
||||
it('does not log errors with flag off', () => {
|
||||
base.setDebug(false);
|
||||
base.log('error');
|
||||
expect(console.log).to.not.be.called;
|
||||
});
|
||||
|
||||
it('does not log errors with flag off', () => {
|
||||
base.setDebug(false);
|
||||
base.error('error');
|
||||
expect(console.error).to.not.be.called;
|
||||
});
|
||||
|
||||
it('does log errors with flag on', () => {
|
||||
base.setDebug(true);
|
||||
base.log('error');
|
||||
expect(console.log).to.be.called;
|
||||
});
|
||||
|
||||
it('does log errors with flag on', () => {
|
||||
base.setDebug(true);
|
||||
base.error('error');
|
||||
expect(console.error).to.be.called;
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
17
js/src/api/transport/ws/index.js
Normal file
17
js/src/api/transport/ws/index.js
Normal file
@@ -0,0 +1,17 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
export default from './ws';
|
||||
29
js/src/api/transport/ws/ws.e2e.js
Normal file
29
js/src/api/transport/ws/ws.e2e.js
Normal file
@@ -0,0 +1,29 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import Ws from './ws';
|
||||
|
||||
const ws = new Ws('ws://localhost:8546/');
|
||||
|
||||
describe('transport/Ws', () => {
|
||||
it('connects and makes a call to web3_clientVersion', () => {
|
||||
return ws.execute('web3_clientVersion').then((version) => {
|
||||
const [client] = version.split('/');
|
||||
|
||||
expect(client === 'Geth' || client === 'Parity').to.be.ok;
|
||||
});
|
||||
});
|
||||
});
|
||||
148
js/src/api/transport/ws/ws.js
Normal file
148
js/src/api/transport/ws/ws.js
Normal file
@@ -0,0 +1,148 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { keccak_256 } from 'js-sha3'; // eslint-disable-line camelcase
|
||||
|
||||
import { Logging } from '../../subscriptions';
|
||||
import JsonRpcBase from '../jsonRpcBase';
|
||||
|
||||
/* global WebSocket */
|
||||
export default class Ws extends JsonRpcBase {
|
||||
constructor (url, token) {
|
||||
super();
|
||||
|
||||
this._url = url;
|
||||
this._token = token;
|
||||
this._messages = {};
|
||||
|
||||
this._connecting = true;
|
||||
this._lastError = null;
|
||||
this._autoConnect = false;
|
||||
|
||||
this._connect();
|
||||
}
|
||||
|
||||
updateToken (token) {
|
||||
this._token = token;
|
||||
this._autoConnect = false;
|
||||
|
||||
this._connect();
|
||||
}
|
||||
|
||||
_connect () {
|
||||
const time = parseInt(new Date().getTime() / 1000, 10);
|
||||
const sha3 = keccak_256(`${this._token}:${time}`);
|
||||
const hash = `${sha3}_${time}`;
|
||||
|
||||
if (this._ws) {
|
||||
this._ws.onerror = null;
|
||||
this._ws.onopen = null;
|
||||
this._ws.onclose = null;
|
||||
this._ws.onmessage = null;
|
||||
this._ws = null;
|
||||
}
|
||||
|
||||
this._connecting = true;
|
||||
this._connected = false;
|
||||
this._lastError = null;
|
||||
|
||||
this._ws = new WebSocket(this._url, hash);
|
||||
this._ws.onerror = this._onError;
|
||||
this._ws.onopen = this._onOpen;
|
||||
this._ws.onclose = this._onClose;
|
||||
this._ws.onmessage = this._onMessage;
|
||||
}
|
||||
|
||||
_onOpen = (event) => {
|
||||
console.log('ws:onOpen', event);
|
||||
this._connected = true;
|
||||
this._connecting = false;
|
||||
this._autoConnect = true;
|
||||
|
||||
Object.keys(this._messages)
|
||||
.filter((id) => this._messages[id].queued)
|
||||
.forEach(this._send);
|
||||
}
|
||||
|
||||
_onClose = (event) => {
|
||||
console.log('ws:onClose', event);
|
||||
this._connected = false;
|
||||
this._connecting = false;
|
||||
|
||||
if (this._autoConnect) {
|
||||
this._connect();
|
||||
}
|
||||
}
|
||||
|
||||
_onError = (event) => {
|
||||
console.error('ws:onError', event);
|
||||
this._lastError = event;
|
||||
}
|
||||
|
||||
_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;
|
||||
}
|
||||
|
||||
resolve(result.result);
|
||||
delete this._messages[result.id];
|
||||
}
|
||||
|
||||
_send = (id) => {
|
||||
const message = this._messages[id];
|
||||
|
||||
message.queued = !this._connected;
|
||||
|
||||
if (this._connected) {
|
||||
this._ws.send(message.json);
|
||||
}
|
||||
}
|
||||
|
||||
execute (method, ...params) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const id = this.id;
|
||||
const json = this.encode(method, params);
|
||||
|
||||
this._messages[id] = { id, method, params, json, resolve, reject };
|
||||
this._send(id);
|
||||
});
|
||||
}
|
||||
|
||||
get token () {
|
||||
return this._token;
|
||||
}
|
||||
|
||||
get isAutoConnect () {
|
||||
return this._autoConnect;
|
||||
}
|
||||
|
||||
get isConnecting () {
|
||||
return this._connecting;
|
||||
}
|
||||
|
||||
get lastError () {
|
||||
return this._lastError;
|
||||
}
|
||||
}
|
||||
85
js/src/api/transport/ws/ws.spec.js
Normal file
85
js/src/api/transport/ws/ws.spec.js
Normal file
@@ -0,0 +1,85 @@
|
||||
// Copyright 2015, 2016 Ethcore (UK) Ltd.
|
||||
// This file is part of Parity.
|
||||
|
||||
// Parity is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
|
||||
// Parity is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { TEST_WS_URL, mockWs } from '../../../../test/mockRpc';
|
||||
import Ws from './ws';
|
||||
|
||||
describe('api/transport/Ws', () => {
|
||||
let transport;
|
||||
let scope;
|
||||
|
||||
describe('transport', () => {
|
||||
let result;
|
||||
|
||||
beforeEach(() => {
|
||||
scope = mockWs([{ method: 'test_anyCall', reply: 'TestResult' }]);
|
||||
transport = new Ws(TEST_WS_URL);
|
||||
|
||||
return transport
|
||||
.execute('test_anyCall', 1, 2, 3)
|
||||
.then((_result) => {
|
||||
result = _result;
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
scope.stop();
|
||||
});
|
||||
|
||||
it('makes call', () => {
|
||||
expect(scope.isDone()).to.be.true;
|
||||
});
|
||||
|
||||
it('sets jsonrpc', () => {
|
||||
expect(scope.body.test_anyCall.jsonrpc).to.equal('2.0');
|
||||
});
|
||||
|
||||
it('sets the method', () => {
|
||||
expect(scope.body.test_anyCall.method).to.equal('test_anyCall');
|
||||
});
|
||||
|
||||
it('passes the params', () => {
|
||||
expect(scope.body.test_anyCall.params).to.deep.equal([1, 2, 3]);
|
||||
});
|
||||
|
||||
it('increments the id', () => {
|
||||
expect(scope.body.test_anyCall.id).not.to.equal(0);
|
||||
});
|
||||
|
||||
it('passes the actual result back', () => {
|
||||
expect(result).to.equal('TestResult');
|
||||
});
|
||||
});
|
||||
|
||||
describe('errors', () => {
|
||||
beforeEach(() => {
|
||||
scope = mockWs([{ method: 'test_anyCall', reply: { error: { code: 1, message: 'TestError' } } }]);
|
||||
transport = new Ws(TEST_WS_URL);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
scope.stop();
|
||||
});
|
||||
|
||||
it('returns RPC errors when encountered', () => {
|
||||
return transport
|
||||
.execute('test_anyCall')
|
||||
.catch((error) => {
|
||||
expect(error).to.match(/TestError/);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user