kuzzle-device-manager 2.4.0-beta.8 → 2.4.0-dev.1

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 (158) hide show
  1. package/dist/lib/modules/asset/AssetHistoryService.js +2 -1
  2. package/dist/lib/modules/asset/AssetHistoryService.js.map +1 -1
  3. package/dist/lib/modules/asset/AssetModule.js +30 -0
  4. package/dist/lib/modules/asset/AssetModule.js.map +1 -1
  5. package/dist/lib/modules/asset/AssetService.d.ts +18 -4
  6. package/dist/lib/modules/asset/AssetService.js +91 -12
  7. package/dist/lib/modules/asset/AssetService.js.map +1 -1
  8. package/dist/lib/modules/asset/AssetsController.d.ts +7 -1
  9. package/dist/lib/modules/asset/AssetsController.js +132 -1
  10. package/dist/lib/modules/asset/AssetsController.js.map +1 -1
  11. package/dist/lib/modules/asset/AssetsGroupsController.js +1 -1
  12. package/dist/lib/modules/asset/AssetsGroupsController.js.map +1 -1
  13. package/dist/lib/modules/asset/model/AssetSerializer.js.map +1 -1
  14. package/dist/lib/modules/asset/roles/RoleAssetsAdmin.js +3 -0
  15. package/dist/lib/modules/asset/roles/RoleAssetsAdmin.js.map +1 -1
  16. package/dist/lib/modules/asset/roles/RoleAssetsReader.d.ts +4 -0
  17. package/dist/lib/modules/asset/roles/RoleAssetsReader.js +8 -0
  18. package/dist/lib/modules/asset/roles/RoleAssetsReader.js.map +1 -1
  19. package/dist/lib/modules/asset/roles/specificRoles/RoleAssetsConfiguration.d.ts +8 -0
  20. package/dist/lib/modules/asset/roles/specificRoles/RoleAssetsConfiguration.js +20 -0
  21. package/dist/lib/modules/asset/roles/specificRoles/RoleAssetsConfiguration.js.map +1 -0
  22. package/dist/lib/modules/asset/roles/specificRoles/RoleAssetsCreation.d.ts +8 -0
  23. package/dist/lib/modules/asset/roles/specificRoles/RoleAssetsCreation.js +24 -0
  24. package/dist/lib/modules/asset/roles/specificRoles/RoleAssetsCreation.js.map +1 -0
  25. package/dist/lib/modules/asset/roles/specificRoles/index.d.ts +2 -0
  26. package/dist/lib/modules/asset/roles/specificRoles/index.js +19 -0
  27. package/dist/lib/modules/asset/roles/specificRoles/index.js.map +1 -0
  28. package/dist/lib/modules/asset/types/AssetApi.d.ts +31 -2
  29. package/dist/lib/modules/decoder/DecodedPayload.js.map +1 -1
  30. package/dist/lib/modules/decoder/Decoder.d.ts +11 -0
  31. package/dist/lib/modules/decoder/Decoder.js +1 -0
  32. package/dist/lib/modules/decoder/Decoder.js.map +1 -1
  33. package/dist/lib/modules/decoder/DecodersRegister.js.map +1 -1
  34. package/dist/lib/modules/decoder/DecodingState.js +1 -1
  35. package/dist/lib/modules/decoder/DecodingState.js.map +1 -1
  36. package/dist/lib/modules/decoder/PayloadService.d.ts +1 -1
  37. package/dist/lib/modules/decoder/PayloadService.js +12 -6
  38. package/dist/lib/modules/decoder/PayloadService.js.map +1 -1
  39. package/dist/lib/modules/decoder/PayloadsController.js.map +1 -1
  40. package/dist/lib/modules/decoder/types/DecoderContent.d.ts +1 -0
  41. package/dist/lib/modules/device/DeviceModule.js +30 -0
  42. package/dist/lib/modules/device/DeviceModule.js.map +1 -1
  43. package/dist/lib/modules/device/DeviceService.d.ts +14 -5
  44. package/dist/lib/modules/device/DeviceService.js +73 -18
  45. package/dist/lib/modules/device/DeviceService.js.map +1 -1
  46. package/dist/lib/modules/device/DevicesController.d.ts +7 -1
  47. package/dist/lib/modules/device/DevicesController.js +134 -3
  48. package/dist/lib/modules/device/DevicesController.js.map +1 -1
  49. package/dist/lib/modules/device/roles/RoleDevicesReader.d.ts +4 -0
  50. package/dist/lib/modules/device/roles/RoleDevicesReader.js +8 -0
  51. package/dist/lib/modules/device/roles/RoleDevicesReader.js.map +1 -1
  52. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesAssetAssociation.d.ts +8 -0
  53. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesAssetAssociation.js +20 -0
  54. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesAssetAssociation.js.map +1 -0
  55. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesConfiguration.d.ts +8 -0
  56. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesConfiguration.js +20 -0
  57. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesConfiguration.js.map +1 -0
  58. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesCreation.d.ts +8 -0
  59. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesCreation.js +24 -0
  60. package/dist/lib/modules/device/roles/specificRoles/RoleDevicesCreation.js.map +1 -0
  61. package/dist/lib/modules/device/roles/specificRoles/index.d.ts +3 -0
  62. package/dist/lib/modules/device/roles/specificRoles/index.js +20 -0
  63. package/dist/lib/modules/device/roles/specificRoles/index.js.map +1 -0
  64. package/dist/lib/modules/device/types/DeviceApi.d.ts +23 -2
  65. package/dist/lib/modules/measure/MeasureExporter.d.ts +5 -4
  66. package/dist/lib/modules/measure/MeasureExporter.js +35 -14
  67. package/dist/lib/modules/measure/MeasureExporter.js.map +1 -1
  68. package/dist/lib/modules/measure/MeasureService.js +4 -2
  69. package/dist/lib/modules/measure/MeasureService.js.map +1 -1
  70. package/dist/lib/modules/measure/collections/measuresMappings.d.ts +3 -0
  71. package/dist/lib/modules/measure/collections/measuresMappings.js +5 -0
  72. package/dist/lib/modules/measure/collections/measuresMappings.js.map +1 -1
  73. package/dist/lib/modules/measure/measures/BatteryMeasure.js +12 -0
  74. package/dist/lib/modules/measure/measures/BatteryMeasure.js.map +1 -1
  75. package/dist/lib/modules/measure/measures/HumidityMeasure.js +12 -0
  76. package/dist/lib/modules/measure/measures/HumidityMeasure.js.map +1 -1
  77. package/dist/lib/modules/measure/measures/MovementMeasure.js +10 -0
  78. package/dist/lib/modules/measure/measures/MovementMeasure.js.map +1 -1
  79. package/dist/lib/modules/measure/measures/PositionMeasure.js +22 -0
  80. package/dist/lib/modules/measure/measures/PositionMeasure.js.map +1 -1
  81. package/dist/lib/modules/measure/measures/TemperatureMeasure.js +12 -0
  82. package/dist/lib/modules/measure/measures/TemperatureMeasure.js.map +1 -1
  83. package/dist/lib/modules/measure/types/MeasureContent.d.ts +4 -0
  84. package/dist/lib/modules/measure/types/MeasureDefinition.d.ts +28 -3
  85. package/dist/lib/modules/model/MappingsConflictsError.d.ts +7 -0
  86. package/dist/lib/modules/model/MappingsConflictsError.js +20 -0
  87. package/dist/lib/modules/model/MappingsConflictsError.js.map +1 -0
  88. package/dist/lib/modules/model/ModelSerializer.js.map +1 -1
  89. package/dist/lib/modules/model/ModelService.d.ts +16 -6
  90. package/dist/lib/modules/model/ModelService.js +246 -34
  91. package/dist/lib/modules/model/ModelService.js.map +1 -1
  92. package/dist/lib/modules/model/ModelsConflicts.d.ts +30 -0
  93. package/dist/lib/modules/model/ModelsConflicts.js +106 -0
  94. package/dist/lib/modules/model/ModelsConflicts.js.map +1 -0
  95. package/dist/lib/modules/model/ModelsController.d.ts +5 -1
  96. package/dist/lib/modules/model/ModelsController.js +54 -3
  97. package/dist/lib/modules/model/ModelsController.js.map +1 -1
  98. package/dist/lib/modules/model/ModelsRegister.d.ts +28 -3
  99. package/dist/lib/modules/model/ModelsRegister.js +50 -5
  100. package/dist/lib/modules/model/ModelsRegister.js.map +1 -1
  101. package/dist/lib/modules/model/collections/modelsMappings.js +24 -0
  102. package/dist/lib/modules/model/collections/modelsMappings.js.map +1 -1
  103. package/dist/lib/modules/model/types/ModelApi.d.ts +50 -4
  104. package/dist/lib/modules/model/types/ModelContent.d.ts +263 -2
  105. package/dist/lib/modules/model/types/ModelContent.js +15 -0
  106. package/dist/lib/modules/model/types/ModelContent.js.map +1 -1
  107. package/dist/lib/modules/model/types/ModelDefinition.d.ts +141 -5
  108. package/dist/lib/modules/plugin/DeviceManagerEngine.d.ts +141 -5
  109. package/dist/lib/modules/plugin/DeviceManagerEngine.js +235 -37
  110. package/dist/lib/modules/plugin/DeviceManagerEngine.js.map +1 -1
  111. package/dist/lib/modules/plugin/DeviceManagerPlugin.d.ts +113 -8
  112. package/dist/lib/modules/plugin/DeviceManagerPlugin.js +141 -19
  113. package/dist/lib/modules/plugin/DeviceManagerPlugin.js.map +1 -1
  114. package/dist/lib/modules/plugin/types/DeviceManagerConfiguration.d.ts +18 -4
  115. package/dist/lib/modules/plugin/types/InternalCollection.js +1 -1
  116. package/dist/lib/modules/plugin/types/InternalCollection.js.map +1 -1
  117. package/dist/lib/modules/shared/exports.d.ts +2 -0
  118. package/dist/lib/modules/shared/exports.js +2 -0
  119. package/dist/lib/modules/shared/exports.js.map +1 -1
  120. package/dist/lib/modules/shared/index.d.ts +6 -4
  121. package/dist/lib/modules/shared/index.js +6 -4
  122. package/dist/lib/modules/shared/index.js.map +1 -1
  123. package/dist/lib/modules/shared/services/AbstractExporter.d.ts +1 -2
  124. package/dist/lib/modules/shared/services/AbstractExporter.js +7 -1
  125. package/dist/lib/modules/shared/services/AbstractExporter.js.map +1 -1
  126. package/dist/lib/modules/shared/services/BaseService.js.map +1 -1
  127. package/dist/lib/modules/shared/services/DigitalTwinExporter.d.ts +0 -2
  128. package/dist/lib/modules/shared/services/DigitalTwinExporter.js +8 -2
  129. package/dist/lib/modules/shared/services/DigitalTwinExporter.js.map +1 -1
  130. package/dist/lib/modules/shared/services/DigitalTwinService.d.ts +21 -0
  131. package/dist/lib/modules/shared/services/DigitalTwinService.js +162 -0
  132. package/dist/lib/modules/shared/services/DigitalTwinService.js.map +1 -0
  133. package/dist/lib/modules/shared/services/index.d.ts +1 -0
  134. package/dist/lib/modules/shared/services/index.js +1 -0
  135. package/dist/lib/modules/shared/services/index.js.map +1 -1
  136. package/dist/lib/modules/shared/types/DigitalTwinApi.d.ts +34 -0
  137. package/dist/lib/modules/shared/types/DigitalTwinApi.js +3 -0
  138. package/dist/lib/modules/shared/types/DigitalTwinApi.js.map +1 -0
  139. package/dist/lib/modules/shared/types/DigitalTwinContent.d.ts +2 -4
  140. package/dist/lib/modules/shared/types/DigitalTwinEvents.d.ts +9 -0
  141. package/dist/lib/modules/shared/types/DigitalTwinEvents.js +3 -0
  142. package/dist/lib/modules/shared/types/DigitalTwinEvents.js.map +1 -0
  143. package/dist/lib/modules/shared/types/DigitalTwinMeasures.d.ts +5 -0
  144. package/dist/lib/modules/shared/types/DigitalTwinMeasures.js +3 -0
  145. package/dist/lib/modules/shared/types/DigitalTwinMeasures.js.map +1 -0
  146. package/dist/lib/modules/shared/utils/flattenObject.js +1 -2
  147. package/dist/lib/modules/shared/utils/flattenObject.js.map +1 -1
  148. package/dist/lib/modules/shared/utils/keepStack.js +1 -2
  149. package/dist/lib/modules/shared/utils/keepStack.js.map +1 -1
  150. package/dist/lib/modules/shared/utils/lock.js +1 -2
  151. package/dist/lib/modules/shared/utils/lock.js.map +1 -1
  152. package/dist/lib/modules/shared/utils/objectDiff.js +1 -2
  153. package/dist/lib/modules/shared/utils/objectDiff.js.map +1 -1
  154. package/dist/tsconfig.tsbuildinfo +1 -0
  155. package/package.json +26 -26
  156. package/dist/lib/modules/shared/utils/ask.d.ts +0 -8
  157. package/dist/lib/modules/shared/utils/ask.js +0 -12
  158. package/dist/lib/modules/shared/utils/ask.js.map +0 -1
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RoleDevicesConfiguration = void 0;
4
+ /**
5
+ * This role allows to configure a device metadata.
6
+ *
7
+ * It's a tenant role.
8
+ *
9
+ */
10
+ exports.RoleDevicesConfiguration = {
11
+ definition: {
12
+ controllers: {
13
+ "device-manager/devices": {
14
+ actions: { replaceMetadata: true, update: true },
15
+ },
16
+ },
17
+ },
18
+ name: "devices.configuration",
19
+ };
20
+ //# sourceMappingURL=RoleDevicesConfiguration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RoleDevicesConfiguration.js","sourceRoot":"","sources":["../../../../../../lib/modules/device/roles/specificRoles/RoleDevicesConfiguration.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACU,QAAA,wBAAwB,GAAe;IAClD,UAAU,EAAE;QACV,WAAW,EAAE;YACX,wBAAwB,EAAE;gBACxB,OAAO,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;aACjD;SACF;KACF;IACD,IAAI,EAAE,uBAAuB;CAC9B,CAAC"}
@@ -0,0 +1,8 @@
1
+ import { KuzzleRole } from "../../../shared/types/KuzzleRole";
2
+ /**
3
+ * This role allows to create, update and delete a device.
4
+ *
5
+ * It's a tenant role.
6
+ *
7
+ */
8
+ export declare const RoleDevicesCreation: KuzzleRole;
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RoleDevicesCreation = void 0;
4
+ /**
5
+ * This role allows to create, update and delete a device.
6
+ *
7
+ * It's a tenant role.
8
+ *
9
+ */
10
+ exports.RoleDevicesCreation = {
11
+ definition: {
12
+ controllers: {
13
+ "device-manager/devices": {
14
+ actions: {
15
+ create: true,
16
+ delete: true,
17
+ upsert: true,
18
+ },
19
+ },
20
+ },
21
+ },
22
+ name: "devices.creation",
23
+ };
24
+ //# sourceMappingURL=RoleDevicesCreation.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RoleDevicesCreation.js","sourceRoot":"","sources":["../../../../../../lib/modules/device/roles/specificRoles/RoleDevicesCreation.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACU,QAAA,mBAAmB,GAAe;IAC7C,UAAU,EAAE;QACV,WAAW,EAAE;YACX,wBAAwB,EAAE;gBACxB,OAAO,EAAE;oBACP,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,IAAI;iBACb;aACF;SACF;KACF;IACD,IAAI,EAAE,kBAAkB;CACzB,CAAC"}
@@ -0,0 +1,3 @@
1
+ export * from "./RoleDevicesAssetAssociation";
2
+ export * from "./RoleDevicesConfiguration";
3
+ export * from "./RoleDevicesCreation";
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
+ };
16
+ Object.defineProperty(exports, "__esModule", { value: true });
17
+ __exportStar(require("./RoleDevicesAssetAssociation"), exports);
18
+ __exportStar(require("./RoleDevicesConfiguration"), exports);
19
+ __exportStar(require("./RoleDevicesCreation"), exports);
20
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../lib/modules/device/roles/specificRoles/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gEAA8C;AAC9C,6DAA2C;AAC3C,wDAAsC"}
@@ -1,10 +1,11 @@
1
1
  import { JSONObject, KDocument, KHit, SearchResult } from "kuzzle-sdk";
