Merge pull request #169 from kuzzleio/fix-168-reject-request-in-offline-mode

fix #168 - now rejects requests when no other option is possible

Author: AnthonySendra

src/Kuzzle.js

@@ -1339,17 +1339,19 @@ Kuzzle.prototype.query = function (queryArgs, query, options, cb) {
   if (self.state === 'connected' || (options && options.queuable === false)) {
     if (self.state === 'connected') {
       emitRequest.call(this, object, cb);
-    } else if (cb) {
-      cb(new Error('Unable to execute request: not connected to a Kuzzle server.\nDiscarded request: ' + JSON.stringify(object)));
+    } else {
+      discardRequest(object, cb);
     }
-  } else if (self.queuing || ['initializing', 'connecting'].indexOf(self.state) !== -1) {
+  } else if (self.queuing || (options && options.queuable === true) || ['initializing', 'connecting'].indexOf(self.state) !== -1) {
     cleanQueue.call(this, object, cb);
-
     if (!self.queueFilter || self.queueFilter(object)) {
       self.offlineQueue.push({ts: Date.now(), query: object, cb: cb});
       self.emitEvent('offlineQueuePush', {query: object, cb: cb});
     }
   }
+  else {
+    discardRequest(object, cb);
+  }
 
   return self;
 };
@@ -1486,4 +1488,10 @@ Kuzzle.prototype.stopQueuing = function () {
   return this;
 };
 
+function discardRequest(object, cb) {
+  if (cb) {
+    cb(new Error('Unable to execute request: not connected to a Kuzzle server.\nDiscarded request: ' + JSON.stringify(object)));
+  }
+}
+
 module.exports = Kuzzle;

test/kuzzle/query.test.js

@@ -255,6 +255,21 @@ describe('Query management', function () {
       should(errorRaised).be.true();
     });
 
+    it('should discard the request if not connected and if queuing is deactivated', function () {
+      var
+        errorRaised = false;
+
+      callback = () => {
+        errorRaised = true;
+      };
+
+      kuzzle.state = 'reconnecting';
+      kuzzle.queuing = false;
+      kuzzle.query(queryArgs, { body: { some: 'query'}}, callback);
+      should(emitted).be.false();
+      should(errorRaised).be.true();
+    });
+
     it('should queue the request during offline mode, if queuing has been activated', function (done) {
       var
         query = { body: { some: 'query'}},
@@ -282,6 +297,33 @@ describe('Query management', function () {
       });
     });
 
+    it('should queue the request during offline mode, if queuable is set to true', function (done) {
+      var
+        query = { body: { some: 'query'}},
+        cb = function () {},
+        now = Date.now(),
+        eventFired = false;
+
+      kuzzle.state = 'offline';
+      kuzzle.queuing = false;
+      kuzzle.addListener('offlineQueuePush', object => {
+        eventFired = true;
+        should(object.query.body).be.eql(query.body);
+      });
+
+      kuzzle.query(queryArgs, query, {queuable: true}, cb);
+
+      process.nextTick(() => {
+        should(emitted).be.false();
+        should(kuzzle.offlineQueue.length).be.exactly(1);
+        should(kuzzle.offlineQueue[0].ts).not.be.undefined().and.be.approximately(now, 10);
+        should(kuzzle.offlineQueue[0].query).match(query);
+        should(kuzzle.offlineQueue[0].cb).be.exactly(cb);
+        should(eventFired).be.true();
+        done();
+      });
+    });
+
     it('should queue the request if a queue filter has been defined and if it allows queuing', function (done) {
       var
         query = { body: { some: 'query'}},