Heartbeat from client to server, as well; copes with middlebox failure

This commit is contained in:
Tony Garnock-Jones 2013-11-06 09:31:45 -05:00
parent 4be94e1314
commit acc783dc24
1 changed files with 27 additions and 0 deletions

View File

@ -116,6 +116,8 @@ WakeDetector.prototype.trigger = function () {
var DEFAULT_RECONNECT_DELAY = 100;
var MAX_RECONNECT_DELAY = 30000;
var DEFAULT_IDLE_TIMEOUT = 300000; // 5 minutes
var DEFAULT_PING_INTERVAL = DEFAULT_IDLE_TIMEOUT - 10000;
function WebSocketConnection(label, wsurl, shouldReconnect) {
this.label = label;
@ -127,8 +129,29 @@ function WebSocketConnection(label, wsurl, shouldReconnect) {
this.prevPeerRoutesMessage = null;
this.sock = null;
this.deduplicator = new Deduplicator();
this.activityTimestamp = 0;
this.idleTimeout = DEFAULT_IDLE_TIMEOUT;
this.pingInterval = DEFAULT_PING_INTERVAL;
this.idleTimer = null;
this.pingTimer = null;
}
WebSocketConnection.prototype.clearHeartbeatTimers = function () {
if (this.idleTimer) { clearTimeout(this.idleTimer); this.idleTimer = null; }
if (this.pingTimer) { clearTimeout(this.pingTimer); this.pingTimer = null; }
};
WebSocketConnection.prototype.recordActivity = function () {
var self = this;
this.activityTimestamp = +(new Date());
this.clearHeartbeatTimers();
this.idleTimer = setTimeout(function () { self.forceclose(); },
this.idleTimeout);
this.pingTimer = setTimeout(function () { self.safeSend(JSON.stringify("ping")) },
this.pingInterval);
};
WebSocketConnection.prototype.statusRoute = function (status) {
return pub([this.label + "_state", status]);
};
@ -215,6 +238,7 @@ WebSocketConnection.prototype.forceclose = function (keepReconnectDelay) {
if (!keepReconnectDelay) {
this.reconnectDelay = DEFAULT_RECONNECT_DELAY;
}
this.clearHeartbeatTimers();
if (this.sock) {
console.log("WebSocketConnection.forceclose called");
this.sock.close();
@ -239,11 +263,14 @@ WebSocketConnection.prototype.onopen = function (e) {
WebSocketConnection.prototype.onmessage = function (wse) {
// console.log("onmessage", wse);
this.recordActivity();
var j = JSON.parse(wse.data);
if (j === "ping") {
this.safeSend(JSON.stringify("pong"));
return;
} else if (j === "pong") {
return; // recordActivity already took care of our timers
}
var e = decodeAction(j);