Merge pull request #121 from kuzzleio/hotfix-120-onDone-callback-lost-if-offline

[MASTER] Hotfix #120 store onDone callbacks to recover from connection loss

Author: jenow

CHANGELOG.md

@@ -1,5 +1,9 @@
 *__note:__ the # at the end of lines are the pull request numbers on GitHub*
 
+# 2.1.4
+
+* Fix `onDone` callbacks being lost when subscribing in a `disconnected` state #121 
+
 # 2.1.3
 
 * https://github.com/kuzzleio/sdk-javascript/releases/tag/2.1.3

dist/kuzzle.js

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <support@kuzzle.io>",
   "repository": {

dist/kuzzle.js.map

@@ -45,6 +45,10 @@ function KuzzleRoom(kuzzleDataCollection, options) {
       value: null,
       writable: true
     },
+    onDoneCB: {
+      value: null,
+      writable: true
+    },
     queue: {
       value: [],
       writable: true
@@ -166,13 +170,17 @@ KuzzleRoom.prototype.renew = function (filters, notificationCB, cb) {
     filters = null;
   }
 
+  if (!cb) {
+    cb = self.onDoneCB;
+  }
+
   self.kuzzle.callbackRequired('KuzzleRoom.renew', notificationCB);
 
   /*
     Skip subscription renewal if another one was performed a moment before
    */
   if (self.lastRenewal && (now - self.lastRenewal) <= self.renewalDelay) {
-    return;
+    return cb && cb(new Error('Subscription already renewed less than ' + self.renewalDelay + 'ms ago'));
   }
 
   if (filters) {
@@ -185,6 +193,7 @@ KuzzleRoom.prototype.renew = function (filters, notificationCB, cb) {
     */
   if (self.kuzzle.state !== 'connected') {
     self.callback = notificationCB;
+    self.onDoneCB = cb;
     self.kuzzle.subscriptions.pending[self.id] = self;
     return;
   }
@@ -198,6 +207,7 @@ KuzzleRoom.prototype.renew = function (filters, notificationCB, cb) {
   self.roomId = null;
   self.subscribing = true;
   self.callback = notificationCB;
+  self.onDoneCB = cb;
   self.kuzzle.subscriptions.pending[self.id] = self;
 
   subscribeQuery.body = self.filters;