Don't send keepalive if socket has closed

Also shorten the timeout to see if it improves websocket connection
reliability.
pull/749/head
lilia 10 years ago
parent 2b073f3365
commit 0cbad730ce

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

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

Loading…
Cancel
Save