npm - kuzzle-device-manager - Versions diffs - 2.8.0-dev.4 → 2.8.0-dev.6 - Mend

kuzzle-device-manager 2.8.0-dev.4 → 2.8.0-dev.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

package/dist/lib/modules/asset/AssetsGroupsService.js ADDED Viewed

@@ -0,0 +1,165 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AssetsGroupsService = void 0;
+const plugin_1 = require("../plugin");
+const shared_1 = require("../shared");
+const kuzzle_plugin_commons_1 = require("kuzzle-plugin-commons");
+class AssetsGroupsService extends shared_1.BaseService {
+    constructor(plugin) {
+        super(plugin);
+    }
+    async create(_id, engineId, metadata, model, name, parent, request) {
+        if (parent !== null) {
+            const parentGroup = await this.sdk.document.get(engineId, plugin_1.InternalCollection.ASSETS_GROUPS, parent);
+            const children = parentGroup._source.children ?? [];
+            children.push(_id);
+            await this.sdk.document.update(engineId, plugin_1.InternalCollection.ASSETS_GROUPS, parent, {
+                children,
+                lastUpdate: Date.now(),
+            });
+        }
+        const groupMetadata = {};
+        if (model !== null) {
+            const groupModel = await (0, kuzzle_plugin_commons_1.ask)("ask:device-manager:model:group:get", { model });
+            for (const metadataName of Object.keys(groupModel.group.metadataMappings)) {
+                if (metadata[metadataName]) {
+                    groupMetadata[metadataName] = metadata[metadataName];
+                }
+                else if (groupModel.group.defaultMetadata[metadataName]) {
+                    groupMetadata[metadataName] =
+                        groupModel.group.defaultMetadata[metadataName];
+                }
+                else {
+                    groupMetadata[metadataName] = null;
+                }
+            }
+        }
+        const group = {
+            _id,
+            _source: {
+                children: [],
+                lastUpdate: Date.now(),
+                metadata: { ...groupMetadata },
+                model,
+                name,
+                parent,
+            },
+        };
+        return this.createDocument(request, group, {
+            collection: plugin_1.InternalCollection.ASSETS_GROUPS,
+            engineId,
+        });
+    }
+    async get(engineId, _id, request) {
+        return this.getDocument(request, _id, {
+            collection: plugin_1.InternalCollection.ASSETS_GROUPS,
+            engineId,
+        });
+    }
+    async update(request, _id, engineId, updateContent) {
+        const updatedGroup = await this.updateDocument(request, {
+            _id,
+            _source: updateContent,
+        }, { collection: plugin_1.InternalCollection.ASSETS_GROUPS, engineId }, { source: true, triggerEvents: true });
+        return updatedGroup;
+    }
+    async delete(_id, engineId, request) {
+        const { _source: assetGroup } = await this.get(engineId, _id, request);
+        if (assetGroup.parent !== null) {
+            const { _source: parentGroup } = await this.get(engineId, assetGroup.parent, request);
+            await this.update(request, assetGroup.parent, engineId, {
+                children: parentGroup.children.filter((children) => children !== _id),
+                lastUpdate: Date.now(),
+            });
+        }
+        await this.sdk.document.mUpdate(engineId, plugin_1.InternalCollection.ASSETS_GROUPS, assetGroup.children.map((childrenId) => ({
+            _id: childrenId,
+            body: {
+                lastUpdate: Date.now(),
+                parent: null,
+            },
+        })), { strict: true });
+        const { hits: assets } = await this.sdk.document.search(engineId, plugin_1.InternalCollection.ASSETS, { query: { equals: { "groups.id": _id } } }, { lang: "koncorde" });
+        await this.sdk.document.mUpdate(engineId, plugin_1.InternalCollection.ASSETS, assets.map((asset) => ({
+            _id: asset._id,
+            body: {
+                groups: asset._source.groups.filter(({ id: groupId }) => groupId !== _id),
+            },
+        })), { strict: true });
+        return this.deleteDocument(request, _id, {
+            collection: plugin_1.InternalCollection.ASSETS_GROUPS,
+            engineId,
+        });
+    }
+    async search(engineId, searchParams, request) {
+        return this.searchDocument(request, searchParams, {
+            collection: plugin_1.InternalCollection.ASSETS_GROUPS,
+            engineId,
+        });
+    }
+    async addAsset(engineId, _id, assetIds, request) {
+        const assetGroup = await this.get(engineId, _id, request);
+        const assets = [];
+        for (const assetId of assetIds) {
+            const assetContent = (await this.getDocument(request, assetId, {
+                collection: plugin_1.InternalCollection.ASSETS,
+                engineId,
+            }))._source;
+            if (!Array.isArray(assetContent.groups)) {
+                assetContent.groups = [];
+            }
+            if (assetGroup._source.parent !== null) {
+                assetContent.groups.push({
+                    date: Date.now(),
+                    id: assetGroup._source.parent,
+                });
+            }
+            assetContent.groups.push({
+                date: Date.now(),
+                id: _id,
+            });
+            assets.push({
+                _id: assetId,
+                body: assetContent,
+            });
+        }
+        const assetsGroupsUpdate = await this.update(request, _id, engineId, {
+            lastUpdate: Date.now(),
+        });
+        const update = await this.sdk.document.mReplace(engineId, plugin_1.InternalCollection.ASSETS, assets, { triggerEvents: true });
+        return {
+            ...update,
+            assetsGroups: assetsGroupsUpdate,
+        };
+    }
+    async removeAsset(engineId, _id, assetIds, request) {
+        const { _source: AssetGroupContent } = await this.get(engineId, _id, request);
+        const removedGroups = AssetGroupContent.children;
+        removedGroups.push(_id);
+        const assets = [];
+        for (const assetId of assetIds) {
+            const assetContent = (await this.getDocument(request, assetId, {
+                collection: plugin_1.InternalCollection.ASSETS,
+                engineId,
+            }))._source;
+            if (!Array.isArray(assetContent.groups)) {
+                continue;
+            }
+            assetContent.groups = assetContent.groups.filter(({ id: groupId }) => !removedGroups.includes(groupId));
+            assets.push({
+                _id: assetId,
+                body: assetContent,
+            });
+        }
+        const assetsGroupsUpdate = await this.update(request, _id, engineId, {
+            lastUpdate: Date.now(),
+        });
+        const update = await this.sdk.document.mReplace(engineId, plugin_1.InternalCollection.ASSETS, assets, { triggerEvents: true });
+        return {
+            ...update,
+            assetsGroups: assetsGroupsUpdate,
+        };
+    }
+}
+exports.AssetsGroupsService = AssetsGroupsService;
+//# sourceMappingURL=AssetsGroupsService.js.map

