Adapt the SDK to PR kuzzleio/kuzzle#567

Author: dbengsch

package.json

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

src/kuzzle.js

@@ -858,7 +858,7 @@ Kuzzle.prototype.getAllStatistics = function (options, cb) {
 
   this.callbackRequired('Kuzzle.getAllStatistics', cb);
 
-  this.query({controller:'admin', action: 'getAllStats'}, {}, options, function (err, res) {
+  this.query({controller:'server', action: 'getAllStats'}, {}, options, function (err, res) {
     if (err) {
       return cb(err);
     }
@@ -908,7 +908,7 @@ Kuzzle.prototype.getStatistics = function (timestamp, options, cb) {
   this.callbackRequired('Kuzzle.getStatistics', cb);
 
   body = timestamp ? {body: {startTime: timestamp}} : {};
-  this.query({controller: 'admin', action: timestamp ? 'getStats' : 'getLastStats'}, body, options, queryCB);
+  this.query({controller: 'server', action: timestamp ? 'getStats' : 'getLastStats'}, body, options, queryCB);
 };
 
 /**
@@ -1009,7 +1009,7 @@ Kuzzle.prototype.listCollections = function () {
     query.body.size = options.size;
   }
 
-  this.query({index: index, controller: 'read', action: 'listCollections'}, query, options, function (err, res) {
+  this.query({index: index, controller: 'collection', action: 'list'}, query, options, function (err, res) {
     if (err) {
       return cb(err);
     }
@@ -1032,7 +1032,7 @@ Kuzzle.prototype.listIndexes = function (options, cb) {
 
   this.callbackRequired('Kuzzle.listIndexes', cb);
 
-  this.query({controller: 'read', action: 'listIndexes'}, {}, options, function (err, res) {
+  this.query({controller: 'index', action: 'list'}, {}, options, function (err, res) {
     cb(err, err ? undefined : res.result.indexes);
   });
 };
@@ -1068,7 +1068,7 @@ Kuzzle.prototype.getServerInfo = function (options, cb) {
 
   this.callbackRequired('Kuzzle.getServerInfo', cb);
 
-  this.query({controller: 'read', action: 'serverInfo'}, {}, options, function (err, res) {
+  this.query({controller: 'server', action: 'info'}, {}, options, function (err, res) {
     if (err) {
       return cb(err);
     }
@@ -1112,7 +1112,7 @@ Kuzzle.prototype.refreshIndex = function () {
     index = this.defaultIndex;
   }
 
-  this.query({ index: index, controller: 'admin', action: 'refreshIndex'}, {}, options, cb);
+  this.query({ index: index, controller: 'index', action: 'refresh'}, {}, options, cb);
 
   return this;
 };
@@ -1152,7 +1152,7 @@ Kuzzle.prototype.getAutoRefresh = function () {
   }
 
   this.callbackRequired('Kuzzle.getAutoRefresh', cb);
-  this.query({ index: index, controller: 'admin', action: 'getAutoRefresh'}, {}, options, cb);
+  this.query({ index: index, controller: 'index', action: 'getAutoRefresh'}, {}, options, cb);
 };
 
 /**
@@ -1199,7 +1199,7 @@ Kuzzle.prototype.setAutoRefresh = function () {
     throw new Error('Kuzzle.setAutoRefresh: autoRefresh value is required');
   }
 
-  this.query({ index: index, controller: 'admin', action: 'setAutoRefresh'}, { body: { autoRefresh: autoRefresh }}, options, cb);
+  this.query({ index: index, controller: 'index', action: 'setAutoRefresh'}, { body: { autoRefresh: autoRefresh }}, options, cb);
 
   return this;
 };
@@ -1217,7 +1217,7 @@ Kuzzle.prototype.now = function (options, cb) {
 
   this.callbackRequired('Kuzzle.now', cb);
 
-  this.query({controller: 'read', action: 'now'}, {}, options, function (err, res) {
+  this.query({controller: 'server', action: 'now'}, {}, options, function (err, res) {
     cb(err, res && res.result.now);
   });
 };

src/kuzzleDataCollection.js

@@ -97,7 +97,7 @@ KuzzleDataCollection.prototype.advancedSearch = function (filters, options, cb)
 
   query = self.kuzzle.addHeaders({body: filters}, this.headers);
 
-  self.kuzzle.query(this.buildQueryArgs('read', 'search'), query, options, function (error, result) {
+  self.kuzzle.query(this.buildQueryArgs('document', 'search'), query, options, function (error, result) {
     var
       response,
       documents = [];
@@ -151,7 +151,7 @@ KuzzleDataCollection.prototype.count = function (filters, options, cb) {
 
   query = this.kuzzle.addHeaders({body: filters}, this.headers);
 
-  this.kuzzle.query(this.buildQueryArgs('read', 'count'), query, options, function (error, result) {
+  this.kuzzle.query(this.buildQueryArgs('document', 'count'), query, options, function (error, result) {
     cb(error, result && result.result.count);
   });
 };
@@ -174,7 +174,7 @@ KuzzleDataCollection.prototype.create = function (options, cb) {
   }
 
   data = this.kuzzle.addHeaders(data, this.headers);
-  this.kuzzle.query(this.buildQueryArgs('write', 'createCollection'), data, options, cb);
+  this.kuzzle.query(this.buildQueryArgs('collection', 'create'), data, options, cb);
 
   return this;
 };
@@ -229,7 +229,7 @@ KuzzleDataCollection.prototype.createDocument = function (id, document, options,
 
   data = self.kuzzle.addHeaders(data, self.headers);
 
-  self.kuzzle.query(this.buildQueryArgs('write', action), data, options, cb && function (err, res) {
+  self.kuzzle.query(this.buildQueryArgs('document', action), data, options, cb && function (err, res) {
     var doc;
 
     if (err) {
@@ -280,7 +280,7 @@ KuzzleDataCollection.prototype.deleteDocument = function (arg, options, cb) {
 
   data = this.kuzzle.addHeaders(data, this.headers);
 
-  this.kuzzle.query(this.buildQueryArgs('write', action), data, options, cb && function (err, res) {
+  this.kuzzle.query(this.buildQueryArgs('document', action), data, options, cb && function (err, res) {
     if (err) {
       cb(err);
     }
@@ -312,7 +312,7 @@ KuzzleDataCollection.prototype.fetchDocument = function (documentId, options, cb
   self.kuzzle.callbackRequired('KuzzleDataCollection.fetch', cb);
   data = self.kuzzle.addHeaders(data, this.headers);
 
-  self.kuzzle.query(this.buildQueryArgs('read', 'get'), data, options, function (err, res) {
+  self.kuzzle.query(this.buildQueryArgs('document', 'get'), data, options, function (err, res) {
     var document;
 
     if (err) {
@@ -398,7 +398,7 @@ KuzzleDataCollection.prototype.publishMessage = function (document, options, cb)
   }
 
   data = this.kuzzle.addHeaders(data, this.headers);
-  this.kuzzle.query(this.buildQueryArgs('write', 'publish'), data, options, cb);
+  this.kuzzle.query(this.buildQueryArgs('realtime', 'publish'), data, options, cb);
 
   return this;
 };
@@ -431,7 +431,7 @@ KuzzleDataCollection.prototype.replaceDocument = function (documentId, content,
 
   data = self.kuzzle.addHeaders(data, this.headers);
 
-  self.kuzzle.query(this.buildQueryArgs('write', 'createOrReplace'), data, options, cb && function (err, res) {
+  self.kuzzle.query(this.buildQueryArgs('document', 'createOrReplace'), data, options, cb && function (err, res) {
     var document;
 
     if (err) {
@@ -492,7 +492,7 @@ KuzzleDataCollection.prototype.truncate = function (options, cb) {
   }
 
   data = this.kuzzle.addHeaders(data, this.headers);
-  this.kuzzle.query(this.buildQueryArgs('admin', 'truncateCollection'), data, options, cb);
+  this.kuzzle.query(this.buildQueryArgs('collection', 'truncate'), data, options, cb);
 
   return this;
 };
@@ -526,7 +526,7 @@ KuzzleDataCollection.prototype.updateDocument = function (documentId, content, o
 
   data = self.kuzzle.addHeaders(data, this.headers);
 
-  self.kuzzle.query(this.buildQueryArgs('write', 'update'), data, options, cb && function (err, res) {
+  self.kuzzle.query(this.buildQueryArgs('document', 'update'), data, options, cb && function (err, res) {
     if (err) {
       return cb(err);
     }

src/kuzzleDataMapping.js

@@ -73,7 +73,7 @@ KuzzleDataMapping.prototype.apply = function (options, cb) {
     options = null;
   }
 
-  self.kuzzle.query(this.collection.buildQueryArgs('admin', 'updateMapping'), data, options, function (err) {
+  self.kuzzle.query(this.collection.buildQueryArgs('collection', 'updateMapping'), data, options, function (err) {
     if (err) {
       return cb && cb(err);
     }
@@ -103,7 +103,7 @@ KuzzleDataMapping.prototype.refresh = function (options, cb) {
     options = null;
   }
 
-  this.kuzzle.query(this.collection.buildQueryArgs('admin', 'getMapping'), data, options, function (err, res) {
+  this.kuzzle.query(this.collection.buildQueryArgs('collection', 'getMapping'), data, options, function (err, res) {
     if (err) {
       return cb ? cb(err) : false;
     }

src/kuzzleDocument.js

@@ -146,7 +146,7 @@ KuzzleDocument.prototype.delete = function (options, cb) {
     throw new Error('KuzzleDocument.delete: cannot delete a document without a document ID');
   }
 
-  this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'delete'), this.serialize(), options, cb && function (err) {
+  this.kuzzle.query(this.dataCollection.buildQueryArgs('document', 'delete'), this.serialize(), options, cb && function (err) {
     cb(err, err ? undefined : self.id);
   });
 };
@@ -172,7 +172,7 @@ KuzzleDocument.prototype.refresh = function (options, cb) {
 
   this.kuzzle.callbackRequired('KuzzleDocument.refresh', cb);
 
-  self.kuzzle.query(self.dataCollection.buildQueryArgs('read', 'get'), {_id: self.id}, options, function (error, res) {
+  self.kuzzle.query(self.dataCollection.buildQueryArgs('document', 'get'), {_id: self.id}, options, function (error, res) {
     var newDocument;
 
     if (error) {
@@ -211,7 +211,7 @@ KuzzleDocument.prototype.save = function (options, cb) {
     options = null;
   }
 
-  self.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'createOrReplace'), data, options, function (error, res) {
+  self.kuzzle.query(this.dataCollection.buildQueryArgs('document', 'createOrReplace'), data, options, function (error, res) {
     if (error) {
       return cb && cb(error);
     }
@@ -240,7 +240,7 @@ KuzzleDocument.prototype.save = function (options, cb) {
 KuzzleDocument.prototype.publish = function (options) {
   var data = this.serialize();
 
-  this.kuzzle.query(this.dataCollection.buildQueryArgs('write', 'publish'), data, options);
+  this.kuzzle.query(this.dataCollection.buildQueryArgs('realtime', 'publish'), data, options);
 
   return this;
 };

src/kuzzleRoom.js

@@ -142,7 +142,7 @@ KuzzleRoom.prototype.count = function (cb) {
     throw new Error('KuzzleRoom.count: cannot count subscriptions on an inactive room');
   }
 
-  this.kuzzle.query(this.collection.buildQueryArgs('subscribe', 'count'), data, function (err, res) {
+  this.kuzzle.query(this.collection.buildQueryArgs('realtime', 'count'), data, function (err, res) {
     cb(err, res && res.result.count);
   });
 };
@@ -213,7 +213,7 @@ KuzzleRoom.prototype.renew = function (filters, notificationCB, cb) {
   subscribeQuery.body = self.filters;
   subscribeQuery = self.kuzzle.addHeaders(subscribeQuery, this.headers);
 
-  self.kuzzle.query(self.collection.buildQueryArgs('subscribe', 'on'), subscribeQuery, {metadata: self.metadata}, function (error, response) {
+  self.kuzzle.query(self.collection.buildQueryArgs('realtime', 'subscribe'), subscribeQuery, {metadata: self.metadata}, function (error, response) {
     delete self.kuzzle.subscriptions.pending[self.id];
     self.subscribing = false;
 
@@ -267,12 +267,12 @@ KuzzleRoom.prototype.unsubscribe = function () {
       delete self.kuzzle.subscriptions[room];
 
       if (Object.keys(self.kuzzle.subscriptions.pending).length === 0) {
-        self.kuzzle.query(self.collection.buildQueryArgs('subscribe', 'off'), {body: {roomId: room}});
+        self.kuzzle.query(self.collection.buildQueryArgs('realtime', 'unsubscribe'), {body: {roomId: room}});
       } else {
         interval = setInterval(function () {
           if (Object.keys(self.kuzzle.subscriptions.pending).length === 0) {
             if (!self.kuzzle.subscriptions[room]) {
-              self.kuzzle.query(self.collection.buildQueryArgs('subscribe', 'off'), {body: {roomId: room}});
+              self.kuzzle.query(self.collection.buildQueryArgs('realtime', 'unsubscribe'), {body: {roomId: room}});
             }
             clearInterval(interval);
           }

test/kuzzle/methods.test.js

@@ -54,7 +54,7 @@ describe('Kuzzle methods', function () {
       error = null;
       result = {result: {hits: []}};
       expectedQuery = {
-        controller: 'admin',
+        controller: 'server',
         action: 'getAllStats'
       };
     });
@@ -96,7 +96,7 @@ describe('Kuzzle methods', function () {
       error = null;
       result = {result: {hits: []}};
       expectedQuery = {
-        controller: 'admin',
+        controller: 'server',
         action: 'getLastStats'
       };
     });
@@ -115,7 +115,7 @@ describe('Kuzzle methods', function () {
 
     it('should return statistics frames starting from the given timestamp', function () {
       expectedQuery = {
-        controller: 'admin',
+        controller: 'server',
         action: 'getStats',
         body: { startTime: 123 }
       };
@@ -159,7 +159,7 @@ describe('Kuzzle methods', function () {
       // testing: getStatistics(timestamp, options callback);
       emitted = false;
       expectedQuery = {
-        controller: 'admin',
+        controller: 'server',
         action: 'getStats',
         body: { startTime: 123 }
       };
@@ -255,8 +255,8 @@ describe('Kuzzle methods', function () {
         }
       }}};
       expectedQuery = {
-        controller: 'read',
-        action: 'serverInfo'
+        controller: 'server',
+        action: 'info'
       };
     });
 
@@ -297,8 +297,8 @@ describe('Kuzzle methods', function () {
       result = {result: {collections: {stored: [], realtime: []}}};
       expectedQuery = {
         index: 'foo',
-        controller: 'read',
-        action: 'listCollections',
+        controller: 'collection',
+        action: 'list',
         body: {type: 'all'}
       };
     });
@@ -374,8 +374,8 @@ describe('Kuzzle methods', function () {
       error = null;
       result = {result: {indexes: ['foo', 'bar']}};
       expectedQuery = {
-        controller: 'read',
-        action: 'listIndexes'
+        controller: 'index',
+        action: 'list'
       };
     });
 
@@ -424,7 +424,7 @@ describe('Kuzzle methods', function () {
       error = null;
       result = {result: {now: Date.now()}};
       expectedQuery = {
-        controller: 'read',
+        controller: 'server',
         action: 'now'
       };
     });
@@ -855,8 +855,8 @@ describe('Kuzzle methods', function () {
       args = spy.firstCall.args;
 
       should(args[0].index).be.exactly(index);
-      should(args[0].controller).be.exactly('admin');
-      should(args[0].action).be.exactly('refreshIndex');
+      should(args[0].controller).be.exactly('index');
+      should(args[0].action).be.exactly('refresh');
       should(args[2]).be.exactly(options);
       should(args[3]).be.exactly(cb);
     });
@@ -899,7 +899,7 @@ describe('Kuzzle methods', function () {
       kuzzle.getAutoRefresh(index, options, cb);
       should(spy.calledOnce).be.true();
       should(spy.calledWithExactly(
-        { index: index, controller: 'admin', action: 'getAutoRefresh' },
+        { index: index, controller: 'index', action: 'getAutoRefresh' },
         {},
         options,
         cb)
@@ -909,7 +909,7 @@ describe('Kuzzle methods', function () {
       kuzzle.getAutoRefresh(cb);
       should(spy.calledTwice).be.true();
       should(spy.secondCall.calledWithExactly(
-        { index: kuzzle.defaultIndex, controller: 'admin', action: 'getAutoRefresh' },
+        { index: kuzzle.defaultIndex, controller: 'index', action: 'getAutoRefresh' },
         {},
         undefined,
         cb)
@@ -937,7 +937,7 @@ describe('Kuzzle methods', function () {
       kuzzle.setAutoRefresh(true, cb);
       should(spy.calledOnce).be.true();
       should(spy.calledWith(
-        { index: kuzzle.defaultIndex, controller: 'admin', action: 'setAutoRefresh' },
+        { index: kuzzle.defaultIndex, controller: 'index', action: 'setAutoRefresh' },
         { body: { autoRefresh: true } },
         undefined,
         cb
@@ -964,7 +964,7 @@ describe('Kuzzle methods', function () {
       kuzzle.setAutoRefresh(autoRefresh, options, cb);
       should(spy.calledOnce).be.true();
       should(spy.firstCall.calledWithExactly(
-        { index: kuzzle.defaultIndex, controller: 'admin', action: 'setAutoRefresh' },
+        { index: kuzzle.defaultIndex, controller: 'index', action: 'setAutoRefresh' },
         { body: { autoRefresh: autoRefresh }},
         options,
         cb
@@ -973,7 +973,7 @@ describe('Kuzzle methods', function () {
       kuzzle.setAutoRefresh(index, autoRefresh);
       should(spy.calledTwice).be.true();
       should(spy.secondCall.calledWithExactly(
-        { index: index, controller: 'admin', action: 'setAutoRefresh' },
+        { index: index, controller: 'index', action: 'setAutoRefresh' },
         { body: { autoRefresh: autoRefresh }},
         undefined,
         undefined