kuzzle-device-manager 2.11.0 → 3.0.0-3-dev.2

package/dist/lib/modules/measure/MeasureSourcesBuilder.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deviceSourceToOriginDevice = exports.toDeviceSource = exports.apiSourceToOriginApi = void 0;
+exports.deviceSourceToOriginDevice = exports.apiSourceToOriginApi = void 0;
 function apiSourceToOriginApi(source, payloadUuids) {
     return {
         _id: source.id,
@@ -10,24 +10,14 @@ function apiSourceToOriginApi(source, payloadUuids) {
     };
 }
 exports.apiSourceToOriginApi = apiSourceToOriginApi;
-function toDeviceSource(dataSourceId, reference, model, metadata, lastMeasuredAt) {
-    return {
-        id: dataSourceId,
-        lastMeasuredAt,
-        metadata,
-        model,
-        reference,
-        type: "device" /* DATA_SOURCE_METADATA_TYPE.DEVICE */,
-    };
-}
-exports.toDeviceSource = toDeviceSource;
-function deviceSourceToOriginDevice(source, measureName, payloadUuids) {
-    const { id: dataSourceId, model, reference } = source;
+function deviceSourceToOriginDevice(source, measureName, payloadUuids, deviceMetadata) {
+    const { id: dataSourceId, model, reference, groups } = source;
     return {
         _id: dataSourceId,
+        deviceMetadata,
         deviceModel: model,
+        groups,
         measureName,
-        metadata: source.metadata,
         payloadUuids,
         reference: reference,
         type: "device" /* DATA_SOURCE_METADATA_TYPE.DEVICE */,

package/dist/lib/modules/measure/MeasureSourcesBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasureSourcesBuilder.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureSourcesBuilder.ts"],"names":[],"mappings":";;;AASA,SAAgB,oBAAoB,CAClC,MAAwB,EACxB,YAAsB;IAEtB,OAAO;QACL,GAAG,EAAE,MAAM,CAAC,EAAE;QACd,WAAW,EAAE,MAAM,CAAC,QAAQ;QAC5B,YAAY,EAAE,YAAY;QAC1B,IAAI,2CAA+B;KACpC,CAAC;AACJ,CAAC;AAVD,oDAUC;AAED,SAAgB,cAAc,CAC5B,YAAoB,EACpB,SAAiB,EACjB,KAAa,EACb,QAAmB,EACnB,cAAuB;IAEvB,OAAO;QACL,EAAE,EAAE,YAAY;QAChB,cAAc;QACd,QAAQ;QACR,KAAK;QACL,SAAS;QACT,IAAI,iDAAkC;KACvC,CAAC;AACJ,CAAC;AAfD,wCAeC;AAED,SAAgB,0BAA0B,CACxC,MAA2B,EAC3B,WAAmB,EACnB,YAAsB;IAEtB,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IACtD,OAAO;QACL,GAAG,EAAE,YAAY;QACjB,WAAW,EAAE,KAAK;QAClB,WAAW;QACX,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,YAAY;QACZ,SAAS,EAAE,SAAS;QACpB,IAAI,iDAAkC;KACvC,CAAC;AACJ,CAAC;AAfD,gEAeC"}
+{"version":3,"file":"MeasureSourcesBuilder.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureSourcesBuilder.ts"],"names":[],"mappings":";;;AASA,SAAgB,oBAAoB,CAClC,MAAwB,EACxB,YAAsB;IAEtB,OAAO;QACL,GAAG,EAAE,MAAM,CAAC,EAAE;QACd,WAAW,EAAE,MAAM,CAAC,QAAQ;QAC5B,YAAY,EAAE,YAAY;QAC1B,IAAI,2CAA+B;KACpC,CAAC;AACJ,CAAC;AAVD,oDAUC;AAED,SAAgB,0BAA0B,CACxC,MAA2B,EAC3B,WAAmB,EACnB,YAAsB,EACtB,cAAwB;IAExB,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC9D,OAAO;QACL,GAAG,EAAE,YAAY;QACjB,cAAc;QACd,WAAW,EAAE,KAAK;QAClB,MAAM;QACN,WAAW;QACX,YAAY;QACZ,SAAS,EAAE,SAAS;QACpB,IAAI,iDAAkC;KACvC,CAAC;AACJ,CAAC;AAjBD,gEAiBC"}

package/dist/lib/modules/measure/MeasureTargetBuilder.d.ts

@@ -1,3 +1,3 @@
 import { ApiMeasureTarget, DeviceMeasureTarget } from "./types/MeasureTarget";
-export declare function toApiTarget(indexId: string, assetId: string, engineGroup?: string): ApiMeasureTarget;
+export declare function toApiTarget(indexId: string, assetId: string, engineGroups?: string[]): ApiMeasureTarget;
 export declare function toDeviceTarget(indexId: string, assetId?: string): DeviceMeasureTarget;

package/dist/lib/modules/measure/MeasureTargetBuilder.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toDeviceTarget = exports.toApiTarget = void 0;
-function toApiTarget(indexId, assetId, engineGroup) {
+function toApiTarget(indexId, assetId, engineGroups) {
     return {
         assetId,
-        engineGroup,
+        engineGroups,
         indexId,
         type: "api",
     };

package/dist/lib/modules/measure/MeasureTargetBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasureTargetBuilder.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureTargetBuilder.ts"],"names":[],"mappings":";;;AAEA,SAAgB,WAAW,CACzB,OAAe,EACf,OAAe,EACf,WAAoB;IAEpB,OAAO;QACL,OAAO;QACP,WAAW;QACX,OAAO;QACP,IAAI,EAAE,KAAK;KACZ,CAAC;AACJ,CAAC;AAXD,kCAWC;AAED,SAAgB,cAAc,CAC5B,OAAe,EACf,OAAgB;IAEhB,OAAO;QACL,OAAO;QACP,OAAO;QACP,IAAI,EAAE,QAAQ;KACf,CAAC;AACJ,CAAC;AATD,wCASC"}
+{"version":3,"file":"MeasureTargetBuilder.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureTargetBuilder.ts"],"names":[],"mappings":";;;AAEA,SAAgB,WAAW,CACzB,OAAe,EACf,OAAe,EACf,YAAuB;IAEvB,OAAO;QACL,OAAO;QACP,YAAY;QACZ,OAAO;QACP,IAAI,EAAE,KAAK;KACZ,CAAC;AACJ,CAAC;AAXD,kCAWC;AAED,SAAgB,cAAc,CAC5B,OAAe,EACf,OAAgB;IAEhB,OAAO;QACL,OAAO;QACP,OAAO;QACP,IAAI,EAAE,QAAQ;KACf,CAAC;AACJ,CAAC;AATD,wCASC"}

package/dist/lib/modules/measure/collections/measuresMappings.d.ts

@@ -1,96 +1,7 @@
+import { CollectionMappings } from "kuzzle-sdk";
 /**
  * Base mappings for the "measures" collection.
  *
  * Those mappings does not contains the `values` mappings and `asset.metadata` mappings.
  */
-export declare const measuresMappings: {
-    dynamic: string;
-    properties: {
-        type: {
-            type: string;
-        };
-        values: {
-            properties: {};
-        };
-        /**
-         * Micro Timestamp of the measurement time.
-         */
-        measuredAt: {
-            type: string;
-        };
-        asset: {
-            properties: {
-                _id: {
-                    type: string;
-                };
-                model: {
-                    type: string;
-                };
-                reference: {
-                    type: string;
-                };
-                measureName: {
-                    type: string;
-                };
-                metadata: {
-                    properties: {};
-                };
-                groups: {
-                    properties: {
-                        id: {
-                            type: string;
-                            fields: {
-                                text: {
-                                    type: string;
-                                };
-                            };
-                        };
-                        date: {
-                            type: string;
-                        };
-                    };
-                };
-                softTenant: {
-                    type: string;
-                    fields: {
-                        text: {
-                            type: string;
-                        };
-                    };
-                };
-            };
-        };
-        /**
-         * Define the origin of the measure.
-         */
-        origin: {
-            properties: {
-                type: {
-                    type: string;
-                };
-                measureName: {
-                    type: string;
-                };
-                deviceMetadata: {
-                    properties: {};
-                };
-                apiMetadata: {
-                    dynamic: string;
-                    properties: {};
-                };
-                payloadUuids: {
-                    type: string;
-                };
-                deviceModel: {
-                    type: string;
-                };
-                reference: {
-                    type: string;
-                };
-                _id: {
-                    type: string;
-                };
-            };
-        };
-    };
-};
+export declare const measuresMappings: CollectionMappings;

package/dist/lib/modules/measure/collections/measuresMappings.js

@@ -32,17 +32,10 @@ exports.measuresMappings = {
                 },
                 groups: {
                     properties: {
-                        id: {
-                            type: "keyword",
-                            fields: { text: { type: "text" } },
-                        },
+                        path: { type: "keyword", fields: { text: { type: "text" } } },
                         date: { type: "date" },
                     },
                 },
-                softTenant: {
-                    type: "keyword",
-                    fields: { text: { type: "text" } },
-                },
             },
         },
         /**
@@ -57,10 +50,13 @@ exports.measuresMappings = {
                     // populated with device models metadata mappings
                     },
                 },
-                apiMetadata: {
-                    dynamic: "false",
-                    properties: {},
+                groups: {
+                    properties: {
+                        path: { type: "keyword", fields: { text: { type: "text" } } },
+                        date: { type: "date" },
+                    },
                 },
+                apiMetadata: { dynamic: "false", properties: {} },
                 payloadUuids: { type: "keyword" },
                 deviceModel: { type: "keyword" },
                 reference: { type: "keyword" },

package/dist/lib/modules/measure/collections/measuresMappings.js.map

@@ -1 +1 @@
-{"version":3,"file":"measuresMappings.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/collections/measuresMappings.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACU,QAAA,gBAAgB,GAAG;IAC9B,OAAO,EAAE,QAAQ;IACjB,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAEzB,MAAM,EAAE;YACN,UAAU,EAAE;YACV,yCAAyC;aAC1C;SACF;QAED;;WAEG;QACH,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAE5B,KAAK,EAAE;YACL,UAAU,EAAE;gBACV,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBACxB,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC1B,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9B,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAChC,QAAQ,EAAE;oBACR,UAAU,EAAE;oBACV,gDAAgD;qBACjD;iBACF;gBACD,MAAM,EAAE;oBACN,UAAU,EAAE;wBACV,EAAE,EAAE;4BACF,IAAI,EAAE,SAAS;4BACf,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;yBACnC;wBACD,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;qBACvB;iBACF;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,SAAS;oBACf,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE;iBACnC;aACF;SACF;QAED;;WAEG;QACH,MAAM,EAAE;YACN,UAAU,EAAE;gBACV,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAEzB,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAEhC,cAAc,EAAE;oBACd,UAAU,EAAE;oBACV,iDAAiD;qBAClD;iBACF;gBAED,WAAW,EAAE;oBACX,OAAO,EAAE,OAAO;oBAChB,UAAU,EAAE,EAAE;iBACf;gBAED,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAEjC,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAEhC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAE9B,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;aACzB;SACF;KACF;CACF,CAAC"}
+{"version":3,"file":"measuresMappings.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/collections/measuresMappings.ts"],"names":[],"mappings":";;;AAEA;;;;GAIG;AACU,QAAA,gBAAgB,GAAuB;IAClD,OAAO,EAAE,QAAQ;IACjB,UAAU,EAAE;QACV,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAEzB,MAAM,EAAE;YACN,UAAU,EAAE;YACV,yCAAyC;aAC1C;SACF;QAED;;WAEG;QACH,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAE5B,KAAK,EAAE;YACL,UAAU,EAAE;gBACV,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBACxB,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC1B,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9B,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAChC,QAAQ,EAAE;oBACR,UAAU,EAAE;oBACV,gDAAgD;qBACjD;iBACF;gBACD,MAAM,EAAE;oBACN,UAAU,EAAE;wBACV,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;wBAC7D,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;qBACvB;iBACF;aACF;SACF;QAED;;WAEG;QACH,MAAM,EAAE;YACN,UAAU,EAAE;gBACV,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAEzB,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAEhC,cAAc,EAAE;oBACd,UAAU,EAAE;oBACV,iDAAiD;qBAClD;iBACF;gBACD,MAAM,EAAE;oBACN,UAAU,EAAE;wBACV,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE;wBAC7D,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;qBACvB;iBACF;gBACD,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE;gBAEjD,YAAY,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAEjC,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAEhC,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;gBAE9B,GAAG,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;aACzB;SACF;KACF;CACF,CAAC"}

package/dist/lib/modules/measure/exports.d.ts

@@ -1,7 +1,6 @@
 export * from "./types/MeasureEvents";
 export * from "./types/MeasureContent";
 export * from "./types/MeasureDefinition";
-export * from "./measures";
 export * from "./roles/RoleMeasuresAdmin";
 export * from "./roles/RoleMeasuresReader";
 export * from "./collections/measuresMappings";

package/dist/lib/modules/measure/exports.js

@@ -17,7 +17,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types/MeasureEvents"), exports);
 __exportStar(require("./types/MeasureContent"), exports);
 __exportStar(require("./types/MeasureDefinition"), exports);
-__exportStar(require("./measures"), exports);
 __exportStar(require("./roles/RoleMeasuresAdmin"), exports);
 __exportStar(require("./roles/RoleMeasuresReader"), exports);
 __exportStar(require("./collections/measuresMappings"), exports);

package/dist/lib/modules/measure/exports.js.map

@@ -1 +1 @@
-{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../lib/modules/measure/exports.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,yDAAuC;AACvC,4DAA0C;AAC1C,6CAA2B;AAC3B,4DAA0C;AAC1C,6DAA2C;AAC3C,iEAA+C"}
+{"version":3,"file":"exports.js","sourceRoot":"","sources":["../../../../lib/modules/measure/exports.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,yDAAuC;AACvC,4DAA0C;AAC1C,4DAA0C;AAC1C,6DAA2C;AAC3C,iEAA+C"}

package/dist/lib/modules/measure/index.d.ts

@@ -2,7 +2,6 @@ export * from "./collections/measuresMappings";
 export * from "./types/MeasureEvents";
 export * from "./types/MeasureContent";
 export * from "./types/MeasureDefinition";
-export * from "./measures";
 export * from "./MeasureModule";
 export * from "./roles/RoleMeasuresAdmin";
 export * from "./roles/RoleMeasuresReader";

package/dist/lib/modules/measure/index.js

@@ -18,7 +18,6 @@ __exportStar(require("./collections/measuresMappings"), exports);
 __exportStar(require("./types/MeasureEvents"), exports);
 __exportStar(require("./types/MeasureContent"), exports);
 __exportStar(require("./types/MeasureDefinition"), exports);
-__exportStar(require("./measures"), exports);
 __exportStar(require("./MeasureModule"), exports);
 __exportStar(require("./roles/RoleMeasuresAdmin"), exports);
 __exportStar(require("./roles/RoleMeasuresReader"), exports);

package/dist/lib/modules/measure/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/modules/measure/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA+C;AAC/C,wDAAsC;AACtC,yDAAuC;AACvC,4DAA0C;AAC1C,6CAA2B;AAC3B,kDAAgC;AAChC,4DAA0C;AAC1C,6DAA2C;AAC3C,2EAAyD;AACzD,oDAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/modules/measure/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA+C;AAC/C,wDAAsC;AACtC,yDAAuC;AACvC,4DAA0C;AAC1C,kDAAgC;AAChC,4DAA0C;AAC1C,6DAA2C;AAC3C,2EAAyD;AACzD,oDAAkC"}

package/dist/lib/modules/measure/types/MeasureContent.d.ts

@@ -1,6 +1,6 @@
 import { JSONObject, KDocumentContent } from "kuzzle-sdk";
-import { Metadata } from "../../../modules/shared";
-import { AssetMeasureContext } from "../../../modules/asset";
+import { Metadata } from "../../shared";
+import { AssetMeasureContext } from "../../asset";
 interface AbstractMeasureOrigin {
     /**
      * Origin of the measure
@@ -35,6 +35,13 @@ export interface MeasureOriginDevice extends AbstractMeasureOrigin {
      * Origin device metadata
      */
     deviceMetadata?: Metadata;
+    /**
+     * Origin device groups
+     */
+    groups: Array<{
+        path: string;
+        date: number;
+    }>;
     /**
      * Device ID
      */

package/dist/lib/modules/measure/types/MeasureEvents.d.ts

@@ -1,25 +1,8 @@
-import { JSONObject, KDocument } from "kuzzle-sdk";
-import { DeviceContent } from "../../../modules/device";
-import { AssetContent } from "../../../modules/asset";
-import { Metadata } from "../../../modules/shared";
+import { JSONObject } from "kuzzle-sdk";
+import { AssetContent } from "../../asset";
 import { DecodedMeasurement, MeasureContent } from "./MeasureContent";
 import { MeasureSource } from "./MeasureSources";
 import { MeasureTarget } from "./MeasureTarget";
-/**
- * @internal
- *
- * @deprecated Replaced by new Ask implementing data sources
- */
-export type AskMeasureIngest = {
-    name: "device-manager:measures:ingest";
-    payload: {
-        device: KDocument<DeviceContent>;
-        measurements: DecodedMeasurement<JSONObject>[];
-        metadata: Metadata;
-        payloadUuids: string[];
-    };
-    result: void;
-};
 /**
  * @internal
  */
@@ -34,29 +17,12 @@ export type AskMeasureSourceIngest = {
     result: void;
 };
 /**
- * Event before starting to process new measures.
+ * Event before starting to process new measures from data source.
  *
  * Useful to enrich measures before they are saved.
- *
- * @deprecated Replaced by new triggers implementing data sources
  */
 export type EventMeasureProcessBefore = {
     name: "device-manager:measures:process:before";
-    args: [
-        {
-            asset: KDocument<AssetContent>;
-            device: KDocument<DeviceContent>;
-            measures: MeasureContent[];
-        }
-    ];
-};
-/**
- * Event before starting to process new measures from data source.
- *
- * Useful to enrich measures before they are saved.
- */
-export type EventMeasureProcessSourceBefore = {
-    name: "device-manager:measures:process:sourceBefore";
     args: [
         {
             source: MeasureSource;
@@ -67,60 +33,12 @@ export type EventMeasureProcessSourceBefore = {
     ];
 };
 /**
- * Tenant event before starting to process new measures.
+ * Tenant event before starting to process new measures from data source.
  *
  * Useful to enrich measures before they are saved.
- *
- * @deprecated Replaced by new triggers implementing data sources
  */
 export type TenantEventMeasureProcessBefore = {
     name: `engine:${string}:device-manager:measures:process:before`;
-    args: [
-        {
-            asset: KDocument<AssetContent>;
-            device: KDocument<DeviceContent>;
-            measures: MeasureContent[];
-        }
-    ];
-};
-/**
- * Tenant event before starting to process new measures from data source.
- *
- * Useful to enrich measures before they are saved.
- */
-export type TenantEventMeasureProcessSourceBefore = {
-    name: `engine:${string}:device-manager:measures:process:sourceBefore`;
-    args: [
-        {
-            source: MeasureSource;
-            target: MeasureTarget;
-            asset?: AssetContent;
-            measures: MeasureContent[];
-        }
-    ];
-};
-/**
- * Event triggered after updating device and asset with new measures but
- * before persistence in database.
- *
- * @deprecated Replaced by new triggers implementing data sources
- */
-export type EventMeasurePersistBefore = {
-    name: "device-manager:measures:persist:before";
-    args: [
-        {
-            asset: KDocument<AssetContent>;
-            device: KDocument<DeviceContent>;
-            measures: MeasureContent[];
-        }
-    ];
-};
-/**
- * Event triggered after updating the data source and asset with new measures but
- * before persistence in database.
- */
-export type EventMeasurePersistSourceBefore = {
-    name: "device-manager:measures:persist:sourceBefore";
     args: [
         {
             source: MeasureSource;
@@ -131,56 +49,10 @@ export type EventMeasurePersistSourceBefore = {
     ];
 };
 /**
- * Tenant event triggered after updating device and asset with new measures but
- * before persistence in database.
- *
- * @deprecated Replaced by new triggers implementing data sources
- */
-export type TenantEventMeasurePersistBefore = {
-    name: `engine:${string}:device-manager:measures:persist:before`;
-    args: [
-        {
-            asset: KDocument<AssetContent>;
-            device: KDocument<DeviceContent>;
-            measures: MeasureContent[];
-        }
-    ];
-};
-/**
- * Tenant event triggered after updating the data source and asset with new measures but
- * before persistence in database.
- */
-export type TenantEventMeasurePersistSourceBefore = {
-    name: `engine:${string}:device-manager:measures:persist:sourceBefore`;
-    args: [
-        {
-            source: MeasureSource;
-            target: MeasureTarget;
-            asset?: AssetContent;
-            measures: MeasureContent[];
-        }
-    ];
-};
-/**
- * Event after processing new measures.
- *
- * @deprecated Replaced by new triggers implementing data sources
+ * Event after processing new measures from data source.
  */
 export type EventMeasureProcessAfter = {
     name: "device-manager:measures:process:after";
-    args: [
-        {
-            asset: KDocument<AssetContent>;
-            device: KDocument<DeviceContent>;
-            measures: MeasureContent[];
-        }
-    ];
-};
-/**
- * Event after processing new measures from data source.
- */
-export type EventMeasureProcessSourceAfter = {
-    name: "device-manager:measures:process:sourceAfter";
     args: [
         {
             source: MeasureSource;
@@ -191,26 +63,11 @@ export type EventMeasureProcessSourceAfter = {
     ];
 };
 /**
- * Tenant event after processing new measures.
+ * Tenant event after processing new measures from data source.
  *
- * @deprecated Replaced by new triggers implementing data sources
  */
 export type TenantEventMeasureProcessAfter = {
     name: `engine:${string}:device-manager:measures:process:after`;
-    args: [
-        {
-            asset: KDocument<AssetContent>;
-            device: KDocument<DeviceContent>;
-            measures: MeasureContent[];
-        }
-    ];
-};
-/**
- * Tenant event after processing new measures from data source.
- *
- */
-export type TenantEventMeasureProcessSourceAfter = {
-    name: `engine:${string}:device-manager:measures:process:sourceAfter`;
     args: [
         {
             source: MeasureSource;

package/dist/lib/modules/measure/types/MeasureSources.d.ts

@@ -7,8 +7,13 @@ interface AbstractMeasureSource {
 export interface DeviceMeasureSource extends AbstractMeasureSource {
     type: "device";
     reference: string;
+    deviceMetadata: Metadata;
     model: string;
     lastMeasuredAt?: number;
+    groups: Array<{
+        path: string;
+        date: number;
+    }>;
 }
 export interface ApiMeasureSource extends AbstractMeasureSource {
     type: "api";

package/dist/lib/modules/measure/types/MeasureSources.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasureSources.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/types/MeasureSources.ts"],"names":[],"mappings":";;;AAmBA,SAAgB,QAAQ,CAAC,MAAW;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACzE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC;AAC1E,CAAC;AAVD,4BAUC;AAED,SAAgB,cAAc,CAAC,MAAW;IACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IACE,MAAM,CAAC,cAAc,KAAK,SAAS;QACnC,OAAO,MAAM,CAAC,cAAc,KAAK,QAAQ,EACzC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CACzE,CAAC;AACJ,CAAC;AAfD,wCAeC;AAED,SAAgB,WAAW,CAAC,MAAW;IACrC,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;AACnD,CAAC;AAFD,kCAEC"}
+{"version":3,"file":"MeasureSources.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/types/MeasureSources.ts"],"names":[],"mappings":";;;AAwBA,SAAgB,QAAQ,CAAC,MAAW;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QACzE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC;AAC1E,CAAC;AAVD,4BAUC;AAED,SAAgB,cAAc,CAAC,MAAW;IACxC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAClD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IACE,MAAM,CAAC,cAAc,KAAK,SAAS;QACnC,OAAO,MAAM,CAAC,cAAc,KAAK,QAAQ,EACzC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,OAAO,MAAM,CAAC,SAAS,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CACzE,CAAC;AACJ,CAAC;AAfD,wCAeC;AAED,SAAgB,WAAW,CAAC,MAAW;IACrC,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC;AACnD,CAAC;AAFD,kCAEC"}

package/dist/lib/modules/measure/types/MeasureTarget.d.ts

@@ -9,7 +9,7 @@ export interface DeviceMeasureTarget extends AbstractMeasureTarget {
 export interface ApiMeasureTarget extends AbstractMeasureTarget {
     type: "api";
     assetId: string;
-    engineGroup?: string;
+    engineGroups?: string[];
 }
 export declare function isTarget(target: any): target is AbstractMeasureTarget;
 export declare function isTargetDevice(target: any): target is DeviceMeasureTarget;

package/dist/lib/modules/measure/types/MeasureTarget.js

@@ -19,7 +19,7 @@ function isTargetApi(target) {
     if (!isTarget(target) && target.type !== "api") {
         return false;
     }
-    if (target.engineGroup && typeof target.engineGroup !== "string") {
+    if (target.engineGroups && !Array.isArray(target.engineGroups)) {
         return false;
     }
     return typeof target.assetId === "string";

package/dist/lib/modules/measure/types/MeasureTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"MeasureTarget.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/types/MeasureTarget.ts"],"names":[],"mappings":";;;AAgBA,SAAgB,QAAQ,CAAC,MAAW;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;AAC/E,CAAC;AAVD,4BAUC;AAED,SAAgB,cAAc,CAAC,MAAW;IACxC,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;AACtD,CAAC;AAFD,wCAEC;AAED,SAAgB,WAAW,CAAC,MAAW;IACrC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,WAAW,IAAI,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;QACjE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;AAC5C,CAAC;AAVD,kCAUC"}
+{"version":3,"file":"MeasureTarget.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/types/MeasureTarget.ts"],"names":[],"mappings":";;;AAgBA,SAAgB,QAAQ,CAAC,MAAW;IAClC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;AAC/E,CAAC;AAVD,4BAUC;AAED,SAAgB,cAAc,CAAC,MAAW;IACxC,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;AACtD,CAAC;AAFD,wCAEC;AAED,SAAgB,WAAW,CAAC,MAAW;IACrC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC/C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/D,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,CAAC;AAC5C,CAAC;AAVD,kCAUC"}

package/dist/lib/modules/model/ModelModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelModule.js","sourceRoot":"","sources":["../../../../lib/modules/model/ModelModule.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAE1C,yDAAsD;AACtD,iDAA8C;AAG9C,MAAa,WAAY,SAAQ,eAAM;IAKrC,YAAY,MAA2B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;IAC7E,CAAC;CACF;AAhBD,kCAgBC"}
+{"version":3,"file":"ModelModule.js","sourceRoot":"","sources":["../../../../lib/modules/model/ModelModule.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAE1C,yDAAsD;AACtD,iDAA8C;AAE9C,MAAa,WAAY,SAAQ,eAAM;IAIrC,YAAY,MAA2B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IAClE,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/D,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAE5E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;IAC7E,CAAC;CACF;AAfD,kCAeC"}

package/dist/lib/modules/model/ModelSerializer.js

@@ -5,15 +5,44 @@ const kuzzle_1 = require("kuzzle");
 class ModelSerializer {
     static id(type, model) {
         if (type === "asset") {
+            const assetModel = model;
+            if (assetModel.engineIds?.length) {
+                const sortedEngines = [...assetModel.engineIds].sort().join("+");
+                const sortedGroups = [...assetModel.engineGroups].sort().join("+");
+                return `model-asset-${sortedGroups}-${sortedEngines}-${ModelSerializer.title(type, model)}`;
+            }
+            if (assetModel.engineGroups.length > 1) {
+                const sortedGroups = [...assetModel.engineGroups].sort().join("+");
+                return `model-asset-${sortedGroups}-${ModelSerializer.title(type, model)}`;
+            }
             return `model-asset-${ModelSerializer.title(type, model)}`;
         }
         else if (type === "device") {
             return `model-device-${ModelSerializer.title(type, model)}`;
         }
         else if (type === "group") {
+            const groupModel = model;
+            if (groupModel.engineGroups.length > 1) {
+                const sortedGroups = [...groupModel.engineGroups].sort().join("+");
+                return `model-group-${sortedGroups}-${ModelSerializer.title(type, model)}`;
+            }
             return `model-group-${ModelSerializer.title(type, model)}`;
         }
         else if (type === "measure") {
+            const measureModel = model;
+            if (measureModel.engineIds?.length) {
+                const sortedEngines = [...measureModel.engineIds].sort().join("+");
+                if (measureModel.engineGroups?.length) {
+                    const sortedGroups = [...measureModel.engineGroups].sort().join("+");
+                    return `model-measure-${sortedGroups}-${sortedEngines}-${ModelSerializer.title(type, model)}`;
+                }
+                return `model-measure-${sortedEngines}-${ModelSerializer.title(type, model)}`;
+            }
+            if (measureModel.engineGroups?.length &&
+                measureModel.engineGroups.length > 1) {
+                const sortedGroups = [...measureModel.engineGroups].sort().join("+");
+                return `model-measure-${sortedGroups}-${ModelSerializer.title(type, model)}`;
+            }
             return `model-measure-${ModelSerializer.title(type, model)}`;
         }
         throw new kuzzle_1.BadRequestError(`Unknown model type "${type}"`);

package/dist/lib/modules/model/ModelSerializer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelSerializer.js","sourceRoot":"","sources":["../../../../lib/modules/model/ModelSerializer.ts"],"names":[],"mappings":";;;AAAA,mCAAyC;AASzC,MAAa,eAAe;IAC1B,MAAM,CAAC,EAAE,CAAyB,IAAY,EAAE,KAAQ;QACtD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACrB,OAAO,eAAe,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAC7D,CAAC;aAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,gBAAgB,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAC9D,CAAC;aAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,OAAO,eAAe,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAC7D,CAAC;aAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,iBAAiB,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;QAC/D,CAAC;QAED,MAAM,IAAI,wBAAe,CAAC,uBAAuB,IAAI,GAAG,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,CAAC,KAAK,CAAyB,IAAY,EAAE,KAAQ;QACzD,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YACrB,OAAQ,KAA2B,CAAC,KAAK,CAAC,KAAK,CAAC;QAClD,CAAC;aAAM,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAQ,KAA4B,CAAC,MAAM,CAAC,KAAK,CAAC;QACpD,CAAC;aAAM,IAAI,IAAI,KAAK,OAAO,EAAE,CAAC;YAC5B,OAAQ,KAA2B,CAAC,KAAK,CAAC,KAAK,CAAC;QAClD,CAAC;aAAM,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAQ,KAA6B,CAAC,OAAO,CAAC,IAAI,CAAC;QACrD,CAAC;QAED,MAAM,IAAI,wBAAe,CAAC,uBAAuB,IAAI,GAAG,CAAC,CAAC;IAC5D,CAAC;CACF;AA5BD,0CA4BC"}
+{"version":3,"file":"ModelSerializer.js","sourceRoot":"","sources":["../../../../lib/modules/model/ModelSerializer.ts"],"names":[],"mappings":"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"}