AaronFiore/electrum
1
0
Fork 0
Code Activity

Adding possibility of websockets configuration

Browse Source 
Up to now, websockets configuration was possible for the daemon only,
   this patch passes that information to the client via json file
   produced with the payment request.
This commit is contained in:
Serge Victor
2016-09-21 10:54:09 +00:00
parent a45095ef36
commit f2820944f1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/wallet.py
View File

@@ -1052,6 +1052,8 @@ class Abstract_Wallet(PrintError):
out['request_url'] = os.path.join(baseurl, key) out['request_url'] = os.path.join(baseurl, key)
out['URI'] += '&r=' + out['request_url'] out['URI'] += '&r=' + out['request_url']
out['index_url'] = os.path.join(baseurl, 'index.html') + '?id=' + key out['index_url'] = os.path.join(baseurl, 'index.html') + '?id=' + key
out['websocket_server'] = config.get('websocket_server', 'localhost')
out['websocket_port'] = config.get('websocket_port', 9999)
return out return out
def get_request_status(self, key): def get_request_status(self, key):

6
lib/www/index.html
View File

@@ -38,7 +38,9 @@ if (id) {
var current; var current;
var max = 100; var max = 100;
var initial = data.time; var initial = data.time;
var duration = data.exp; var duration = data.exp;
var websocket_server = data.websocket_server;
var websocket_port = data.websocket_port;
if(duration){ if(duration){
var current = 100 * (Math.floor(Date.now()/1000) - initial)/duration; var current = 100 * (Math.floor(Date.now()/1000) - initial)/duration;
$("#progressbar").progressbar({ $("#progressbar").progressbar({
@@ -64,7 +66,7 @@ if (id) {
}); });
}; };
var ws = new WebSocket("wss://" + window.location.hostname + ":9999/"); var ws = new WebSocket("wss://" + websocket_server + ":" + websocket_port +"/");
ws.onopen = function() { ws.onopen = function() {
ws.send('id:' + id); ws.send('id:' + id);
}; };