joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:jketterl/openwebrx into develop

Browse Source
This commit is contained in:
Jakob Ketterl
2019-07-13 21:51:49 +00:00
parent a6f294f361 420b0c60d7
commit dd1def149c
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/map.js
View File

@@ -115,10 +115,13 @@
rectangles = {}; rectangles = {};
}; };
var reconnect_timeout = false;
var connect = function(){ var connect = function(){
var ws = new WebSocket(ws_url); var ws = new WebSocket(ws_url);
ws.onopen = function(){ ws.onopen = function(){
ws.send("SERVER DE CLIENT client=map.js type=map"); ws.send("SERVER DE CLIENT client=map.js type=map");
reconnect_timeout = false
}; };
ws.onmessage = function(e){ ws.onmessage = function(e){
@@ -163,7 +166,14 @@
}; };
ws.onclose = function(){ ws.onclose = function(){
clearMap(); clearMap();
setTimeout(connect, 5000); if (reconnect_timeout) {
// max value: roundabout 8 and a half minutes
reconnect_timeout = Math.min(reconnect_timeout * 2, 512000);
} else {
// initial value: 1s
reconnect_timeout = 1000;
}
setTimeout(connect, reconnect_timeout);
}; };
window.onbeforeunload = function() { //http://stackoverflow.com/questions/4812686/closing-websocket-correctly-html5-javascript window.onbeforeunload = function() { //http://stackoverflow.com/questions/4812686/closing-websocket-correctly-html5-javascript

14
htdocs/openwebrx.js
View File

@@ -1472,6 +1472,7 @@ function on_ws_opened()
{ {
ws.send("SERVER DE CLIENT client=openwebrx.js type=receiver"); ws.send("SERVER DE CLIENT client=openwebrx.js type=receiver");
divlog("WebSocket opened to "+ws_url); divlog("WebSocket opened to "+ws_url);
reconnect_timeout = false;
} }
var was_error=0; var was_error=0;
@@ -1852,6 +1853,8 @@ function audio_init()
} }
var reconnect_timeout = false;
function on_ws_closed() function on_ws_closed()
{ {
try try
@@ -1860,9 +1863,16 @@ function on_ws_closed()
} }
catch (dont_care) {} catch (dont_care) {}
audio_initialized = 0; audio_initialized = 0;
divlog("WebSocket has closed unexpectedly. Attempting to reconnect in 5 seconds...", 1); if (reconnect_timeout) {
// max value: roundabout 8 and a half minutes
reconnect_timeout = Math.min(reconnect_timeout * 2, 512000);
} else {
// initial value: 1s
reconnect_timeout = 1000;
}
divlog("WebSocket has closed unexpectedly. Attempting to reconnect in " + reconnect_timeout / 1000 + " seconds...", 1);
setTimeout(open_websocket, 5000); setTimeout(open_websocket, reconnect_timeout);
} }
function on_ws_error(event) function on_ws_error(event)