kuzzle-device-manager 0.4.10 → 0.4.13

package/README.md

@@ -17,7 +17,7 @@ npm install kuzzle-device-manager
 
 ### Online
 
-Open [https://docs.kuzzle.io/kuzzle-iot-platform/device-manager/1](https://docs.kuzzle.io/kuzzle-iot-platform/device-manager/1)
+Open [https://docs.kuzzle.io/official-plugins/device-manager/1/guides/devices/](https://docs.kuzzle.io/official-plugins/device-manager/1/guides/devices/)
 
 ### Locally
 

package/lib/DeviceManagerPlugin.js

@@ -158,7 +158,7 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
                     await this.sdk.index.create(this.config.adminIndex);
                 }
                 catch (error) {
-                    if (error.id !== 'services.storage.index_already_exists') {
+                    if (!error.message.includes('already exists')) {
                         throw error;
                     }
                 }

package/lib/core-classes/BatchProcessing/BatchController.d.ts

@@ -1,4 +1,4 @@
-import { DocumentController, EmbeddedSDK, JSONObject } from 'kuzzle';
+import { DocumentController, Kuzzle as KuzzleSDK, JSONObject } from 'kuzzle';
 import { BatchWriter } from './BatchWriter';
 /**
  * Overload of the document controller.
@@ -21,7 +21,9 @@ import { BatchWriter } from './BatchWriter';
  */
 export declare class BatchController extends DocumentController {
     writer: BatchWriter;
-    constructor(sdk: EmbeddedSDK, writer: BatchWriter);
+    constructor(sdk: KuzzleSDK, writer: BatchWriter);
+    protected extractErrorById(id: string, errors: any[]): any;
+    protected extractErrorByContent(content: JSONObject, errors: any[]): any;
     create(index: string, collection: string, content: JSONObject, _id?: string, options?: JSONObject): Promise<any>;
     replace(index: string, collection: string, _id: string, content: JSONObject, options?: JSONObject): Promise<any>;
     createOrReplace(index: string, collection: string, _id: string, content: JSONObject, options?: JSONObject): Promise<any>;

package/lib/core-classes/BatchProcessing/BatchController.js

@@ -1,6 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BatchController = void 0;
+const lodash_1 = __importDefault(require("lodash"));
+const json_stable_stringify_1 = __importDefault(require("json-stable-stringify"));
 const kuzzle_1 = require("kuzzle");
 /**
  * Overload of the document controller.
@@ -26,35 +31,59 @@ class BatchController extends kuzzle_1.DocumentController {
         super(sdk);
         this.writer = writer;
     }
+    extractErrorById(id, errors) {
+        return errors.find(({ document }) => document._id === id);
+    }
+    extractErrorByContent(content, errors) {
+        return errors.find(e => {
+            const responseDoc = (0, json_stable_stringify_1.default)(lodash_1.default.omit(e.document._source, ['_kuzzle_info']));
+            const originDoc = (0, json_stable_stringify_1.default)(content);
+            return responseDoc === originDoc;
+        });
+    }
     async create(index, collection, content, _id, options) {
-        const { idx, promise } = this.writer.addCreate(index, collection, content, _id, options);
-        const { successes } = await promise.promise;
-        return successes[idx];
+        try {
+            const { idx, promise } = this.writer.addCreate(index, collection, content, _id, options);
+            const { successes, errors } = await promise.promise;
+            if (errors.length > 0) {
+                const error = this.extractErrorByContent(content, errors);
+                if (error) {
+                    throw new kuzzle_1.BadRequestError(`Cannot create document in "${index}":"${collection}" : ${error.reason}`);
+                }
+            }
+            return successes[idx];
+        }
+        catch (exception) {
+            const error = this.extractErrorByContent(content, exception.errors);
+            if (error) {
+                throw new kuzzle_1.BadRequestError(`Cannot create document in "${index}":"${collection}" : ${error.reason}`);
+            }
+        }
     }
     async replace(index, collection, _id, content, options) {
         const { idx, promise } = this.writer.addReplace(index, collection, content, _id, options);
         const { successes, errors } = await promise.promise;
-        const error = errors.find(({ _id: id }) => id === _id);
+        const error = this.extractErrorById(_id, errors);
         if (error) {
-            throw new kuzzle_1.BadRequestError(`Cannot replace document "${_id}": ${error}`);
+            throw new kuzzle_1.BadRequestError(`Cannot replace document "${index}":"${collection}":"${_id}": ${error.reason}`);
         }
         return successes[idx];
     }
     async createOrReplace(index, collection, _id, content, options) {
         const { idx, promise } = this.writer.addCreateOrReplace(index, collection, content, _id, options);
         const { successes, errors } = await promise.promise;
-        const error = errors.find(({ document }) => document._id === _id);
+        const error = this.extractErrorById(_id, errors);
         if (error) {
-            throw new kuzzle_1.BadRequestError(`Cannot create or replace document "${_id}": ${error}`);
+            throw new kuzzle_1.BadRequestError(`Cannot create or replace document "${index}":"${collection}":"${_id}": ${error.reason}`);
         }
         return successes[idx];
     }
     async update(index, collection, _id, changes, options) {
         const { idx, promise } = this.writer.addUpdate(index, collection, changes, _id, options);
         const { successes, errors } = await promise.promise;
-        const error = errors.find(({ _id: id }) => id === _id);
+        const error = this.extractErrorById(_id, errors);
         if (error) {
-            throw new kuzzle_1.BadRequestError(`Cannot update document "${_id}": ${error}`);
+            throw new kuzzle_1.BadRequestError(`Cannot update document "${index}":"${collection}":"${_id}": ${error.reason}`);
         }
         return successes[idx];
     }
@@ -63,7 +92,7 @@ class BatchController extends kuzzle_1.DocumentController {
         const { successes } = await promise.promise;
         const document = successes.find(({ _id }) => _id === id);
         if (!document) {
-            throw new kuzzle_1.NotFoundError(`Document ${id} not found`, 'services.storage.not_found');
+            throw new kuzzle_1.NotFoundError(`Document "${index}":"${collection}":"${id}" not found`, 'services.storage.not_found');
         }
         return document;
     }
@@ -77,7 +106,7 @@ class BatchController extends kuzzle_1.DocumentController {
         const { successes, errors } = await promise.promise;
         const error = errors.find(({ _id }) => _id === id);
         if (error) {
-            throw new kuzzle_1.NotFoundError(`Cannot delete document ${id}: ${error}`);
+            throw new kuzzle_1.NotFoundError(`Cannot delete document "${index}":"${collection}":"${id}" : ${error.reason}`);
         }
         return successes[idx];
     }

package/lib/core-classes/DeviceService.js

@@ -34,8 +34,8 @@ class DeviceService {
             }
             const deviceDocuments = this.formatDevicesContent(devices, document);
             const { errors, successes } = await this.writeToDatabase(deviceDocuments, async (deviceDocuments) => {
-                const updated = await this.sdk.document.mUpdate(this.config.adminIndex, 'devices', deviceDocuments, { strict, ...options });
-                await this.sdk.document.mCreate(document.tenantId, 'devices', deviceDocuments, { strict, ...options });
+                const updated = await this.sdk.document.mUpdate(this.config.adminIndex, 'devices', deviceDocuments, { strict, refresh: options.refresh });
+                await this.sdk.document.mCreate(document.tenantId, 'devices', deviceDocuments, { strict, refresh: options.refresh });
                 return {
                     successes: results.successes.concat(updated.successes),
                     errors: results.errors.concat(updated.errors)
@@ -76,8 +76,8 @@ class DeviceService {
                 return { _id: device._id, body: { tenantId: null } };
             });
             const { errors, successes } = await this.writeToDatabase(deviceDocuments, async (deviceDocuments) => {
-                const updated = await this.sdk.document.mUpdate(this.config.adminIndex, 'devices', deviceDocuments, { strict, ...options });
-                await this.sdk.document.mDelete(document.tenantId, 'devices', deviceDocuments.map(device => device._id), { strict, ...options });
+                const updated = await this.sdk.document.mUpdate(this.config.adminIndex, 'devices', deviceDocuments, { strict, refresh: options.refresh });
+                await this.sdk.document.mDelete(document.tenantId, 'devices', deviceDocuments.map(device => device._id), { strict, refresh: options.refresh });
                 return {
                     successes: results.successes.concat(updated.successes),
                     errors: results.errors.concat(updated.errors)
@@ -123,15 +123,15 @@ class DeviceService {
                 assetDocuments.push({ _id: assetId, body: { measures } });
             }
             const updatedDevice = await this.writeToDatabase(deviceDocuments, async (deviceDocuments) => {
-                const updated = await this.sdk.document.mUpdate(this.config.adminIndex, 'devices', deviceDocuments, { strict, ...options });
-                await this.sdk.document.mUpdate(document.tenantId, 'devices', deviceDocuments, { strict, ...options });
+                const updated = await this.sdk.document.mUpdate(this.config.adminIndex, 'devices', deviceDocuments, { strict, refresh: options.refresh });
+                await this.sdk.document.mUpdate(document.tenantId, 'devices', deviceDocuments, { strict, refresh: options.refresh });
                 return {
                     successes: results.successes.concat(updated.successes),
                     errors: results.errors.concat(updated.errors)
                 };
             });
             const updatedAssets = await this.writeToDatabase(assetDocuments, async (assetDocuments) => {
-                const updated = await this.sdk.document.mUpdate(document.tenantId, 'assets', assetDocuments, { strict, ...options });
+                const updated = await this.sdk.document.mUpdate(document.tenantId, 'assets', assetDocuments, { strict, refresh: options.refresh });
                 return {
                     successes: results.successes.concat(updated.successes),
                     errors: results.errors.concat(updated.errors)
@@ -168,15 +168,15 @@ class DeviceService {
                 assetDocuments.push({ _id: device._source.assetId, body: { measures } });
             }
             const updatedDevice = await this.writeToDatabase(deviceDocuments, async (deviceDocuments) => {
-                const updated = await this.sdk.document.mUpdate(this.config.adminIndex, 'devices', deviceDocuments, { strict, ...options });
-                await this.sdk.document.mUpdate(document.tenantId, 'devices', deviceDocuments, { strict, ...options });
+                const updated = await this.sdk.document.mUpdate(this.config.adminIndex, 'devices', deviceDocuments, { strict, refresh: options.refresh });
+                await this.sdk.document.mUpdate(document.tenantId, 'devices', deviceDocuments, { strict, refresh: options.refresh });
                 return {
                     successes: results.successes.concat(updated.successes),
                     errors: results.errors.concat(updated.errors)
                 };
             });
             const updatedAssets = await this.writeToDatabase(assetDocuments, async (assetDocuments) => {
-                const updated = await this.sdk.document.mUpdate(document.tenantId, 'assets', assetDocuments, { strict, ...options });
+                const updated = await this.sdk.document.mUpdate(document.tenantId, 'assets', assetDocuments, { strict, refresh: options.refresh });
                 return {
                     successes: results.successes.concat(updated.successes),
                     errors: results.errors.concat(updated.errors)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kuzzle-device-manager",
-  "version": "0.4.10",
+  "version": "0.4.13",
   "description": "Manage your IoT devices and assets. Choose a provisionning strategy, receive and decode payload, handle your IoT business logic.",
   "author": "The Kuzzle Team (support@kuzzle.io)",
   "repository": {