Merge pull request #22 from kuzzleio/unitTests

Init offline mode

Author: scottinet

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-sdk",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Official Javascript SDK for Kuzzle",
   "author": "The Kuzzle Team <[email protected]>",
   "repository": {

src/kuzzle.js

@@ -82,7 +82,7 @@ module.exports = Kuzzle = function (url, options, cb) {
        This structure also allows renewing subscriptions after a connection loss
        */
       value: {
-        pending: 0
+        pending: {}
       },
       writable: true
     },
@@ -243,12 +243,21 @@ function construct(url, cb) {
   self.socket.once('connect', function () {
     self.state = 'connected';
 
+    Object.keys(self.subscriptions).forEach(function (roomId) {
+      Object.keys(self.subscriptions[roomId]).forEach(function (subscriptionId) {
+        var subscription = self.subscriptions[roomId][subscriptionId];
+        subscription.renew(subscription.callback);
+      });
+    });
+
+    dequeue.call(self);
+
     if (cb) {
       cb(null, self);
     }
   });
 
-  self.socket.once('connect_error', function (error) {
+  self.socket.on('connect_error', function (error) {
     self.state = 'error';
 
     if (cb) {
@@ -664,15 +673,15 @@ Kuzzle.prototype.query = function (collection, controller, action, query, option
 
   if (self.state === 'connected' || (options && options.queuable === false)) {
     emitRequest.call(this, object, cb);
-  } else if (self.queuing) {
+  } else if (self.queuing|| self.state === 'initializing') {
     cleanQueue.call(this, object, cb);
 
     if (self.queueFilter) {
-      if (self.queueFilter(query)) {
-        self.offlineQueue.push({ts: Date.now(), query: query, cb: cb});
+      if (self.queueFilter(object)) {
+        self.offlineQueue.push({ts: Date.now(), query: object, cb: cb});
       }
     } else {
-      self.offlineQueue.push({ts: Date.now(), query: query, cb: cb});
+      self.offlineQueue.push({ts: Date.now(), query: object, cb: cb});
     }
   }
 

src/kuzzleRoom.js

@@ -161,7 +161,7 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
 
   this.unsubscribe();
   this.subscribing = true;
-  this.kuzzle.subscriptions.pending++;
+  self.kuzzle.subscriptions.pending[self.id] = self;
 
   if (filters) {
     this.filters = filters;
@@ -170,14 +170,15 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
   this.roomId = null;
   this.callback = cb;
 
-  subscribeQuery = this.kuzzle.addHeaders({body: filters}, this.headers);
+  subscribeQuery = this.kuzzle.addHeaders({body: self.filters}, this.headers);
+
   self.kuzzle.query(this.collection, 'subscribe', 'on', subscribeQuery, {metadata: this.metadata}, function (error, response) {
     if (error) {
       /*
        If we've already subscribed to this room, Kuzzle returns the actual roomID.
        We'll simply ignore the error and acts as if we successfully subscribed.
         */
-      if (error.details.roomId) {
+      if (error.details && error.details.roomId) {
         self.roomId = error.details.roomId;
       } else {
         throw new Error('Error during Kuzzle subscription: ' + error.message);
@@ -196,7 +197,8 @@ KuzzleRoom.prototype.renew = function (filters, cb) {
     self.kuzzle.socket.on(self.roomId, self.notifier);
 
     self.subscribing = false;
-    self.kuzzle.subscriptions.pending--;
+    delete self.kuzzle.subscriptions.pending[self.id];
+
     self.dequeue();
   });
 
@@ -229,11 +231,11 @@ KuzzleRoom.prototype.unsubscribe = function () {
     if (Object.keys(self.kuzzle.subscriptions[room]).length === 1) {
       delete self.kuzzle.subscriptions[room];
 
-      if (self.kuzzle.subscriptions.pending === 0) {
+      if (Object.keys(self.kuzzle.subscriptions.pending).length === 0) {
         self.kuzzle.query(this.collection, 'subscribe', 'off', {body: {roomId: room}});
       } else {
         interval = setInterval(function () {
-          if (self.kuzzle.subscriptions.pending === 0) {
+          if (Object.keys(self.kuzzle.subscriptions.pending).length === 0) {
             if (!self.kuzzle.subscriptions[room]) {
               self.kuzzle.query(self.collection, 'subscribe', 'off', {body: {roomId: room}});
             }