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

Update for non HTTP use

Browse Source
This commit is contained in:
Jaco Greeff 2017-08-30 12:47:14 +02:00
parent be56a06790
commit 5b8236cdbd
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/index.parity.js
View File

@ -52,8 +52,7 @@ if (window.location.hash && window.location.hash.indexOf(AUTH_HASH) === 0) {
token = qs.parse(window.location.hash.substr(AUTH_HASH.length)).token; token = qs.parse(window.location.hash.substr(AUTH_HASH.length)).token;
} }
const uiUrl = window.location.host; const api = new SecureApi(window.location.host, token);
const api = new SecureApi(uiUrl, token);
ContractInstances.get(api); ContractInstances.get(api);

35
js/src/secureApi.js
View File

@ -22,6 +22,9 @@ import { LOG_KEYS, getLogger } from '@parity/shared/config';
const log = getLogger(LOG_KEYS.Signer); const log = getLogger(LOG_KEYS.Signer);
const RPC_URL = '127.0.0.1:8545';
const WS_URL = '127.0.0.1:8546';
export default class SecureApi extends Api { export default class SecureApi extends Api {
_isConnecting = false; _isConnecting = false;
_needsToken = false; _needsToken = false;
@ -32,13 +35,17 @@ export default class SecureApi extends Api {
_wsUrl = null; _wsUrl = null;
_url = null; _url = null;
static getTransport (url, sysuiToken, protocol) { static getHttpProvider (url = RPC_URL, protocol) {
const transportUrl = SecureApi.transportUrl(url, protocol); return new Api.Provider.Http(`${protocol}//${url}/rpc`, 0);
}
static getWsProvider (url = WS_URL, protocol, sysuiToken) {
const transportUrl = SecureApi.transportWsUrl(url, protocol);
return new Api.Provider.Ws(transportUrl, sysuiToken, false); return new Api.Provider.Ws(transportUrl, sysuiToken, false);
} }
static transportUrl (url, protocol) { static transportWsUrl (url, protocol) {
const proto = protocol() === 'https:' ? 'wss:' : 'ws:'; const proto = protocol() === 'https:' ? 'wss:' : 'ws:';
return `${proto}//${url}`; return `${proto}//${url}`;
@ -51,23 +58,29 @@ export default class SecureApi extends Api {
: window.location.protocol; : window.location.protocol;
} }
constructor (uiUrl, nextToken, getTransport = SecureApi.getTransport, protocol = SecureApi.protocol) { constructor (uiUrl, nextToken, getProvider = SecureApi.getWsProvider, protocol = SecureApi.protocol) {
const sysuiToken = store.get('sysuiToken'); const sysuiToken = store.get('sysuiToken');
const transport = getTransport(uiUrl, sysuiToken, protocol); const wsProvider = getProvider(uiUrl, protocol, sysuiToken);
super(transport); super(wsProvider);
this.protocol = protocol; this.protocol = protocol;
this._url = uiUrl; this._url = uiUrl;
this._uiApi = new Api(new Api.Provider.Http(`${this.protocol()}//${this._url}/rpc`, 0), false);
const httpProvider = SecureApi.getHttpProvider(this._url, this.protocol());
this._uiApi = new Api(httpProvider, false);
this._wsUrl = uiUrl; this._wsUrl = uiUrl;
// Try tokens from localStorage, from hash and 'initial' // Try tokens from localStorage, from hash and 'initial'
this._tokens = uniq([sysuiToken, nextToken, 'initial']) this._tokens = uniq([sysuiToken, nextToken, 'initial'])
.filter((token) => token) .filter((token) => token)
.map((token) => ({ value: token, tried: false })); .map((value) => ({
value,
tried: false
}));
// When the transport is closed, try to reconnect // When the provider is closed, try to reconnect
transport.on('close', this.connect, this); wsProvider.on('close', this.connect, this);
this.connect(); this.connect();
} }
@ -103,7 +116,7 @@ export default class SecureApi extends Api {
return 'dapps.parity'; return 'dapps.parity';
} }
return this._dappsAddress.host; return this._dappsAddress.host || '127.0.0.1';
} }
get isConnecting () { get isConnecting () {