Store subscriptionIds to handle re-subscriptions

Urigo · Dec 2, 2016 · 8ddd5f1 · 8ddd5f1
1 parent 3ea6542
commit 8ddd5f1
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 4 deletions.
diff --git a/dist/MeteorObservable.js b/dist/MeteorObservable.js
diff --git a/dist/MeteorObservable.js.map b/dist/MeteorObservable.js.map
diff --git a/dist/bundles/index.umd.js b/dist/bundles/index.umd.js
@@ -470,6 +470,7 @@ var ObservableCursor = (function (_super) {
  * @property {Boolean} upsert - True to use upsert logic.
  */
 
+var liveSubscriptions = [];
 function throwInvalidCallback(method) {
     throw new Error("Invalid " + method + " arguments:\n     your last param can't be a callback function, \n     please remove it and use \".subscribe\" of the Observable!");
 }
@@ -626,9 +627,23 @@ var MeteorObservable = (function () {
             // Execute subscribe lazily.
             if (subHandler === null) {
                 subHandler = subscribe();
+                if (liveSubscriptions.find(function (sub) { return sub === subHandler.subscriptionId; })) {
+                    // subscription already exists, call observer.next() since Meteor won't.
+                    observer.next();
+                }
+                else {
+                    liveSubscriptions.push(subHandler.subscriptionId);
+                }
             }
             return function () {
-                removeObserver(observers, observer, function () { return subHandler.stop(); });
+                removeObserver(observers, observer, function () {
+                    // remove subscription from liveSubscriptions list
+                    var i = liveSubscriptions.findIndex(function (sub) { return sub === subHandler.subscriptionId; });
+                    if (i > -1) {
+                        liveSubscriptions.splice(i, 1);
+                    }
+                    subHandler.stop();
+                });
             };
         });
     };

diff --git a/src/MeteorObservable.ts b/src/MeteorObservable.ts
@@ -3,6 +3,8 @@
 import {Observable, Subscriber} from 'rxjs';
 import {isMeteorCallbacks, forkZone, removeObserver} from './utils';
 
+let liveSubscriptions = [];
+
 function throwInvalidCallback(method: string) {
   throw new Error(
     `Invalid ${method} arguments:
@@ -161,10 +163,28 @@ export class MeteorObservable {
       // Execute subscribe lazily.
       if (subHandler === null) {
         subHandler = subscribe();
+        if (liveSubscriptions.find(sub => sub === subHandler.subscriptionId)) {
+          // subscription already exists, call observer.next() since Meteor won't.
+          observer.next();
+        } else {
+          liveSubscriptions.push(subHandler.subscriptionId);
+        }
       }
       return () => {
         removeObserver(observers,
-          observer, () => subHandler.stop());
+          observer, () => {
+            // remove subscription from liveSubscriptions list
+            let i = liveSubscriptions.findIndex(
+              sub => sub === subHandler.subscriptionId
+            );
+
+            if (i > -1) {
+              liveSubscriptions.splice(i, 1);
+            }
+
+            subHandler.stop();
+
+          });
       };
     });
   }