Ensure idle timeout results in disconnect event (and reconnect if desired)

Author: grs

lib/connection.js

@@ -318,6 +318,18 @@ Connection.prototype.accept = function (socket) {
     return this.init(socket);
 };
 
+
+Connection.prototype.abort_socket = function (socket) {
+    if (socket === this.socket) {
+        log.io('[%s] aborting socket', this.options.id);
+        this.socket.end();
+        this.socket.removeAllListeners('data');
+        this.socket.removeAllListeners('error');
+        this.socket.removeAllListeners('end');
+        this._disconnected();
+    }
+};
+
 Connection.prototype.init = function (socket) {
     this.socket = socket;
     if (this.get_option('tcp_no_delay', false) && this.socket.setNoDelay) {
@@ -464,6 +476,9 @@ Connection.prototype.output = function () {
             } else if (this.is_open() && this.remote.open.idle_time_out) {
                 this.heartbeat_out = setTimeout(this._write_frame.bind(this), this.remote.open.idle_time_out / 2);
             }
+            if (this.local.open.idle_time_out && this.heartbeat_in === undefined) {
+                this.heartbeat_in = setTimeout(this.idle.bind(this), this.local.open.idle_time_out);
+            }
         }
     } catch (e) {
         this.saved_error = e;
@@ -527,10 +542,12 @@ Connection.prototype.input = function (buff) {
 };
 
 Connection.prototype.idle = function () {
-    if (this.is_open()) {
+    if (!this.is_closed()) {
         this.abort_idle = true;
+        this.closed_with_non_fatal_error = true;
         this.local.close.error = {condition:'amqp:resource-limit-exceeded', description:'max idle time exceeded'};
         this.close();
+        setTimeout(this.abort_socket.bind(this, this.socket), 1000);
     }
 };
 
@@ -549,7 +566,10 @@ Connection.prototype._disconnected = function (error) {
         clearTimeout(this.heartbeat_out);
         this.heartbeat_out = undefined;
     }
-    if (this.heartbeat_in) clearTimeout(this.heartbeat_in);
+    if (this.heartbeat_in) {
+        clearTimeout(this.heartbeat_in);
+        this.heartbeat_in = undefined;
+    }
     var was_closed_with_non_fatal_error = this.closed_with_non_fatal_error;
     if (this.closed_with_non_fatal_error) {
         this.closed_with_non_fatal_error = false;