Merge pull request share#261 from dcharbonnier/sharedb/memory-leak

ericyhwang · web-flow · commit 7827b91fdd12 · 2018-11-30T17:19:07.000-08:00
fix leak on duplicate subscription - share#260
diff --git a/lib/agent.js b/lib/agent.js
@@ -105,7 +105,7 @@ Agent.prototype._subscribeToStream = function(collection, id, stream) {
   stream.on('end', function() {
     // The op stream is done sending, so release its reference
     var streams = agent.subscribedDocs[collection];
-    if (!streams) return;
+    if (!streams || streams[id] !== stream) return;
     delete streams[id];
     if (util.hasKeys(streams)) return;
     delete agent.subscribedDocs[collection];
diff --git a/test/client/connection.js b/test/client/connection.js
@@ -56,6 +56,27 @@ describe('client connection', function() {
     });
   });
 
+  it('subscribing to same doc closes old stream and adds new stream to agent', function(done) {
+    var connection = this.backend.connect();
+    var agent = connection.agent;
+    var collection = 'test';
+    var docId = 'abcd-1234';
+    var doc = connection.get(collection, docId);
+    doc.subscribe(function(err) {
+      if (err) return done(err);
+      var originalStream = agent.subscribedDocs[collection][docId];
+      doc.subscribe(function() {
+        if (err) return done(err);
+        expect(originalStream).to.have.property('open', false);
+        var newStream = agent.subscribedDocs[collection][docId];
+        expect(newStream).to.have.property('open', true);
+        expect(newStream).to.not.be(originalStream);
+        connection.close();
+        done();
+      });
+    });
+  });
+
   it('emits socket errors as "connection error" events', function(done) {
     var connection = this.backend.connect();
     connection.on('connection error', function(err) {