package/dist/lib/modules/asset/AssetsGroupsService.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"AssetsGroupsService.js","sourceRoot":"","sources":["../../../../lib/modules/asset/AssetsGroupsService.ts"],"names":[],"mappings":"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"}

package/dist/lib/modules/device/DeviceService.d.ts CHANGED Viewed

@@ -9,6 +9,7 @@ import { DeviceContent } from "./types/DeviceContent";
 export declare class DeviceService extends DigitalTwinService {
     constructor(plugin: DeviceManagerPlugin);
     registerAskEvents(): void;
+    private _create;
     /**
      * Create a new device.
      *
@@ -30,6 +31,15 @@ export declare class DeviceService extends DigitalTwinService {
     update(engineId: string, deviceId: string, metadata: Metadata, request: KuzzleRequest): Promise<KDocument<DeviceContent>>;
     delete(engineId: string, deviceId: string, request: KuzzleRequest): Promise<void>;
     search(engineId: string, searchParams: SearchParams, request: KuzzleRequest): Promise<SearchResult<KHit<DeviceContent>>>;
+    /**
+     * Internal logic to attach the device to an engine
+     *
+     * @param engineId Engine id to attach to
+     * @param deviceId Device id to attach
+     * @param options.refresh Wait for ES indexation
+     * @param options.strict If true, throw if an operation isn't possible
+     */
+    private _attachEngine;
     /**
      * Attach the device to an engine
      *
@@ -67,7 +77,14 @@ export declare class DeviceService extends DigitalTwinService {
      */
     private generateMissingAssetMeasureNames;
     /**
-     * Unlink a device of an asset
+     * Internal logic of unlink a device of an asset
+     *
+     * @param {string} deviceId Id of the device
+     * @param {KuzzleRequest} request kuzzle request
+     */
+    private _unlinkAsset;
+    /**
+     * Unlink a device of an asset with lock
      *
      * @param {string} deviceId Id of the device
      * @param {KuzzleRequest} request kuzzle request

package/dist/lib/modules/device/DeviceService.js CHANGED Viewed

@@ -33,16 +33,10 @@ class DeviceService extends shared_1.DigitalTwinService {
             await this.attachEngine(engineId, deviceId, request);
         });
     }
-    /**
-     * Create a new device.
-     *
-     * @todo creating a device in the "device-manager" index should be a separate
-     * method since in this case "engineId" is not really an engine ID but still
-     * required as an argument (in part to check the tenant rights)
-     */
-    async create(model, reference, metadata, request) {
+    async _create(deviceId, model, reference, metadata, request) {
+        var _a;
         let device = {
-            _id: DeviceSerializer_1.DeviceSerializer.id(model, reference),
+            _id: deviceId,
             _source: {
                 assetId: null,
                 engineId: null,
@@ -53,38 +47,46 @@ class DeviceService extends shared_1.DigitalTwinService {
                 reference,
             },
         };
-        return (0, shared_1.lock)(`device:create:${device._id}`, async () => {
-            var _a;
-            const deviceModel = await this.getDeviceModel(model);
-            const engineId = request.getString("engineId");
-            for (const metadataName of Object.keys(deviceModel.device.metadataMappings)) {
-                (_a = device._source.metadata)[metadataName] || (_a[metadataName] = null);
-            }
-            for (const [metadataName, metadataValue] of Object.entries(deviceModel.device.defaultMetadata)) {
-                lodash_1.default.set(device._source.metadata, metadataName, metadataValue);
-            }
-            const refreshableCollections = [];
-            const { _source } = await this.createDocument(request, device, {
-                collection: plugin_1.InternalCollection.DEVICES,
-                engineId: this.config.adminIndex,
-            });
-            device._source = _source;
+        const deviceModel = await this.getDeviceModel(model);
+        const engineId = request.getString("engineId");
+        for (const metadataName of Object.keys(deviceModel.device.metadataMappings)) {
+            (_a = device._source.metadata)[metadataName] || (_a[metadataName] = null);
+        }
+        for (const [metadataName, metadataValue] of Object.entries(deviceModel.device.defaultMetadata)) {
+            lodash_1.default.set(device._source.metadata, metadataName, metadataValue);
+        }
+        const refreshableCollections = [];
+        const { _source } = await this.createDocument(request, device, {
+            collection: plugin_1.InternalCollection.DEVICES,
+            engineId: this.config.adminIndex,
+        });
+        device._source = _source;
+        refreshableCollections.push({
+            collection: plugin_1.InternalCollection.DEVICES,
+            index: this.config.adminIndex,
+        });
+        if (engineId && engineId !== this.config.adminIndex) {
+            device = await this._attachEngine(engineId, device._id, request);
             refreshableCollections.push({
                 collection: plugin_1.InternalCollection.DEVICES,
-                index: this.config.adminIndex,
+                index: engineId,
             });
-            if (engineId && engineId !== this.config.adminIndex) {
-                device = await this.attachEngine(engineId, device._id, request);
-                refreshableCollections.push({
-                    collection: plugin_1.InternalCollection.DEVICES,
-                    index: engineId,
-                });
-            }
-            if (request.getRefresh() === "wait_for") {
-                await Promise.all(refreshableCollections.map(({ index, collection }) => this.sdk.collection.refresh(index, collection)));
-            }
-            return device;
-        });
+        }
+        if (request.getRefresh() === "wait_for") {
+            await Promise.all(refreshableCollections.map(({ index, collection }) => this.sdk.collection.refresh(index, collection)));
+        }
+        return device;
+    }
+    /**
+     * Create a new device.
+     *
+     * @todo creating a device in the "device-manager" index should be a separate
+     * method since in this case "engineId" is not really an engine ID but still
+     * required as an argument (in part to check the tenant rights)
+     */
+    async create(model, reference, metadata, request) {
+        const deviceId = DeviceSerializer_1.DeviceSerializer.id(model, reference);
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => this._create(deviceId, model, reference, metadata, request));
     }
     async get(engineId, deviceId, request) {
         return this.getDocument(request, deviceId, {
@@ -99,29 +101,31 @@ class DeviceService extends shared_1.DigitalTwinService {
      * Replace a device metadata
      */
     async replaceMetadata(engineId, deviceId, metadata, request) {
-        const device = await this.get(engineId, deviceId, request);
-        for (const key in metadata) {
-            if (key in device._source.metadata) {
-                device._source.metadata[key] = metadata[key];
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => {
+            const device = await this.get(engineId, deviceId, request);
+            for (const key in metadata) {
+                if (key in device._source.metadata) {
+                    device._source.metadata[key] = metadata[key];
+                }
             }
-        }
-        const updatedPayload = await this.app.trigger("device-manager:device:update:before", { device: device, metadata });
-        const updatedDevice = await this.sdk.document.replace(engineId, plugin_1.InternalCollection.DEVICES, deviceId, updatedPayload.device._source);
-        await this.app.trigger("device-manager:device:update:after", {
-            device: updatedDevice,
-            metadata: updatedPayload.metadata,
+            const updatedPayload = await this.app.trigger("device-manager:device:update:before", { device: device, metadata });
+            const updatedDevice = await this.sdk.document.replace(engineId, plugin_1.InternalCollection.DEVICES, deviceId, updatedPayload.device._source);
+            await this.app.trigger("device-manager:device:update:after", {
+                device: updatedDevice,
+                metadata: updatedPayload.metadata,
+            });
+            return updatedDevice;
         });
-        return updatedDevice;
     }
     /**
      * Update or Create an device metadata
      */
     async upsert(engineId, model, reference, metadata, request) {
-        const deviceId = `${model}-${reference}`;
-        return (0, shared_1.lock)(`device:${engineId}:${deviceId}`, async () => {
+        const deviceId = DeviceSerializer_1.DeviceSerializer.id(model, reference);
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => {
             const adminIndexDevice = await this.get(this.config.adminIndex, deviceId, request).catch(() => null);
             if (!adminIndexDevice) {
-                return this.create(model, reference, metadata, request);
+                return this._create(deviceId, model, reference, metadata, request);
             }
             if (adminIndexDevice._source.engineId &&
                 adminIndexDevice._source.engineId !== engineId) {
@@ -129,7 +133,7 @@ class DeviceService extends shared_1.DigitalTwinService {
             }
             const engineDevice = await this.get(engineId, deviceId, request).catch(() => null);
             if (!engineDevice) {
-                await this.attachEngine(engineId, deviceId, request);
+                await this._attachEngine(engineId, deviceId, request);
             }
             const updatedPayload = await this.app.trigger("device-manager:device:update:before", { device: adminIndexDevice, metadata });
             const updatedDevice = await this.updateDocument(request, {
@@ -147,7 +151,7 @@ class DeviceService extends shared_1.DigitalTwinService {
         });
     }
     async update(engineId, deviceId, metadata, request) {
-        return (0, shared_1.lock)(`device:update:${deviceId}`, async () => {
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => {
             const device = await this.get(engineId, deviceId, request);
             const updatedPayload = await this.app.trigger("device-manager:device:update:before", { device, metadata });
             const updatedDevice = await this.updateDocument(request, {
@@ -162,7 +166,7 @@ class DeviceService extends shared_1.DigitalTwinService {
         });
     }
     async delete(engineId, deviceId, request) {
-        return (0, shared_1.lock)(`device:delete:${deviceId}`, async () => {
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => {
             const device = await this.get(engineId, deviceId, request);
             const promises = [];
             if (device._source.assetId) {
@@ -211,6 +215,40 @@ class DeviceService extends shared_1.DigitalTwinService {
             engineId,
         });
     }
+    /**
+     * Internal logic to attach the device to an engine
+     *
+     * @param engineId Engine id to attach to
+     * @param deviceId Device id to attach
+     * @param options.refresh Wait for ES indexation
+     * @param options.strict If true, throw if an operation isn't possible
+     */
+    async _attachEngine(engineId, deviceId, request) {
+        const device = await this.getInternalDevices(deviceId);
+        if (device._source.engineId) {
+            throw new kuzzle_1.BadRequestError(`Device "${device._id}" is already attached to an engine.`);
+        }
+        await this.checkEngineExists(engineId);
+        device._source.engineId = engineId;
+        await this.updateDocument(request, device, {
+            collection: plugin_1.InternalCollection.DEVICES,
+            engineId: this.config.adminIndex,
+        });
+        // Make sure the device is cleaned when attached to tenant
+        device._source.lastMeasuredAt = null;
+        device._source.measures = {};
+        const updatedDevice = await this.createDocument(request, device, {
+            collection: plugin_1.InternalCollection.DEVICES,
+            engineId,
+        });
+        if (request.getRefresh() === "wait_for") {
+            await Promise.all([
+                this.sdk.collection.refresh(this.config.adminIndex, plugin_1.InternalCollection.DEVICES),
+                this.sdk.collection.refresh(device._source.engineId, plugin_1.InternalCollection.DEVICES),
+            ]);
+        }
+        return updatedDevice;
+    }
     /**
      * Attach the device to an engine
      *
@@ -220,32 +258,7 @@ class DeviceService extends shared_1.DigitalTwinService {
      * @param options.strict If true, throw if an operation isn't possible
      */
     async attachEngine(engineId, deviceId, request) {
-        return (0, shared_1.lock)(`device:attachEngine:${deviceId}`, async () => {
-            const device = await this.getInternalDevices(deviceId);
-            if (device._source.engineId) {
-                throw new kuzzle_1.BadRequestError(`Device "${device._id}" is already attached to an engine.`);
-            }
-            await this.checkEngineExists(engineId);
-            device._source.engineId = engineId;
-            await this.updateDocument(request, device, {
-                collection: plugin_1.InternalCollection.DEVICES,
-                engineId: this.config.adminIndex,
-            });
-            // Make sure the device is cleaned when attached to tenant
-            device._source.lastMeasuredAt = null;
-            device._source.measures = {};
-            const updatedDevice = await this.createDocument(request, device, {
-                collection: plugin_1.InternalCollection.DEVICES,
-                engineId,
-            });
-            if (request.getRefresh() === "wait_for") {
-                await Promise.all([
-                    this.sdk.collection.refresh(this.config.adminIndex, plugin_1.InternalCollection.DEVICES),
-                    this.sdk.collection.refresh(device._source.engineId, plugin_1.InternalCollection.DEVICES),
-                ]);
-            }
-            return updatedDevice;
-        });
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => this._attachEngine(engineId, deviceId, request));
     }
     /**
      * Detach a device from its attached engine
@@ -254,7 +267,7 @@ class DeviceService extends shared_1.DigitalTwinService {
      * @param {KuzzleRequest} request kuzzle request
      */
     async detachEngine(deviceId, request) {
-        return (0, shared_1.lock)(`device:detachEngine:${deviceId}`, async () => {
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => {
             const device = await this.getInternalDevices(deviceId);
             this.checkAttachedToEngine(device);
             if (device._source.assetId) {
@@ -283,7 +296,7 @@ class DeviceService extends shared_1.DigitalTwinService {
      * Link a device to an asset.
      */
     async linkAsset(engineId, deviceId, assetId, measureNames, implicitMeasuresLinking, request) {
-        return (0, shared_1.lock)(`device:linkAsset:${deviceId}`, async () => {
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => {
             const device = await this.getInternalDevices(deviceId);
             const engine = await this.getEngine(engineId);
             this.checkAttachedToEngine(device);
@@ -424,61 +437,68 @@ class DeviceService extends shared_1.DigitalTwinService {
         }
     }
     /**
-     * Unlink a device of an asset
+     * Internal logic of unlink a device of an asset
      *
      * @param {string} deviceId Id of the device
      * @param {KuzzleRequest} request kuzzle request
      */
-    async unlinkAsset(deviceId, request) {
-        return (0, shared_1.lock)(`device:unlinkAsset:${deviceId}`, async () => {
-            const device = await this.getInternalDevices(deviceId);
-            const engineId = device._source.engineId;
-            this.checkAttachedToEngine(device);
-            if (!device._source.assetId) {
-                throw new kuzzle_1.BadRequestError(`Device "${device._id}" is not linked to an asset.`);
-            }
-            const asset = await this.sdk.document.get(engineId, plugin_1.InternalCollection.ASSETS, device._source.assetId);
-            const linkedDevices = asset._source.linkedDevices.filter((link) => link._id !== device._id);
-            const [updatedDevice, , updatedAsset] = await Promise.all([
-                this.updateDocument(request, { _id: device._id, _source: { assetId: null } }, {
-                    collection: plugin_1.InternalCollection.DEVICES,
-                    engineId: this.config.adminIndex,
-                }, { source: true }),
-                this.updateDocument(request, { _id: device._id, _source: { assetId: null } }, {
-                    collection: plugin_1.InternalCollection.DEVICES,
-                    engineId,
-                }),
-                this.updateDocument(request, { _id: asset._id, _source: { linkedDevices } }, {
-                    collection: plugin_1.InternalCollection.ASSETS,
-                    engineId,
-                }, { source: true }),
-            ]);
-            const event = {
-                name: "unlink",
-                unlink: {
-                    deviceId,
-                },
-            };
-            await (0, kuzzle_plugin_commons_1.ask)("ask:device-manager:asset:history:add", {
+    async _unlinkAsset(deviceId, request) {
+        const device = await this.getInternalDevices(deviceId);
+        const engineId = device._source.engineId;
+        this.checkAttachedToEngine(device);
+        if (!device._source.assetId) {
+            throw new kuzzle_1.BadRequestError(`Device "${device._id}" is not linked to an asset.`);
+        }
+        const asset = await this.sdk.document.get(engineId, plugin_1.InternalCollection.ASSETS, device._source.assetId);
+        const linkedDevices = asset._source.linkedDevices.filter((link) => link._id !== device._id);
+        const [updatedDevice, , updatedAsset] = await Promise.all([
+            this.updateDocument(request, { _id: device._id, _source: { assetId: null } }, {
+                collection: plugin_1.InternalCollection.DEVICES,
+                engineId: this.config.adminIndex,
+            }, { source: true }),
+            this.updateDocument(request, { _id: device._id, _source: { assetId: null } }, {
+                collection: plugin_1.InternalCollection.DEVICES,
                 engineId,
-                histories: [
-                    {
-                        asset: updatedAsset._source,
-                        event,
-                        id: updatedAsset._id,
-                        timestamp: Date.now(),
-                    },
-                ],
-            });
-            if (request.getRefresh() === "wait_for") {
-                await Promise.all([
-                    this.sdk.collection.refresh(this.config.adminIndex, plugin_1.InternalCollection.DEVICES),
-                    this.sdk.collection.refresh(engineId, plugin_1.InternalCollection.DEVICES),
-                    this.sdk.collection.refresh(engineId, plugin_1.InternalCollection.ASSETS),
-                ]);
-            }
-            return { asset: updatedAsset, device: updatedDevice };
+            }),
+            this.updateDocument(request, { _id: asset._id, _source: { linkedDevices } }, {
+                collection: plugin_1.InternalCollection.ASSETS,
+                engineId,
+            }, { source: true }),
+        ]);
+        const event = {
+            name: "unlink",
+            unlink: {
+                deviceId,
+            },
+        };
+        await (0, kuzzle_plugin_commons_1.ask)("ask:device-manager:asset:history:add", {
+            engineId,
+            histories: [
+                {
+                    asset: updatedAsset._source,
+                    event,
+                    id: updatedAsset._id,
+                    timestamp: Date.now(),
+                },
+            ],
         });
+        if (request.getRefresh() === "wait_for") {
+            await Promise.all([
+                this.sdk.collection.refresh(this.config.adminIndex, plugin_1.InternalCollection.DEVICES),
+                this.sdk.collection.refresh(engineId, plugin_1.InternalCollection.DEVICES),
+                this.sdk.collection.refresh(engineId, plugin_1.InternalCollection.ASSETS),
+            ]);
+        }
+        return { asset: updatedAsset, device: updatedDevice };
+    }
+    /**
+     * Unlink a device of an asset with lock
+     *
+     * @param {string} deviceId Id of the device
+     * @param {KuzzleRequest} request kuzzle request
+     */
+    async unlinkAsset(deviceId, request) {
+        return (0, shared_1.lock)(`device:${deviceId}`, async () => this._unlinkAsset(deviceId, request));
     }
     async checkEngineExists(engineId) {
         const { result: { exists }, } = await this.sdk.query({