mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Send acks instead of closing and opening the socket

Browse source 
Hopefully the real fix for #67 until we get protocol-level pings from
the wc3 api.
This commit is contained in:
lilia 2014-10-22 12:05:17 -07:00
parent 6e2a85ccf1
commit 838283f28b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
js/api.js
View file

@ -299,12 +299,12 @@ window.textsecure.api = function() {
} else } else
var params = $.param({}); var params = $.param({});
var reconnectTimer; var keepAliveTimer;
var reconnectSemaphore = 0; var reconnectSemaphore = 0;
var socketWrapper = { onmessage: function() {}, ondisconnect: function() {}, onconnect: function() {} }; var socketWrapper = { onmessage: function() {}, ondisconnect: function() {}, onconnect: function() {} };
var connect = function() { var connect = function() {
clearTimeout(reconnectTimer); clearTimeout(keepAliveTimer);
reconnectSemaphore++; reconnectSemaphore++;
if (reconnectSemaphore <= 0) if (reconnectSemaphore <= 0)
return; return;
@ -312,12 +312,12 @@ window.textsecure.api = function() {
if (socket) { socket.close(); } if (socket) { socket.close(); }
var socket = new WebSocket(URL+params); var socket = new WebSocket(URL+params);
function setReconnectTimeout() { function resetKeepAliveTimer() {
clearTimeout(reconnectTimer); clearTimeout(keepAliveTimer);
reconnectTimer = setTimeout(function() { keepAliveTimer = setTimeout(function() {
reconnectSemaphore--; socket.send(JSON.stringify({type: 1, id: 0}));
connect(); resetKeepAliveTimer();
}, 60000); }, 50000);
}; };
socket.onerror = function(socketEvent) { socket.onerror = function(socketEvent) {
@ -337,7 +337,7 @@ window.textsecure.api = function() {
socket.onopen = function(socketEvent) { socket.onopen = function(socketEvent) {
console.log('Connected to server!'); console.log('Connected to server!');
socketWrapper.onconnect(); socketWrapper.onconnect();
setReconnectTimeout(); resetKeepAliveTimer();
}; };
//TODO: wrap onmessage so that we reconnect on missing pong //TODO: wrap onmessage so that we reconnect on missing pong
@ -356,7 +356,7 @@ window.textsecure.api = function() {
console.log("Got invalid message from server: " + message); console.log("Got invalid message from server: " + message);
} }
setReconnectTimeout(); resetKeepAliveTimer();
}; };
socketWrapper.send = function(msg) { socketWrapper.send = function(msg) {