Merge pull request #1935 from ser/add-ws-host-port
Adding possibility of websockets configuration
This commit is contained in:
commit
a132525a2b
|
@ -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):
|
||||||
|
|
|
@ -34,11 +34,13 @@ if (id) {
|
||||||
$("<p />").text(data.amount/100000000 + "BTC").appendTo($("p#amount"));
|
$("<p />").text(data.amount/100000000 + "BTC").appendTo($("p#amount"));
|
||||||
$("a").attr("href", data.URI);
|
$("a").attr("href", data.URI);
|
||||||
$("<p />").text("Powered by Electrum").appendTo($("p#powered"));
|
$("<p />").text("Powered by Electrum").appendTo($("p#powered"));
|
||||||
|
var websocket_server = data.websocket_server;
|
||||||
|
var websocket_port = data.websocket_port;
|
||||||
$(function () {
|
$(function () {
|
||||||
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;
|
||||||
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({
|
||||||
|
@ -57,6 +59,22 @@ if (id) {
|
||||||
var interval = setInterval(update, 1000);
|
var interval = setInterval(update, 1000);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var wss_address = "wss://" + websocket_server + ":" + websocket_port +"/");
|
||||||
|
console.log("Opening WSS: " + wss_address)
|
||||||
|
var ws = new WebSocket(wss_address);
|
||||||
|
|
||||||
|
ws.onopen = function() {
|
||||||
|
ws.send('id:' + id);
|
||||||
|
};
|
||||||
|
ws.onmessage = function (evt) {
|
||||||
|
var received_msg = evt.data;
|
||||||
|
if(received_msg == 'paid'){
|
||||||
|
$("#container").html("This invoice has been paid.");
|
||||||
|
}
|
||||||
|
else alert("Message is received:"+ received_msg);
|
||||||
|
};
|
||||||
|
|
||||||
})
|
})
|
||||||
.fail(function() {
|
.fail(function() {
|
||||||
console.log("error fail");
|
console.log("error fail");
|
||||||
|
@ -64,19 +82,6 @@ if (id) {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
var ws = new WebSocket("wss://" + window.location.hostname + ":9999/");
|
|
||||||
ws.onopen = function() {
|
|
||||||
ws.send('id:' + id);
|
|
||||||
};
|
|
||||||
ws.onmessage = function (evt) {
|
|
||||||
var received_msg = evt.data;
|
|
||||||
if(received_msg == 'paid'){
|
|
||||||
$("#container").html("This invoice has been paid.");
|
|
||||||
}
|
|
||||||
else alert("Message is received:"+ received_msg);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
// See http://stackoverflow.com/questions/29186154/chrome-clicking-mailto-links-closes-websocket-connection
|
// See http://stackoverflow.com/questions/29186154/chrome-clicking-mailto-links-closes-websocket-connection
|
||||||
$(document).on('click', 'a[href^="bitcoin:"]', function (e) {
|
$(document).on('click', 'a[href^="bitcoin:"]', function (e) {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
|
|
Loading…
Reference in New Issue