2
2
  import { DecodedMeasurement, MeasureContent } from "../../measure";
3
3
  import { AssetContent } from "../../asset";
4
- import { Metadata } from "../../shared";
4
+ import { ApiDigitalTwinGetLastMeasuredAtRequest, ApiDigitalTwinGetLastMeasuredAtResult, ApiDigitalTwinGetLastMeasuresRequest, ApiDigitalTwinGetLastMeasuresResult, ApiDigitalTwinMGetLastMeasuredAtRequest, ApiDigitalTwinMGetLastMeasuredAtResult, ApiDigitalTwinMGetLastMeasuresRequest, ApiDigitalTwinMGetLastMeasuresResult, Metadata } from "../../shared";
5
5
  import { DeviceContent } from "./DeviceContent";
6
+ type DevicesControllerName = "device-manager/devices";
6
7
  interface DevicesControllerRequest {
7
- controller: "device-manager/devices";
8
+ controller: DevicesControllerName;
8
9
  engineId: string;
9
10
  }
10
11
  export interface ApiDeviceGetRequest extends DevicesControllerRequest {
@@ -21,6 +22,18 @@ export interface ApiDeviceUpdateRequest extends DevicesControllerRequest {
21
22
  };
22
23
  }
23
24
  export type ApiDeviceUpdateResult = KDocument<DeviceContent>;
