Handle case of emitting both 'end' and 'close'. Closes share#282

lib/agent.js

@@ -56,8 +56,15 @@ Agent.prototype.close = function(err) {
 };
 
 Agent.prototype._cleanup = function() {
+
+  // Only clean up once if the stream emits both 'end' and 'close'.
+  if (this.closed) return;
+
   this.closed = true;
 
+  this.backend.agentsCount--;
+  if (!this.stream.isServer) this.backend.remoteAgentsCount--;
+
   // Clean up doc subscription streams
   for (var collection in this.subscribedDocs) {
     var docs = this.subscribedDocs[collection];
@@ -259,12 +266,7 @@ Agent.prototype._open = function() {
     });
   });
 
-  function cleanup() {
-    agent.backend.agentsCount--;
-    if (!agent.stream.isServer) agent.backend.remoteAgentsCount--;
-    agent._cleanup();
-  }
-
+  var cleanup = agent._cleanup.bind(agent);
   this.stream.on('end', cleanup);
   this.stream.on('close', cleanup);
 };

test/client/connection.js

@@ -106,10 +106,19 @@ describe('client connection', function() {
       var connection = backend.connect();
       connection.on('connected', function() {
         connection.socket.stream.emit('close')
-        setTimeout(function() {
-          expect(backend.agentsCount).equal(0);
-          done();
-        }, 10);
+        expect(backend.agentsCount).equal(0);
+        done();
+      });
+    });
+
+    it('updates correctly after stream emits both "end" and "close"', function(done) {
+      var backend = this.backend;
+      var connection = backend.connect();
+      connection.on('connected', function() {
+        connection.socket.stream.emit('end')
+        connection.socket.stream.emit('close')
+        expect(backend.agentsCount).equal(0);
+        done();
       });
     });