Release 6.0.0-beta-4 (#351)

Bug fixes

    [ #349 ] [build] Update webpack build config to fix raw web usage (Njuelle)
    [ #345 ] Fix 343 unhandled rejection on connect (Aschen)

Others

    [ #348 ] Put document:create optional args in last position (Aschen)

Author: Aschen

README.md

@@ -217,7 +217,7 @@ For example, for the `create` action of the `document` controller ([document#cre
 ```js
 const options = { refresh: 'wait_for' };
 const documentBody = { hello: 'world' };
-kuzzle.document.create('my-index', 'my-collection', 'my-uniq-id', documentBody, options)
+kuzzle.document.create('my-index', 'my-collection', documentBody, 'my-uniq-id', options)
 ```
 
 The parameters of each method differ according to the parameters expected in the API.  

features/steps/document.js

@@ -11,11 +11,13 @@ Given(/^the collection doesn't have a document with id '(.*?)'$/, async function
 });
 
 Given('the collection has a document with id {string}', async function (id) {
-  this.content = await this.kuzzle.document.create(this.index, this.collection, id, {
-    a: 'document'
-  }, {
-    refresh: 'wait_for'
-  });
+  this.content = await this.kuzzle.document.create(
+    this.index,
+    this.collection,
+    { a: 'document' },
+    id,
+    { refresh: 'wait_for'}
+  );
 });
 
 
@@ -31,8 +33,8 @@ When('I create a document in {string}', async function (collection) {
   this.content = await this.kuzzle.document.create(
     this.index,
     this.collection,
-    'some-id',
     {a: 'document'},
+    'some-id',
     {refresh: true}
   );
 });
@@ -44,8 +46,8 @@ When('I create a document with id {string}', async function (id) {
     this.content = await this.kuzzle.document.create(
       this.index,
       this.collection,
-      id,
       {a: 'document'},
+      id,
       {refresh: true}
     );
   }

package-lock.json

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

package.json

@@ -38,22 +38,22 @@ class DocumentController {
       .then(response => response.result.count);
   }
 
-  create (index, collection, _id, body, options = {}) {
+  create (index, collection, document, _id = null, options = {}) {
     if (!index) {
       throw new Error('Kuzzle.document.create: index is required');
     }
     if (!collection) {
       throw new Error('Kuzzle.document.create: collection is required');
     }
-    if (!body) {
-      throw new Error('Kuzzle.document.create: body is required');
+    if (!document) {
+      throw new Error('Kuzzle.document.create: document is required');
     }
 
     const request = {
       index,
       collection,
       _id,
-      body,
+      body: document,
       controller: 'document',
       action: 'create',
       refresh: options.refresh

src/controllers/document.js

@@ -60,9 +60,10 @@ class RTWrapper extends KuzzleAbstractProtocol {
     this.emit('networkError', connectionError);
     if (this.autoReconnect && !this.retrying && !this.stopRetryingToConnect) {
       this.retrying = true;
+
       setTimeout(() => {
         this.retrying = false;
-        this.connect(this.host);
+        this.connect(this.host).catch(err => this.clientNetworkError(err));
       }, this.reconnectionDelay);
     } else {
       this.emit('disconnect');

src/protocols/abstract/realtime.js

@@ -72,20 +72,20 @@ describe('Document Controller', () => {
   describe('create', () => {
     it('should throw an error if the "index" argument is not provided', () => {
       should(function () {
-        kuzzle.document.create(undefined, 'collection', 'document-id', {foo: 'bar'}, options);
+        kuzzle.document.create(undefined, 'collection', {foo: 'bar'}, 'document-id', options);
       }).throw('Kuzzle.document.create: index is required');
     });
 
     it('should throw an error if the "collection" argument is not provided', () => {
       should(function () {
-        kuzzle.document.create('index', undefined, 'document-id', {foo: 'bar'}, options);
+        kuzzle.document.create('index', undefined, {foo: 'bar'}, 'document-id', options);
       }).throw('Kuzzle.document.create: collection is required');
     });
 
-    it('should throw an error if the "body" argument is not provided', () => {
+    it('should throw an error if the "document" argument is not provided', () => {
       should(function () {
-        kuzzle.document.create('index', 'collection', 'document-id', undefined, options);
-      }).throw('Kuzzle.document.create: body is required');
+        kuzzle.document.create('index', 'collection', undefined, 'document-id', options);
+      }).throw('Kuzzle.document.create: document is required');
     });
 
     it('should call document/create query and return a Promise which resolves the created document', () => {
@@ -96,7 +96,7 @@ describe('Document Controller', () => {
       };
       kuzzle.query.resolves({result});
 
-      return kuzzle.document.create('index', 'collection', 'document-id', {foo: 'bar'}, options)
+      return kuzzle.document.create('index', 'collection', {foo: 'bar'}, 'document-id', options)
         .then(res => {
           should(kuzzle.query)
             .be.calledOnce()
@@ -122,7 +122,7 @@ describe('Document Controller', () => {
       };
       kuzzle.query.resolves({result});
 
-      return kuzzle.document.create('index', 'collection', 'document-id', {foo: 'bar'}, {refresh: true})
+      return kuzzle.document.create('index', 'collection', {foo: 'bar'}, 'document-id', {refresh: true})
         .then(res => {
           should(kuzzle.query)
             .be.calledOnce()

test/controllers/document.test.js

@@ -121,7 +121,7 @@ describe('WebSocket networking module', () => {
     should(websocket.listeners('networkError').length).be.eql(1);
 
     websocket.connect();
-    websocket.connect = sinon.stub();
+    websocket.connect = sinon.stub().rejects();
     clientStub.onopen();
     clientStub.onerror();
     should(websocket.retrying).be.true();

test/protocol/websocket.test.js

@@ -5,11 +5,11 @@ const
 
 module.exports = {
   mode: 'production',
-  entry: './src/Kuzzle.js',
+  entry: './index.js',
   output: {
     path: `${__dirname}/dist`,
     filename: 'kuzzle.js',
-    library: 'Kuzzle',
+    library: 'KuzzleSDK',
     libraryTarget: 'umd'
   },
   watch: false,
@@ -48,7 +48,8 @@ module.exports = {
   plugins: [
     new webpack.IgnorePlugin(/^(http|min-req-promise|package|uws)$/),
     new webpack.DefinePlugin({
-      SDKVERSION: JSON.stringify(version)
+      SDKVERSION: JSON.stringify(version),
+      BUILT: true
     }),
     new webpack.BannerPlugin('Kuzzle javascript SDK version ' + version),
     new webpack.optimize.OccurrenceOrderPlugin()