25
+ export type ApiDeviceMetadataReplaceResult = KDocument<DeviceContent>;
26
+ export interface ApiDeviceUpsertRequest extends DevicesControllerRequest {
27
+ action: "upsert";
28
+ _id: string;
29
+ refresh?: string;
30
+ body: {
31
+ model: string;
32
+ reference: string;
33
+ metadata: Metadata;
34
+ };
35
+ }
36
+ export type ApiDeviceUpsertResult = KDocument<DeviceContent>;
24
37
  export interface ApiDeviceCreateRequest extends DevicesControllerRequest {
25
38
  action: "create";
26
39
  refresh?: string;
@@ -131,6 +144,10 @@ export type ApiDeviceGetMeasuresResult = {
131
144
  measures: Array<KDocument<MeasureContent<JSONObject>>>;
132
145
  total: number;
133
146
  };
147
+ export type ApiDeviceGetLastMeasuresRequest = ApiDigitalTwinGetLastMeasuresRequest<DevicesControllerName>;
148
+ export type ApiDeviceGetLastMeasuresResult = ApiDigitalTwinGetLastMeasuresResult;
149
+ export type ApiDeviceMGetLastMeasuresRequest = ApiDigitalTwinMGetLastMeasuresRequest<DevicesControllerName>;
150
+ export type ApiDeviceMGetLastMeasuresResult = ApiDigitalTwinMGetLastMeasuresResult;
134
151
  /**
135
152
  * This action can be used only with WebSocket or POST
136
153
  *
@@ -177,4 +194,8 @@ export interface ApiDeviceExportRequest extends DevicesControllerRequest {
177
194
  export type ApiDeviceExportResult = {
178
195
  link: string;
179
196
  };
197
+ export type ApiDeviceGetLastMeasuredAtRequest = ApiDigitalTwinGetLastMeasuredAtRequest<DevicesControllerName>;
198
+ export type ApiDeviceGetLastMeasuredAtResult = ApiDigitalTwinGetLastMeasuredAtResult;
199
+ export type ApiDeviceMGetLastMeasuredAtRequest = ApiDigitalTwinMGetLastMeasuredAtRequest<DevicesControllerName>;
200
+ export type ApiDeviceMGetLastMeasuredAtResult = ApiDigitalTwinMGetLastMeasuredAtResult;
180
201
  export {};
@@ -1,7 +1,5 @@
1
- /// <reference types="node" />
2
- /// <reference types="node" />
3
- import { UUID } from "node:crypto";
4
1
  import { KHit, User } from "kuzzle";
2
+ import { UUID } from "node:crypto";
5
3
  import { AbstractExporter, Column, ExportParams } from "../shared";
6
4
  import { MeasureContent } from "./exports";
7
5
  interface MeasureSearchParams extends ExportParams {
@@ -38,7 +36,10 @@ export declare class MeasureExporter extends AbstractExporter<MeasureExportParam
38
36
  * Never return a rejected promise and write potential error on the stream
39
37
  */
40
38
  prepareExport(engineId: string, user: User, params: MeasureSearchParams): Promise<string>;
41
- protected formatHit(columns: Column[], hit: KHit<MeasureContent>): any[];
39
+ protected formatHit(columns: Array<Column & {
40
+ shouldCheckName: boolean;
41
+ name: string;
42
+ }>, hit: KHit<MeasureContent>): any[];
42
43
  /**
43
44
  * Retrieve a prepared export and write each document as a CSV in the stream
44
45
  *
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.MeasureExporter = void 0;
7
7
  const kuzzle_1 = require("kuzzle");
8
+ const kuzzle_plugin_commons_1 = require("kuzzle-plugin-commons");
8
9
  const lodash_1 = __importDefault(require("lodash"));
9
10
  // ? queryTranslator is not exposed by package kuzzle so we need to import directly th file
10
11
  const queryTranslator_js_1 = __importDefault(require("kuzzle/lib/service/storage/queryTranslator.js"));
@@ -61,12 +62,16 @@ class MeasureExporter extends shared_1.AbstractExporter {
61
62
  return super.prepareExport(engineId, user, exportParams);
62
63
  }
63
64
  formatHit(columns, hit) {
64
- return columns.map(({ header: measureName, isMeasure, path }) => {
65
- if (isMeasure &&
65
+ return columns.map(({ name, shouldCheckName, path, isIsoDate }) => {
66
+ if (shouldCheckName &&
66
67
  this.target === plugin_1.InternalCollection.ASSETS &&
67
- hit._source.asset?.measureName !== measureName) {
68
+ hit._source.asset?.measureName !== name) {
68
69
  return null;
69
70
  }
71
+ const formattedValue = lodash_1.default.get(hit, path, null);
72
+ if (formattedValue !== null && isIsoDate) {
73
+ return new Date(formattedValue).toISOString();
74
+ }
70
75
  return lodash_1.default.get(hit, path, null);
71
76
  });
72
77
  }
@@ -81,14 +86,35 @@ class MeasureExporter extends shared_1.AbstractExporter {
81
86
  const result = await this.sdk.document.search(engineId, plugin_1.InternalCollection.MEASURES, { query, sort }, { lang, size: 200 });
82
87
  const targetModel = this.target === plugin_1.InternalCollection.ASSETS ? "asset" : "device";
83
88
  const engine = await this.getEngine(engineId);
84
- const modelDocument = await (0, shared_1.ask)(`ask:device-manager:model:${targetModel}:get`, {
89
+ const modelDocument = await (0, kuzzle_plugin_commons_1.ask)(`ask:device-manager:model:${targetModel}:get`, {
85
90
  engineGroup: engine.group,
86
91
  model,
87
92
  });
88
93
  const measureColumns = await this.generateMeasureColumns(modelDocument[targetModel].measures);
94
+ // sometimes we have multiple measures with same type
95
+ // detect them and add them a flag that will be used later
96
+ const foundDuplicateType = [];
97
+ for (const col of measureColumns) {
98
+ if (!foundDuplicateType.includes(col.path)) {
99
+ const pathFilteredColumns = measureColumns.filter((c) => col.path === c.path);
100
+ if (pathFilteredColumns.length > 1) {
101
+ foundDuplicateType.push(col.path);
102
+ }
103
+ }
104
+ }
105
+ for (const col of measureColumns) {
106
+ if (foundDuplicateType.includes(col.path)) {
107
+ col.shouldCheckName = true;
108
+ }
109
+ }
89
110
  const columns = [
90
- { header: "Payload Id", path: "_id" },
111
+ { header: "Measure Id", path: "_id" },
91
112
  { header: "Measured At", path: "_source.measuredAt" },
113
+ {
114
+ header: "Measured At ISO",
115
+ isIsoDate: true,
116
+ path: "_source.measuredAt",
117
+ },
92
118
  { header: "Measure Type", path: "_source.type" },
93
119
  { header: "Device Id", path: "_source.origin._id" },
94
120
  { header: "Device Model", path: "_source.origin.deviceModel" },
@@ -117,7 +143,7 @@ class MeasureExporter extends shared_1.AbstractExporter {
117
143
  const measures = [];
118
144
  for (const { name, type } of documentMeasures) {
119
145
  if (!(type in mappingsByMeasureType)) {
120
- const { measure } = await (0, shared_1.ask)("ask:device-manager:model:measure:get", { type });
146
+ const { measure } = await (0, kuzzle_plugin_commons_1.ask)("ask:device-manager:model:measure:get", { type });
121
147
  mappingsByMeasureType[type] = Object.keys((0, shared_1.flattenObject)(measure.valuesMappings));
122
148
  }
123
149
  for (const measure of mappingsByMeasureType[type]) {
@@ -128,17 +154,12 @@ class MeasureExporter extends shared_1.AbstractExporter {
128
154
  * 'temperature', 'acceleration.x', 'accuracy'
129
155
  */
130
156
  const path = measure.replace(".type", "").replace(".properties", "");
131
- /**
132
- * All of this is here to avoid a long header name like 'accelerationSensor.acceleration.x' (we don't need the 'acceleration' part)
133
- *
134
- * @example
135
- * 'temperatureInt', 'accelerationSensor.x', 'accelerationSensor.accuracy'
136
- */
137
- const header = `${name}.${path}`.replace(`${name}.${type}`, name);
157
+ const header = `${name}.${path}`;
138
158
  measures.push({
139
159
  header,
140
- isMeasure: true,
160
+ name,
141
161
  path: `_source.values.${path}`,
162
+ shouldCheckName: false,
142
163
  });
143
164
  }
