colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't send keepalive if socket has closed

Browse Source 
Also shorten the timeout to see if it improves websocket connection
reliability.
This commit is contained in:
lilia
2015-03-11 13:30:14 -07:00
parent 2b073f3365
commit 0cbad730ce
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/libtextsecure.js
View File

@@ -15919,15 +15919,17 @@ window.axolotl.sessions = {
function resetKeepAliveTimer() { function resetKeepAliveTimer() {
clearTimeout(keepAliveTimer); clearTimeout(keepAliveTimer);
keepAliveTimer = setTimeout(function() { keepAliveTimer = setTimeout(function() {
if (socket.readyState === WebSocket.OPEN) {
socket.send( socket.send(
new textsecure.protobuf.WebSocketMessage({ new textsecure.protobuf.WebSocketMessage({
type: textsecure.protobuf.WebSocketMessage.Type.REQUEST, type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
request: { verb: 'GET', path: '/v1/keepalive' } request: { verb: 'GET', path: '/v1/keepalive' }
}).encode().toArrayBuffer() }).encode().toArrayBuffer()
); );
}
resetKeepAliveTimer(); resetKeepAliveTimer();
}, 60000); }, 55000);
}; };
function onclose(e) { function onclose(e) {

4
libtextsecure/websocket.js
View File

@@ -39,15 +39,17 @@
function resetKeepAliveTimer() { function resetKeepAliveTimer() {
clearTimeout(keepAliveTimer); clearTimeout(keepAliveTimer);
keepAliveTimer = setTimeout(function() { keepAliveTimer = setTimeout(function() {
if (socket.readyState === WebSocket.OPEN) {
socket.send( socket.send(
new textsecure.protobuf.WebSocketMessage({ new textsecure.protobuf.WebSocketMessage({
type: textsecure.protobuf.WebSocketMessage.Type.REQUEST, type: textsecure.protobuf.WebSocketMessage.Type.REQUEST,
request: { verb: 'GET', path: '/v1/keepalive' } request: { verb: 'GET', path: '/v1/keepalive' }
}).encode().toArrayBuffer() }).encode().toArrayBuffer()
); );
}
resetKeepAliveTimer(); resetKeepAliveTimer();
}, 60000); }, 55000);
}; };
function onclose(e) { function onclose(e) {