144
165
  }
@@ -1 +1 @@
1
- {"version":3,"file":"MeasureExporter.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureExporter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MeasureExporter.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureExporter.ts"],"names":[],"mappings":"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"}
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.MeasureService = void 0;
7
7
  const kuzzle_1 = require("kuzzle");
8
+ const kuzzle_plugin_commons_1 = require("kuzzle-plugin-commons");
8
9
  const lodash_1 = __importDefault(require("lodash"));
9
10
  const asset_1 = require("../asset");
10
11
  const plugin_1 = require("../plugin");
@@ -12,7 +13,7 @@ const shared_1 = require("../shared");
12
13
  class MeasureService extends shared_1.BaseService {
13
14
  constructor(plugin) {
14
15
  super(plugin);
15
- (0, shared_1.onAsk)("device-manager:measures:ingest", async (payload) => {
16
+ (0, kuzzle_plugin_commons_1.onAsk)("device-manager:measures:ingest", async (payload) => {
16
17
  await this.ingest(payload.device, payload.measurements, payload.metadata, payload.payloadUuids);
17
18
  });
18
19
  }
@@ -211,6 +212,7 @@ class MeasureService extends shared_1.BaseService {
211
212
  measuredAt: measurement.measuredAt,
212
213
  origin: {
213
214
  _id: device._id,
215
+ deviceMetadata: device._source.metadata,
214
216
  deviceModel: device._source.model,
215
217
  measureName: measurement.measureName,
216
218
  payloadUuids,
@@ -291,7 +293,7 @@ async function historizeAssetStates(assetStates, engineId, originalAssetMetadata
291
293
  timestamp: measuredAt,
292
294
  });
293
295
  }
294
- return (0, shared_1.ask)("ask:device-manager:asset:history:add", {
296
+ return (0, kuzzle_plugin_commons_1.ask)("ask:device-manager:asset:history:add", {
295
297
  engineId,
296
298
  // Reverse order because for now, measuredAt are sorted in ascending order
297
299
  // While in mCreate the last item will be the first document to be created
@@ -1 +1 @@
1
- {"version":3,"file":"MeasureService.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureService.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAgE;AAChE,oDAAuB;AAEvB,oCAOkB;AAElB,sCAAoE;AACpE,sCAQmB;AAanB,MAAa,cAAe,SAAQ,oBAAW;IAC7C,YAAY,MAA2B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAA,cAAK,EACH,gCAAgC,EAChC,KAAK,EAAE,OAAO,EAAE,EAAE;YAChB,MAAM,IAAI,CAAC,MAAM,CACf,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,YAAY,CACrB,CAAC;QACJ,CAAC,CACF,CAAC;IACJ,CAAC;IAED;;;;;;;;;;;;;;OAcG;IACI,KAAK,CAAC,MAAM,CACjB,MAAgC,EAChC,YAA8C,EAC9C,QAAkB,EAClB,YAAsB;QAEtB,MAAM,IAAA,aAAI,EAAC,kBAAkB,MAAM,CAAC,GAAG,EAAE,EAAE,KAAK,IAAI,EAAE;;YACpD,IAAI,CAAC,YAAY,EAAE;gBACjB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CACf,wCAAwC,MAAM,CAAC,OAAO,CAAC,SAAS,GAAG,CACpE,CAAC;gBACF,OAAO;aACR;YAED,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;YACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACxC,QAAQ,EACR,MAAM,CAAC,OAAO,CAAC,OAAO,CACvB,CAAC;YACF,MAAM,qBAAqB,GACzB,KAAK,KAAK,IAAI;gBACZ,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;YAEzD,gBAAC,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CACjC,MAAM,EACN,KAAK,EACL,YAAY,EACZ,YAAY,CACb,CAAC;YAEF,IAAI,KAAK,EAAE;gBACT,MAAA,KAAK,CAAC,OAAO,EAAC,QAAQ,QAAR,QAAQ,GAAK,EAAE,EAAC;aAC/B;YAED;;;;eAIG;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CACpB,wCAAwC,EACxC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAC5B,CAAC;YAEF,IAAI,QAAQ,EAAE;gBACZ,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CACpB,UAAU,QAAQ,yCAAyC,EAC3D,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAC5B,CAAC;aACH;YAED,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAElD,IAAI,WAAW,GAAG,IAAI,GAAG,EAAmC,CAAC;YAC7D,IAAI,KAAK,EAAE;gBACT,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;aAC/D;YAED,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CACpB,wCAAwC,EACxC;gBACE,KAAK;gBACL,MAAM;gBACN,QAAQ;aACT,CACF,CAAC;YAEF,IAAI,QAAQ,EAAE;gBACZ,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CACpB,UAAU,QAAQ,yCAAyC,EAC3D,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAC5B,CAAC;aACH;YAED,MAAM,QAAQ,GAAG,EAAE,CAAC;YAEpB,QAAQ,CAAC,IAAI,CACX,IAAI,CAAC,GAAG,CAAC,QAAQ;iBACd,MAAM,CACL,IAAI,CAAC,MAAM,CAAC,UAAU,EACtB,2BAAkB,CAAC,OAAO,EAC1B,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,OAAO,CACf;iBACA,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,MAAM,IAAA,kBAAS,EACb,KAAK,EACL,IAAI,wBAAe,CACjB,yBAAyB,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE,CACzD,CACF,CAAC;YACJ,CAAC,CAAC,CACL,CAAC;YAEF,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,IAAI,CACX,IAAI,CAAC,GAAG,CAAC,QAAQ;qBACd,MAAM,CACL,QAAQ,EACR,2BAAkB,CAAC,OAAO,EAC1B,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,OAAO,CACf;qBACA,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,MAAM,IAAA,kBAAS,EACb,KAAK,EACL,IAAI,wBAAe,CACjB,gCAAgC,MAAM,CAAC,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE,CAChE,CACF,CAAC;gBACJ,CAAC,CAAC,CACL,CAAC;gBAEF,QAAQ,CAAC,IAAI,CACX,IAAI,CAAC,GAAG,CAAC,QAAQ;qBACd,OAAO,CACN,QAAQ,EACR,2BAAkB,CAAC,QAAQ,EAC3B,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAC/C;qBACA,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;oBACnB,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;wBACvB,MAAM,IAAI,wBAAe,CACvB,yBAAyB,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAC5C,CAAC;qBACH;gBACH,CAAC,CAAC,CACL,CAAC;gBAEF,IAAI,KAAK,EAAE;oBACT,mEAAmE;oBACnE,uDAAuD;oBACvD,oDAAoD;oBACpD,QAAQ,CAAC,IAAI,CACX,IAAI,CAAC,GAAG,CAAC,QAAQ;yBACd,MAAM,CACL,QAAQ,EACR,2BAAkB,CAAC,MAAM,EACzB,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,OAAO,CACd;yBACA,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;wBACf,MAAM,IAAA,kBAAS,EACb,KAAK,EACL,IAAI,wBAAe,CACjB,wBAAwB,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,OAAO,EAAE,CACvD,CACF,CAAC;oBACJ,CAAC,CAAC,CACL,CAAC;oBAEF,QAAQ,CAAC,IAAI,CACX,oBAAoB,CAClB,WAAW,EACX,QAAQ,EACR,qBAAqB,EACrB,KAAK,CAAC,OAAO,CAAC,QAAQ,CACvB,CACF,CAAC;iBACH;aACF;YAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAE5B;;;;;;eAMG;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CACpB,uCAAuC,EACvC;gBACE,KAAK;gBACL,MAAM;gBACN,QAAQ;aACT,CACF,CAAC;YAEF,IAAI,QAAQ,EAAE;gBACZ,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CACpB,UAAU,QAAQ,wCAAwC,EAC1D,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,CAC5B,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,oBAAoB,CAC1B,MAAgC,EAChC,YAA8B;QAE9B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC5B,MAAM,CAAC,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC9B;QAED,IAAI,cAAc,GAAG,CAAC,CAAC;QAEvB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC1C,SAAS;aACV;YAED,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,CAAC,WAAW,CAAC;YACnD,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAE7D,IACE,eAAe;gBACf,eAAe,CAAC,UAAU,IAAI,WAAW,CAAC,UAAU,EACpD;gBACA,SAAS;aACV;YAED,IAAI,WAAW,CAAC,UAAU,GAAG,cAAc,EAAE;gBAC3C,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC;aACzC;YAED,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG;gBACrC,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG;gBAChC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,YAAY;gBAC7C,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,MAAM,EAAE,WAAW,CAAC,MAAM;aAC3B,CAAC;SACH;QAED,MAAM,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;IACjD,CAAC;IAED,sIAAsI;IACtI;;;;OAIG;IACK,mBAAmB,CACzB,KAA8B,EAC9B,YAA8B;QAE9B,8EAA8E;QAC9E,MAAM,WAAW,GAAG,IAAI,GAAG,EAAmC,CAAC;QAE/D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC3B,KAAK,CAAC,OAAO,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC7B;QAED,IAAI,cAAc,GAAG,CAAC,CAAC;QAEvB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE;gBAC1C,SAAS;aACV;YAED,IAAI,WAAW,CAAC,KAAK,KAAK,IAAI,EAAE;gBAC9B,SAAS;aACV;YAED,MAAM,WAAW,GAAG,WAAW,CAAC,KAAK,CAAC,WAAW,CAAC;YAClD,yEAAyE;YACzE,qCAAqC;YACrC,IAAI,WAAW,KAAK,IAAI,EAAE;gBACxB,SAAS;aACV;YACD,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAE5D,IACE,eAAe;gBACf,eAAe,CAAC,UAAU,IAAI,WAAW,CAAC,UAAU,EACpD;gBACA,SAAS;aACV;YAED,IAAI,WAAW,CAAC,UAAU,GAAG,cAAc,EAAE;gBAC3C,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC;aACzC;YAED,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG;gBACpC,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,IAAI,EAAE,WAAW;gBACjB,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG;gBAChC,YAAY,EAAE,WAAW,CAAC,MAAM,CAAC,YAAY;gBAC7C,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,MAAM,EAAE,WAAW,CAAC,MAAM;aAC3B,CAAC;YAEF,WAAW,CAAC,GAAG,CACb,WAAW,CAAC,UAAU,EACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAClC,CAAC;SACH;QAED,KAAK,CAAC,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;QAE9C,OAAO,WAAW,CAAC;IACrB,CAAC;IAED;;OAEG;IACK,aAAa,CACnB,MAAgC,EAChC,KAAqC,EACrC,YAAkC,EAClC,YAAsB;QAEtB,MAAM,QAAQ,GAAqB,EAAE,CAAC;QAEtC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,qCAAqC;YACrC,MAAM,gBAAgB,GAAG,IAAI,CAAC,uBAAuB,CACnD,MAAM,EACN,KAAK,EACL,WAAW,CAAC,WAAW,CACxB,CAAC;YAEF,MAAM,YAAY,GAChB,KAAK,KAAK,IAAI,IAAI,gBAAgB,KAAK,IAAI;gBACzC,CAAC,CAAC,IAAI;gBACN,CAAC,CAAC,uBAAe,CAAC,cAAc,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;YAE9D,MAAM,cAAc,GAAmB;gBACrC,KAAK,EAAE,YAAY;gBACnB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,MAAM,EAAE;oBACN,GAAG,EAAE,MAAM,CAAC,GAAG;oBACf,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK;oBACjC,WAAW,EAAE,WAAW,CAAC,WAAW;oBACpC,YAAY;oBACZ,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS;oBACnC,IAAI,EAAE,QAAQ;iBACf;gBACD,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,MAAM,EAAE,WAAW,CAAC,MAAM;aAC3B,CAAC;YAEF,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;SAC/B;QAED,OAAO,QAAQ,CAAC,IAAI,CAClB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAClE,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAC7B,QAAgB,EAChB,OAAe;QAEf,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,IAAI,CAAC;SACb;QAED,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CACvC,QAAQ,EACR,2BAAkB,CAAC,MAAM,EACzB,OAAO,CACR,CAAC;YAEF,OAAO,KAAK,CAAC;SACd;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,QAAQ,wBAAwB,OAAO,IAAI,CAAC,CAAC;YAEpE,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAED;;OAEG;IACK,uBAAuB,CAC7B,MAAgC,EAChC,KAA8B,EAC9B,iBAAyB;QAEzB,IAAI,CAAC,KAAK,EAAE;YACV,OAAO,IAAI,CAAC;SACb;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CACjD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,GAAG,CAClC,CAAC;QAEF,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,wBAAe,CACvB,WAAW,MAAM,CAAC,GAAG,6BAA6B,KAAK,CAAC,GAAG,GAAG,CAC/D,CAAC;SACH;QAED,MAAM,WAAW,GAAG,UAAU,CAAC,YAAY,CAAC,IAAI,CAC9C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,iBAAiB,CACtC,CAAC;QACF,sEAAsE;QACtE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,IAAI,CAAC;SACb;QAED,OAAO,WAAW,CAAC,KAAK,CAAC;IAC3B,CAAC;CACF;AAnbD,wCAmbC;AAED;;GAEG;AACH,KAAK,UAAU,oBAAoB,CACjC,WAA2D,EAC3D,QAAgB,EAChB,qBAA+B,EAC/B,aAAuB;IAEvB,MAAM,eAAe,GAAG,IAAA,mBAAU,EAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;IACzE,MAAM,qBAAqB,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;IAEnE,MAAM,SAAS,GAA0B,EAAE,CAAC;IAC5C,KAAK,MAAM,CAAC,UAAU,EAAE,UAAU,CAAC,IAAI,WAAW,EAAE;QAClD,MAAM,YAAY,GAAG,EAAE,CAAC;QAExB,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAChE,IAAI,OAAO,EAAE,UAAU,KAAK,UAAU,EAAE;gBACtC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aACjC;SACF;QAED,MAAM,KAAK,GAA6B;YACtC,OAAO,EAAE;gBACP,KAAK,EAAE,YAAY;aACpB;YACD,IAAI,EAAE,SAAS;SAChB,CAAC;QAEF,UAAU,CAAC,OAAO,CAAC,QAAQ,GAAG,qBAAqB,CAAC;QAEpD,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,KAAK,qBAAqB,EAAE;YACvE,KAA8C,CAAC,QAAQ,GAAG;gBACzD,KAAK,EAAE,eAAe;aACvB,CAAC;YAEF,UAAU,CAAC,OAAO,CAAC,QAAQ,GAAG,aAAa,CAAC;SAC7C;QAED,SAAS,CAAC,IAAI,CAAC;YACb,KAAK,EAAE,UAAU,CAAC,OAAO;YACzB,KAAK;YACL,EAAE,EAAE,UAAU,CAAC,GAAG;YAClB,SAAS,EAAE,UAAU;SACtB,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,YAAG,EACR,sCAAsC,EACtC;QACE,QAAQ;QACR,0EAA0E;QAC1E,0EAA0E;QAC1E,SAAS,EAAE,SAAS,CAAC,OAAO,EAAE;KAC/B,CACF,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"MeasureService.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureService.ts"],"names":[],"mappings":"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"}
@@ -63,6 +63,9 @@ export declare const measuresMappings: {
63
63
  measureName: {
64
64
  type: string;
65
65
  };
66
+ deviceMetadata: {
67
+ properties: {};
68
+ };
66
69
  payloadUuids: {
67
70
  type: string;
68
71
  };
@@ -48,6 +48,11 @@ exports.measuresMappings = {
48
48
  properties: {
49
49
  type: { type: "keyword" },
50
50
  measureName: { type: "keyword" },
51
+ deviceMetadata: {
52
+ properties: {
53
+ // populated with device models metadata mappings
54
+ },
55
+ },
51
56
  payloadUuids: { type: "keyword" },
52
57
  deviceModel: { type: "keyword" },
53
58
  reference: { type: "keyword" },
@@ -1 +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;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,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"}
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;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,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"}
@@ -3,5 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.batteryMeasureDefinition = void 0;
4
4
  exports.batteryMeasureDefinition = {
5
5
  valuesMappings: { battery: { type: "integer" } },
6
+ valuesDetails: {
7
+ battery: {
8
+ en: {
9
+ friendlyName: "Battery level",
10
+ unit: "%",
11
+ },
12
+ fr: {
13
+ friendlyName: "Niveau de batterie",
14
+ unit: "%",
15
+ },
16
+ },
17
+ },
6
18
  };
7
19
  //# sourceMappingURL=BatteryMeasure.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"BatteryMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/BatteryMeasure.ts"],"names":[],"mappings":";;;AAQa,QAAA,wBAAwB,GAAsB;IACzD,cAAc,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;CACjD,CAAC"}
1
+ {"version":3,"file":"BatteryMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/BatteryMeasure.ts"],"names":[],"mappings":";;;AAQa,QAAA,wBAAwB,GAAsB;IACzD,cAAc,EAAE,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;IAEhD,aAAa,EAAE;QACb,OAAO,EAAE;YACP,EAAE,EAAE;gBACF,YAAY,EAAE,eAAe;gBAC7B,IAAI,EAAE,GAAG;aACV;YACD,EAAE,EAAE;gBACF,YAAY,EAAE,oBAAoB;gBAClC,IAAI,EAAE,GAAG;aACV;SACF;KACF;CACF,CAAC"}
@@ -3,5 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.humidityMeasureDefinition = void 0;
4
4
  exports.humidityMeasureDefinition = {
5
5
  valuesMappings: { humidity: { type: "float" } },
6
+ valuesDetails: {
7
+ humidity: {
8
+ en: {
9
+ friendlyName: "Relative humidity",
10
+ unit: "%",
11
+ },
12
+ fr: {
13
+ friendlyName: "Humidité relative",
14
+ unit: "%",
15
+ },
16
+ },
17
+ },
6
18
  };
7
19
  //# sourceMappingURL=HumidityMeasure.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"HumidityMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/HumidityMeasure.ts"],"names":[],"mappings":";;;AAQa,QAAA,yBAAyB,GAAsB;IAC1D,cAAc,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;CAChD,CAAC"}
1
+ {"version":3,"file":"HumidityMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/HumidityMeasure.ts"],"names":[],"mappings":";;;AAQa,QAAA,yBAAyB,GAAsB;IAC1D,cAAc,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IAC/C,aAAa,EAAE;QACb,QAAQ,EAAE;YACR,EAAE,EAAE;gBACF,YAAY,EAAE,mBAAmB;gBACjC,IAAI,EAAE,GAAG;aACV;YACD,EAAE,EAAE;gBACF,YAAY,EAAE,mBAAmB;gBACjC,IAAI,EAAE,GAAG;aACV;SACF;KACF;CACF,CAAC"}
@@ -3,5 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.movementMeasureDefinition = void 0;
4
4
  exports.movementMeasureDefinition = {
5
5
  valuesMappings: { movement: { type: "boolean" } },
6
+ valuesDetails: {
7
+ movement: {
8
+ en: {
9
+ friendlyName: "Movement detection",
10
+ },
11
+ fr: {
12
+ friendlyName: "Détection de mouvement",
13
+ },
14
+ },
15
+ },
6
16
  };
7
17
  //# sourceMappingURL=MovementMeasure.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"MovementMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/MovementMeasure.ts"],"names":[],"mappings":";;;AAQa,QAAA,yBAAyB,GAAsB;IAC1D,cAAc,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;CAClD,CAAC"}
1
+ {"version":3,"file":"MovementMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/MovementMeasure.ts"],"names":[],"mappings":";;;AAQa,QAAA,yBAAyB,GAAsB;IAC1D,cAAc,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;IACjD,aAAa,EAAE;QACb,QAAQ,EAAE;YACR,EAAE,EAAE;gBACF,YAAY,EAAE,oBAAoB;aACnC;YACD,EAAE,EAAE;gBACF,YAAY,EAAE,wBAAwB;aACvC;SACF;KACF;CACF,CAAC"}
@@ -7,5 +7,27 @@ exports.positionMeasureDefinition = {
7
7
  accuracy: { type: "float" },
8
8
  altitude: { type: "float" },
9
9
  },
10
+ valuesDetails: {
11
+ position: {
12
+ en: {
13
+ friendlyName: "Localization",
14
+ unit: "(lat,lon)",
15
+ },
16
+ fr: {
17
+ friendlyName: "Localisation",
18
+ unit: "(lat,lon)",
19
+ },
20
+ },
21
+ altitude: {
22
+ en: {
23
+ friendlyName: "Altitude",
24
+ unit: "m",
25
+ },
26
+ fr: {
27
+ friendlyName: "Altitude",
28
+ unit: "m",
29
+ },
30
+ },
31
+ },
10
32
  };
11
33
  //# sourceMappingURL=PositionMeasure.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"PositionMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/PositionMeasure.ts"],"names":[],"mappings":";;;AAaa,QAAA,yBAAyB,GAAsB;IAC1D,cAAc,EAAE;QACd,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;QAC/B,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;QAC3B,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;KAC5B;CACF,CAAC"}
1
+ {"version":3,"file":"PositionMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/PositionMeasure.ts"],"names":[],"mappings":";;;AAaa,QAAA,yBAAyB,GAAsB;IAC1D,cAAc,EAAE;QACd,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;QAC/B,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;QAC3B,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;KAC5B;IACD,aAAa,EAAE;QACb,QAAQ,EAAE;YACR,EAAE,EAAE;gBACF,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE,WAAW;aAClB;YACD,EAAE,EAAE;gBACF,YAAY,EAAE,cAAc;gBAC5B,IAAI,EAAE,WAAW;aAClB;SACF;QACD,QAAQ,EAAE;YACR,EAAE,EAAE;gBACF,YAAY,EAAE,UAAU;gBACxB,IAAI,EAAE,GAAG;aACV;YACD,EAAE,EAAE;gBACF,YAAY,EAAE,UAAU;gBACxB,IAAI,EAAE,GAAG;aACV;SACF;KACF;CACF,CAAC"}
@@ -3,5 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.temperatureMeasureDefinition = void 0;
4
4
  exports.temperatureMeasureDefinition = {
5
5
  valuesMappings: { temperature: { type: "float" } },
6
+ valuesDetails: {
7
+ temperature: {
8
+ en: {
9
+ friendlyName: "Temperature",
10
+ unit: "°C",
11
+ },
12
+ fr: {
13
+ friendlyName: "Température",
14
+ unit: "°C",
15
+ },
16
+ },
17
+ },
6
18
  };
7
19
  //# sourceMappingURL=TemperatureMeasure.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"TemperatureMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/TemperatureMeasure.ts"],"names":[],"mappings":";;;AAQa,QAAA,4BAA4B,GAAsB;IAC7D,cAAc,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;CACnD,CAAC"}
1
+ {"version":3,"file":"TemperatureMeasure.js","sourceRoot":"","sources":["../../../../../lib/modules/measure/measures/TemperatureMeasure.ts"],"names":[],"mappings":";;;AAQa,QAAA,4BAA4B,GAAsB;IAC7D,cAAc,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;IAClD,aAAa,EAAE;QACb,WAAW,EAAE;YACX,EAAE,EAAE;gBACF,YAAY,EAAE,aAAa;gBAC3B,IAAI,EAAE,IAAI;aACX;YACD,EAAE,EAAE;gBACF,YAAY,EAAE,aAAa;gBAC3B,IAAI,EAAE,IAAI;aACX;SACF;KACF;CACF,CAAC"}
@@ -10,6 +10,10 @@ export type MeasureOriginDevice = {
10
10
  * Name of the measure in the device
11
11
  */
12
12
  measureName: string;
13
+ /**
14
+ * Origin device metadata
15
+ */
16
+ deviceMetadata?: Metadata;
13
17
  /**
14
18
  * Payload uuids that were used to create this measure.
15
19
  */
@@ -1,15 +1,40 @@
1
1
  import { JSONObject } from "kuzzle-sdk";
2
+ interface MeasureLocales {
3
+ [localeString: string]: {
4
+ friendlyName: string;
5
+ unit?: string;
6
+ };
7
+ }
8
+ export interface MeasureValuesDetails {
9
+ [valueName: string]: MeasureLocales;
10
+ }
2
11
  /**
3
12
  * Represents a measure definition registered by the Device Manager
4
13
  *
5
14
  * @example
6
- * {
7
- * valuesMappings: { temperature: { type: 'float' } },
8
- * }
15
+ *{
16
+ * valuesMappings: { temperature: { type: "float" } },
17
+ * valuesDetails: {
18
+ * temperature: {
19
+ * en: {
20
+ * friendlyName: "Temperature",
21
+ * unit: "°C",
22
+ * },
23
+ * fr: {
24
+ * friendlyName: "Température",
25
+ * unit: "°C",
26
+ * },
27
+ * },
28
+ * },
29
+ *}
9
30
  */
10
31
  export interface MeasureDefinition {
11
32
  /**
12
33
  * Mappings for the measurement values in order to index the fields
13
34
  */
14
35
  valuesMappings: JSONObject;
36
+ valuesDetails?: {
37
+ [valueName: string]: MeasureLocales;
38
+ };
15
39
  }
40
+ export {};
@@ -0,0 +1,7 @@
1
+ import { JSONObject, KuzzleError } from "kuzzle";
2
+ export declare class MappingsConflictsError extends KuzzleError {
3
+ private conflicts;
4
+ constructor(message: string, conflicts: JSONObject, id?: string, code?: number);
5
+ get name(): string;
6
+ toJSON(): JSONObject;
7
+ }
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MappingsConflictsError = void 0;
4
+ const kuzzle_1 = require("kuzzle");
5
+ class MappingsConflictsError extends kuzzle_1.KuzzleError {
6
+ constructor(message, conflicts, id, code) {
7
+ super(message, 409, id, code);
8
+ this.conflicts = conflicts;
9
+ }
10
+ get name() {
11
+ return "MappingsConflictsError";
12
+ }
13
+ toJSON() {
14
+ const json = super.toJSON();
15
+ json.chunks = this.conflicts;
16
+ return json;
17
+ }
18
+ }
19
+ exports.MappingsConflictsError = MappingsConflictsError;
20
+ //# sourceMappingURL=MappingsConflictsError.js.map