kuzzle-device-manager 3.0.0-3-dev.22 → 3.0.0-3-dev.24
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.
- package/dist/lib/modules/asset/AssetModule.d.ts +2 -2
- package/dist/lib/modules/asset/AssetModule.js +1 -1
- package/dist/lib/modules/asset/AssetModule.js.map +1 -1
- package/dist/lib/modules/asset/AssetService.d.ts +4 -0
- package/dist/lib/modules/asset/AssetService.js +59 -23
- package/dist/lib/modules/asset/AssetService.js.map +1 -1
- package/dist/lib/modules/asset/AssetsController.d.ts +1 -1
- package/dist/lib/modules/asset/AssetsController.js +14 -13
- package/dist/lib/modules/asset/AssetsController.js.map +1 -1
- package/dist/lib/modules/decoder/Decoder.js +19 -21
- package/dist/lib/modules/decoder/Decoder.js.map +1 -1
- package/dist/lib/modules/decoder/DecoderModule.d.ts +1 -1
- package/dist/lib/modules/decoder/DecoderModule.js +1 -1
- package/dist/lib/modules/decoder/DecoderModule.js.map +1 -1
- package/dist/lib/modules/decoder/DecodersController.d.ts +2 -2
- package/dist/lib/modules/decoder/DecodersController.js +4 -4
- package/dist/lib/modules/decoder/DecodersController.js.map +1 -1
- package/dist/lib/modules/decoder/DecodersRegister.d.ts +1 -1
- package/dist/lib/modules/decoder/DecodersRegister.js.map +1 -1
- package/dist/lib/modules/decoder/PayloadService.d.ts +7 -1
- package/dist/lib/modules/decoder/PayloadService.js +76 -94
- package/dist/lib/modules/decoder/PayloadService.js.map +1 -1
- package/dist/lib/modules/decoder/PayloadsController.d.ts +2 -2
- package/dist/lib/modules/device/DeviceModule.d.ts +1 -1
- package/dist/lib/modules/device/DeviceModule.js +1 -1
- package/dist/lib/modules/device/DeviceModule.js.map +1 -1
- package/dist/lib/modules/device/DeviceService.d.ts +8 -1
- package/dist/lib/modules/device/DeviceService.js +92 -37
- package/dist/lib/modules/device/DeviceService.js.map +1 -1
- package/dist/lib/modules/device/DevicesController.d.ts +4 -4
- package/dist/lib/modules/device/DevicesController.js +11 -10
- package/dist/lib/modules/device/DevicesController.js.map +1 -1
- package/dist/lib/modules/group/GroupsController.d.ts +3 -3
- package/dist/lib/modules/group/GroupsController.js +13 -8
- package/dist/lib/modules/group/GroupsController.js.map +1 -1
- package/dist/lib/modules/group/GroupsModule.d.ts +1 -1
- package/dist/lib/modules/group/GroupsModule.js +1 -1
- package/dist/lib/modules/group/GroupsModule.js.map +1 -1
- package/dist/lib/modules/group/GroupsService.d.ts +12 -0
- package/dist/lib/modules/group/GroupsService.js +129 -129
- package/dist/lib/modules/group/GroupsService.js.map +1 -1
- package/dist/lib/modules/group/groupPath.d.ts +23 -0
- package/dist/lib/modules/group/groupPath.js +49 -0
- package/dist/lib/modules/group/groupPath.js.map +1 -0
- package/dist/lib/modules/measure/MeasureExporter.js +12 -15
- package/dist/lib/modules/measure/MeasureExporter.js.map +1 -1
- package/dist/lib/modules/measure/MeasureModule.d.ts +1 -1
- package/dist/lib/modules/measure/MeasureModule.js +1 -1
- package/dist/lib/modules/measure/MeasureModule.js.map +1 -1
- package/dist/lib/modules/measure/MeasureService.js +4 -4
- package/dist/lib/modules/measure/MeasureService.js.map +1 -1
- package/dist/lib/modules/measure/MeasureValidationError.d.ts +1 -1
- package/dist/lib/modules/model/MappingsConflictsError.d.ts +1 -1
- package/dist/lib/modules/model/MeasuresDuplicates.js +2 -2
- package/dist/lib/modules/model/MeasuresDuplicates.js.map +1 -1
- package/dist/lib/modules/model/MeasuresNamesDuplicatesError.d.ts +1 -1
- package/dist/lib/modules/model/MetadataReferential.js +20 -16
- package/dist/lib/modules/model/MetadataReferential.js.map +1 -1
- package/dist/lib/modules/model/ModelModule.d.ts +1 -1
- package/dist/lib/modules/model/ModelModule.js +1 -1
- package/dist/lib/modules/model/ModelModule.js.map +1 -1
- package/dist/lib/modules/model/ModelSerializer.d.ts +3 -0
- package/dist/lib/modules/model/ModelSerializer.js +47 -31
- package/dist/lib/modules/model/ModelSerializer.js.map +1 -1
- package/dist/lib/modules/model/ModelService.d.ts +5 -0
- package/dist/lib/modules/model/ModelService.js +67 -66
- package/dist/lib/modules/model/ModelService.js.map +1 -1
- package/dist/lib/modules/model/ModelsConflicts.js +19 -14
- package/dist/lib/modules/model/ModelsConflicts.js.map +1 -1
- package/dist/lib/modules/model/ModelsController.d.ts +2 -1
- package/dist/lib/modules/model/ModelsController.js +18 -15
- package/dist/lib/modules/model/ModelsController.js.map +1 -1
- package/dist/lib/modules/model/ModelsRegister.d.ts +5 -5
- package/dist/lib/modules/model/ModelsRegister.js +12 -9
- package/dist/lib/modules/model/ModelsRegister.js.map +1 -1
- package/dist/lib/modules/plugin/DeviceManagerEngine.d.ts +20 -3
- package/dist/lib/modules/plugin/DeviceManagerEngine.js +139 -112
- package/dist/lib/modules/plugin/DeviceManagerEngine.js.map +1 -1
- package/dist/lib/modules/plugin/DeviceManagerPlugin.js +8 -8
- package/dist/lib/modules/plugin/DeviceManagerPlugin.js.map +1 -1
- package/dist/lib/modules/shared/Module.d.ts +1 -1
- package/dist/lib/modules/shared/errors/SchemaValidationError.d.ts +1 -1
- package/dist/lib/modules/shared/services/AbstractExporter.js +19 -7
- package/dist/lib/modules/shared/services/AbstractExporter.js.map +1 -1
- package/dist/lib/modules/shared/services/BaseService.d.ts +21 -1
- package/dist/lib/modules/shared/services/BaseService.js +49 -3
- package/dist/lib/modules/shared/services/BaseService.js.map +1 -1
- package/dist/lib/modules/shared/services/DigitalTwinExporter.d.ts +10 -1
- package/dist/lib/modules/shared/services/DigitalTwinExporter.js +31 -8
- package/dist/lib/modules/shared/services/DigitalTwinExporter.js.map +1 -1
- package/dist/lib/modules/shared/services/DigitalTwinService.js +6 -7
- package/dist/lib/modules/shared/services/DigitalTwinService.js.map +1 -1
- package/dist/lib/modules/shared/utils/objectDiff.js +7 -6
- package/dist/lib/modules/shared/utils/objectDiff.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.subtreeQuery = exports.rebasePath = exports.isInSubtree = exports.GROUP_PATH_SEPARATOR = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Group paths are the ids of the ancestors joined by ".", so a plain string
|
|
6
|
+
* prefix would also match siblings sharing the same id start
|
|
7
|
+
* (e.g. "parent.quai-1" is a string prefix of "parent.quai-10").
|
|
8
|
+
* Subtree checks must always include the separator.
|
|
9
|
+
*/
|
|
10
|
+
exports.GROUP_PATH_SEPARATOR = ".";
|
|
11
|
+
/**
|
|
12
|
+
* Whether `path` is the group `groupPath` itself or one of its descendants
|
|
13
|
+
*/
|
|
14
|
+
function isInSubtree(path, groupPath) {
|
|
15
|
+
return (path === groupPath || path.startsWith(groupPath + exports.GROUP_PATH_SEPARATOR));
|
|
16
|
+
}
|
|
17
|
+
exports.isInSubtree = isInSubtree;
|
|
18
|
+
/**
|
|
19
|
+
* Replaces the leading `oldPath` of a path of its subtree by `newPath`
|
|
20
|
+
*/
|
|
21
|
+
function rebasePath(path, oldPath, newPath) {
|
|
22
|
+
return path === oldPath ? newPath : newPath + path.slice(oldPath.length);
|
|
23
|
+
}
|
|
24
|
+
exports.rebasePath = rebasePath;
|
|
25
|
+
/**
|
|
26
|
+
* Elasticsearch query matching the documents whose `field` (a keyword) is in
|
|
27
|
+
* the subtree of `groupPath`
|
|
28
|
+
*/
|
|
29
|
+
function subtreeQuery(field, groupPath, { includeSelf = true } = {}) {
|
|
30
|
+
const descendants = {
|
|
31
|
+
prefix: { [field]: groupPath + exports.GROUP_PATH_SEPARATOR },
|
|
32
|
+
};
|
|
33
|
+
if (!includeSelf) {
|
|
34
|
+
return descendants;
|
|
35
|
+
}
|
|
36
|
+
// ? Filter only: scoring would rank the items of the group itself before those of its descendants
|
|
37
|
+
return {
|
|
38
|
+
constant_score: {
|
|
39
|
+
filter: {
|
|
40
|
+
bool: {
|
|
41
|
+
minimum_should_match: 1,
|
|
42
|
+
should: [{ term: { [field]: groupPath } }, descendants],
|
|
43
|
+
},
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
exports.subtreeQuery = subtreeQuery;
|
|
49
|
+
//# sourceMappingURL=groupPath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"groupPath.js","sourceRoot":"","sources":["../../../../lib/modules/group/groupPath.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACU,QAAA,oBAAoB,GAAG,GAAG,CAAC;AAExC;;GAEG;AACH,SAAgB,WAAW,CAAC,IAAY,EAAE,SAAiB;IACzD,OAAO,CACL,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,4BAAoB,CAAC,CACxE,CAAC;AACJ,CAAC;AAJD,kCAIC;AAED;;GAEG;AACH,SAAgB,UAAU,CACxB,IAAY,EACZ,OAAe,EACf,OAAe;IAEf,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AAC3E,CAAC;AAND,gCAMC;AAED;;;GAGG;AACH,SAAgB,YAAY,CAC1B,KAAa,EACb,SAAiB,EACjB,EAAE,WAAW,GAAG,IAAI,KAAgC,EAAE;IAEtD,MAAM,WAAW,GAAG;QAClB,MAAM,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,GAAG,4BAAoB,EAAE;KACtD,CAAC;IAEF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,kGAAkG;IAClG,OAAO;QACL,cAAc,EAAE;YACd,MAAM,EAAE;gBACN,IAAI,EAAE;oBACJ,oBAAoB,EAAE,CAAC;oBACvB,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,CAAC;iBACxD;aACF;SACF;KACF,CAAC;AACJ,CAAC;AAxBD,oCAwBC"}
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.MeasureExporter = void 0;
|
|
7
7
|
const kuzzle_1 = require("kuzzle");
|
|
8
8
|
const kuzzle_plugin_commons_1 = require("kuzzle-plugin-commons");
|
|
9
|
-
const
|
|
9
|
+
const get_1 = __importDefault(require("lodash/get"));
|
|
10
10
|
const kuzzle_2 = require("kuzzle");
|
|
11
11
|
const plugin_1 = require("../plugin");
|
|
12
12
|
const shared_1 = require("../shared");
|
|
@@ -51,13 +51,6 @@ class MeasureExporter extends shared_1.AbstractExporter {
|
|
|
51
51
|
query: searchQuery,
|
|
52
52
|
sort: params.sort ?? { measuredAt: "desc" },
|
|
53
53
|
};
|
|
54
|
-
/**
|
|
55
|
-
* ? Prevent error duplicate result on search with sort.
|
|
56
|
-
* "Unable to retrieve all results from search: the sort combination must identify one item only. Add document "_id" to the sort."
|
|
57
|
-
*/
|
|
58
|
-
if (exportParams.sort._id === undefined) {
|
|
59
|
-
exportParams.sort._id = "asc";
|
|
60
|
-
}
|
|
61
54
|
return super.prepareExport(index, user, exportParams);
|
|
62
55
|
}
|
|
63
56
|
formatHit(columns, hit) {
|
|
@@ -67,11 +60,11 @@ class MeasureExporter extends shared_1.AbstractExporter {
|
|
|
67
60
|
hit._source.asset?.measureName !== name) {
|
|
68
61
|
return null;
|
|
69
62
|
}
|
|
70
|
-
const formattedValue =
|
|
63
|
+
const formattedValue = (0, get_1.default)(hit, path, null);
|
|
71
64
|
if (formattedValue !== null && isIsoDate) {
|
|
72
65
|
return new Date(formattedValue).toISOString();
|
|
73
66
|
}
|
|
74
|
-
return
|
|
67
|
+
return (0, get_1.default)(hit, path, null);
|
|
75
68
|
});
|
|
76
69
|
}
|
|
77
70
|
/**
|
|
@@ -82,7 +75,10 @@ class MeasureExporter extends shared_1.AbstractExporter {
|
|
|
82
75
|
*/
|
|
83
76
|
async sendExport(index, exportId) {
|
|
84
77
|
const { query, sort, model, lang = "elasticsearch", } = await this.getExport(index, exportId);
|
|
85
|
-
const result = await this.sdk.document.search(index, plugin_1.InternalCollection.MEASURES, { query, sort },
|
|
78
|
+
const result = await this.sdk.document.search(index, plugin_1.InternalCollection.MEASURES, { query, sort },
|
|
79
|
+
// ? Scroll: search_after pagination would need a unique sort, and
|
|
80
|
+
// ? Elasticsearch 8 refuses to sort on "_id"
|
|
81
|
+
{ lang, scroll: "30s", size: 200 });
|
|
86
82
|
const targetModel = this.target === plugin_1.InternalCollection.ASSETS ? "asset" : "device";
|
|
87
83
|
const engine = await this.getEngine(index);
|
|
88
84
|
const modelDocument = await (0, kuzzle_plugin_commons_1.ask)(`ask:device-manager:model:${targetModel}:get`, {
|
|
@@ -141,11 +137,12 @@ class MeasureExporter extends shared_1.AbstractExporter {
|
|
|
141
137
|
*/
|
|
142
138
|
const mappingsByMeasureType = {};
|
|
143
139
|
const measures = [];
|
|
140
|
+
const measureTypes = [...new Set(documentMeasures.map(({ type }) => type))];
|
|
141
|
+
await Promise.all(measureTypes.map(async (type) => {
|
|
142
|
+
const { measure } = await (0, kuzzle_plugin_commons_1.ask)("ask:device-manager:model:measure:get", { type, index });
|
|
143
|
+
mappingsByMeasureType[type] = Object.keys((0, shared_1.flattenObject)(measure.valuesMappings));
|
|
144
|
+
}));
|
|
144
145
|
for (const { name, type } of documentMeasures) {
|
|
145
|
-
if (!(type in mappingsByMeasureType)) {
|
|
146
|
-
const { measure } = await (0, kuzzle_plugin_commons_1.ask)("ask:device-manager:model:measure:get", { type, index });
|
|
147
|
-
mappingsByMeasureType[type] = Object.keys((0, shared_1.flattenObject)(measure.valuesMappings));
|
|
148
|
-
}
|
|
149
146
|
for (const measure of mappingsByMeasureType[type]) {
|
|
150
147
|
/**
|
|
151
148
|
* The path to be used to retrieve the measure values in a Measure Document
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasureExporter.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureExporter.ts"],"names":[],"mappings":";;;;;;AAAA,mCAA+D;AAC/D,iEAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"MeasureExporter.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureExporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ class MeasureModule extends Module_1.Module {
|
|
|
10
10
|
super(plugin);
|
|
11
11
|
this.logger = this.plugin.context.logger.child("measures-module");
|
|
12
12
|
}
|
|
13
|
-
|
|
13
|
+
init() {
|
|
14
14
|
this.measureService = new MeasureService_1.MeasureService(this.plugin, this.logger);
|
|
15
15
|
this.plugin.imports.roles[RoleMeasuresAdmin_1.RoleMeasuresAdmin.name] =
|
|
16
16
|
RoleMeasuresAdmin_1.RoleMeasuresAdmin.definition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasureModule.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureModule.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAE1C,qDAAkD;AAClD,iEAA8D;AAC9D,mEAAgE;AAGhE,MAAa,aAAc,SAAQ,eAAM;IAIvC,YAAY,MAA2B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpE,CAAC;IAEM,
|
|
1
|
+
{"version":3,"file":"MeasureModule.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureModule.ts"],"names":[],"mappings":";;;AACA,6CAA0C;AAE1C,qDAAkD;AAClD,iEAA8D;AAC9D,mEAAgE;AAGhE,MAAa,aAAc,SAAQ,eAAM;IAIvC,YAAY,MAA2B;QACrC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACpE,CAAC;IAEM,IAAI;QACT,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAEnE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,qCAAiB,CAAC,IAAI,CAAC;YAC/C,qCAAiB,CAAC,UAAU,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,uCAAkB,CAAC,IAAI,CAAC;YAChD,uCAAkB,CAAC,UAAU,CAAC;IAClC,CAAC;CACF;AAjBD,sCAiBC"}
|
|
@@ -103,7 +103,7 @@ class MeasureService extends shared_1.BaseService {
|
|
|
103
103
|
await this.app.trigger(`engine:${indexId}:device-manager:measures:process:after`, { asset, measures, source, target });
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
|
-
|
|
106
|
+
buildDeviceMeasures(source, asset, measures, payloadUuids) {
|
|
107
107
|
const deviceMeasures = [];
|
|
108
108
|
for (const measure of measures) {
|
|
109
109
|
let assetContext = null;
|
|
@@ -131,7 +131,7 @@ class MeasureService extends shared_1.BaseService {
|
|
|
131
131
|
assetDocument = await this.findAsset(indexId, assetId);
|
|
132
132
|
asset = { ...assetDocument?._source };
|
|
133
133
|
}
|
|
134
|
-
const measures =
|
|
134
|
+
const measures = this.buildDeviceMeasures(source, assetDocument, measurements, payloadUuids);
|
|
135
135
|
return { asset, measures };
|
|
136
136
|
}
|
|
137
137
|
async ingestApiMeasures(indexId, assetId, source, measurements, payloadUuids) {
|
|
@@ -140,7 +140,7 @@ class MeasureService extends shared_1.BaseService {
|
|
|
140
140
|
throw new kuzzle_1.BadRequestError(`Asset "${assetId}" does not exists on index "${indexId}"`);
|
|
141
141
|
}
|
|
142
142
|
const asset = { ...assetDocument._source };
|
|
143
|
-
const measures =
|
|
143
|
+
const measures = this.buildApiMeasures(source, assetDocument, measurements, payloadUuids);
|
|
144
144
|
return { asset, measures };
|
|
145
145
|
}
|
|
146
146
|
/**
|
|
@@ -153,7 +153,7 @@ class MeasureService extends shared_1.BaseService {
|
|
|
153
153
|
* @param tenantClass tenantClass of model
|
|
154
154
|
* @returns A MeasurementContent builded from parameters
|
|
155
155
|
*/
|
|
156
|
-
|
|
156
|
+
buildApiMeasures(source, asset, measures, payloadUuids) {
|
|
157
157
|
const apiMeasures = [];
|
|
158
158
|
for (const measure of measures) {
|
|
159
159
|
let assetContext = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasureService.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"MeasureService.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureService.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export interface MeasureValidationChunks {
|
|
|
5
5
|
validationErrors: ErrorObject[];
|
|
6
6
|
}
|
|
7
7
|
export declare class MeasureValidationError extends KuzzleError {
|
|
8
|
-
private errors;
|
|
8
|
+
private readonly errors;
|
|
9
9
|
constructor(message: string, errors: MeasureValidationChunks[], id?: string, code?: number);
|
|
10
10
|
get name(): string;
|
|
11
11
|
toJSON(): import("kuzzle").JSONObject;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { KuzzleError } from "kuzzle";
|
|
2
2
|
import { ConflictChunk } from "./ModelsConflicts";
|
|
3
3
|
export declare class MappingsConflictsError extends KuzzleError {
|
|
4
|
-
private conflicts;
|
|
4
|
+
private readonly conflicts;
|
|
5
5
|
constructor(message: string, conflicts: ConflictChunk[], id?: string, code?: number);
|
|
6
6
|
get name(): string;
|
|
7
7
|
toJSON(): import("kuzzle").JSONObject;
|
|
@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.getNamedMeasuresDuplicates = void 0;
|
|
7
|
-
const
|
|
7
|
+
const groupBy_1 = __importDefault(require("lodash/groupBy"));
|
|
8
8
|
function getNamedMeasuresDuplicates(measures) {
|
|
9
9
|
const duplicates = [];
|
|
10
|
-
const groups =
|
|
10
|
+
const groups = (0, groupBy_1.default)(measures, (elt) => elt.name);
|
|
11
11
|
for (const group in groups) {
|
|
12
12
|
if (groups[group].length > 1) {
|
|
13
13
|
duplicates.push(group);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasuresDuplicates.js","sourceRoot":"","sources":["../../../../lib/modules/model/MeasuresDuplicates.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"MeasuresDuplicates.js","sourceRoot":"","sources":["../../../../lib/modules/model/MeasuresDuplicates.ts"],"names":[],"mappings":";;;;;;AAAA,6DAAqC;AAGrC,SAAS,0BAA0B,CAAC,QAAuB;IACzD,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,MAAM,MAAM,GAAG,IAAA,iBAAO,EAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACpD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAEQ,gEAA0B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { KuzzleError } from "kuzzle";
|
|
2
2
|
export declare class MeasuresNamesDuplicatesError extends KuzzleError {
|
|
3
|
-
private duplicates;
|
|
3
|
+
private readonly duplicates;
|
|
4
4
|
constructor(message: string, duplicates: string[], id?: string, code?: number);
|
|
5
5
|
get name(): string;
|
|
6
6
|
toJSON(): import("kuzzle").JSONObject;
|
|
@@ -4,7 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.fetchReferencingModels = exports.fetchMetadataModels = exports.saveMetadataReferential = exports.fetchMetadataReferential = exports.getAddedInlineMetadata = exports.getEntryModelsConflicts = exports.enrichModelMetadata = exports.checkMetadataReferentialEntry = exports.resolveModelMetadata = exports.resolveModelMappings = exports.resolveMetadataMappings = exports.getReferentialNames = exports.isReferentialMapping = exports.withMetadataReferentialLock = exports.METADATA_REFERENTIAL_ID = void 0;
|
|
7
|
-
const
|
|
7
|
+
const isEqual_1 = __importDefault(require("lodash/isEqual"));
|
|
8
|
+
const isPlainObject_1 = __importDefault(require("lodash/isPlainObject"));
|
|
9
|
+
const union_1 = __importDefault(require("lodash/union"));
|
|
8
10
|
const InternalCollection_1 = require("../plugin/types/InternalCollection");
|
|
9
11
|
const lock_1 = require("../shared/utils/lock");
|
|
10
12
|
const MappingsConflictsError_1 = require("./MappingsConflictsError");
|
|
@@ -29,7 +31,7 @@ exports.withMetadataReferentialLock = withMetadataReferentialLock;
|
|
|
29
31
|
* @returns true if the metadata mappings mark a metadata of the referential
|
|
30
32
|
*/
|
|
31
33
|
function isReferentialMapping(mapping) {
|
|
32
|
-
return (
|
|
34
|
+
return (0, isPlainObject_1.default)(mapping) && mapping.referential === true;
|
|
33
35
|
}
|
|
34
36
|
exports.isReferentialMapping = isReferentialMapping;
|
|
35
37
|
/**
|
|
@@ -50,7 +52,7 @@ function resolveMetadataMappings(referential, metadataMappings = {}) {
|
|
|
50
52
|
resolved[name] = mapping;
|
|
51
53
|
}
|
|
52
54
|
else if (referential[name]) {
|
|
53
|
-
resolved[name] =
|
|
55
|
+
resolved[name] = structuredClone(referential[name].mappings);
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
return resolved;
|
|
@@ -79,7 +81,7 @@ function isDefaultOf(key, name) {
|
|
|
79
81
|
*/
|
|
80
82
|
function mergeLocales(name, entryLocales = {}, modelLocales = {}) {
|
|
81
83
|
const locales = {};
|
|
82
|
-
for (const locale of
|
|
84
|
+
for (const locale of (0, union_1.default)(Object.keys(entryLocales), Object.keys(modelLocales))) {
|
|
83
85
|
locales[locale] = {
|
|
84
86
|
description: "",
|
|
85
87
|
friendlyName: name,
|
|
@@ -94,7 +96,9 @@ function mergeLocales(name, entryLocales = {}, modelLocales = {}) {
|
|
|
94
96
|
*/
|
|
95
97
|
function enrichDetails(name, entry, details = {}) {
|
|
96
98
|
return {
|
|
97
|
-
...(entry.editorHint
|
|
99
|
+
...(entry.editorHint
|
|
100
|
+
? { editorHint: structuredClone(entry.editorHint) }
|
|
101
|
+
: {}),
|
|
98
102
|
...(entry.icon !== undefined ? { icon: entry.icon } : {}),
|
|
99
103
|
...details,
|
|
100
104
|
locales: mergeLocales(name, entry.locales, details.locales),
|
|
@@ -108,7 +112,7 @@ function applyReferentialValues(name, entry, metadataDetails, defaultMetadata) {
|
|
|
108
112
|
metadataDetails[name] = enrichDetails(name, entry, metadataDetails[name]);
|
|
109
113
|
const hasDefault = Object.keys(defaultMetadata).some((key) => isDefaultOf(key, name));
|
|
110
114
|
if (!hasDefault && entry.defaultValue !== undefined) {
|
|
111
|
-
defaultMetadata[name] =
|
|
115
|
+
defaultMetadata[name] = structuredClone(entry.defaultValue);
|
|
112
116
|
}
|
|
113
117
|
}
|
|
114
118
|
/**
|
|
@@ -148,19 +152,19 @@ function checkMetadataReferentialEntry(name, entry, createError) {
|
|
|
148
152
|
if (typeof name !== "string" || name.length === 0 || name.includes(".")) {
|
|
149
153
|
throw createError(`Metadata name "${name}" is invalid: it must be a non empty string without "."`);
|
|
150
154
|
}
|
|
151
|
-
if (!
|
|
155
|
+
if (!(0, isPlainObject_1.default)(entry)) {
|
|
152
156
|
throw createError(`Metadata "${name}" definition must be an object`);
|
|
153
157
|
}
|
|
154
158
|
const mappings = entry.mappings;
|
|
155
|
-
if (!
|
|
156
|
-
(typeof mappings.type !== "string" && !
|
|
159
|
+
if (!(0, isPlainObject_1.default)(mappings) ||
|
|
160
|
+
(typeof mappings.type !== "string" && !(0, isPlainObject_1.default)(mappings.properties))) {
|
|
157
161
|
throw createError(`Metadata "${name}" mappings must define either a "type" or "properties"`);
|
|
158
162
|
}
|
|
159
|
-
if (entry.locales !== undefined && !
|
|
163
|
+
if (entry.locales !== undefined && !(0, isPlainObject_1.default)(entry.locales)) {
|
|
160
164
|
throw createError(`Metadata "${name}" locales must be an object`);
|
|
161
165
|
}
|
|
162
166
|
if (entry.editorHint !== undefined &&
|
|
163
|
-
(!
|
|
167
|
+
(!(0, isPlainObject_1.default)(entry.editorHint) ||
|
|
164
168
|
typeof entry.editorHint.type !== "string")) {
|
|
165
169
|
throw createError(`Metadata "${name}" editorHint must be an object with a "type"`);
|
|
166
170
|
}
|
|
@@ -174,7 +178,7 @@ exports.checkMetadataReferentialEntry = checkMetadataReferentialEntry;
|
|
|
174
178
|
* Any difference is a conflict: an inline metadata must be identical to the referential one.
|
|
175
179
|
*/
|
|
176
180
|
function getInlineConflicts(name, inlineMappings, entry, basePath) {
|
|
177
|
-
if (
|
|
181
|
+
if ((0, isEqual_1.default)(inlineMappings, entry.mappings)) {
|
|
178
182
|
return [];
|
|
179
183
|
}
|
|
180
184
|
const conflicts = (0, ModelsConflicts_1.findMappingsConflicts)({ [name]: entry.mappings }, { [name]: inlineMappings }, basePath);
|
|
@@ -213,12 +217,12 @@ function enrichModelMetadata(referential, fields, context) {
|
|
|
213
217
|
const defaultMetadata = { ...fields.defaultMetadata };
|
|
214
218
|
const warnings = [];
|
|
215
219
|
const conflicts = [];
|
|
216
|
-
if (!
|
|
220
|
+
if (!(0, isPlainObject_1.default)(metadataMappings)) {
|
|
217
221
|
throw context.createError(`Metadata mappings of ${model} must be an object`);
|
|
218
222
|
}
|
|
219
223
|
for (const [name, mapping] of Object.entries(metadataMappings)) {
|
|
220
224
|
const entry = referential[name];
|
|
221
|
-
if (
|
|
225
|
+
if ((0, isPlainObject_1.default)(mapping) && "referential" in mapping) {
|
|
222
226
|
if (!isReferentialMapping(mapping) || Object.keys(mapping).length !== 1) {
|
|
223
227
|
throw context.createError(`The metadata "${name}" of ${model} must be { referential: true } to use the metadata referential`);
|
|
224
228
|
}
|
|
@@ -306,7 +310,7 @@ exports.fetchMetadataReferential = fetchMetadataReferential;
|
|
|
306
310
|
/**
|
|
307
311
|
* Writes the whole metadata referential document
|
|
308
312
|
*/
|
|
309
|
-
|
|
313
|
+
function saveMetadataReferential(sdk, platformIndex, referential) {
|
|
310
314
|
const content = {
|
|
311
315
|
metadata: referential,
|
|
312
316
|
type: "metadata-referential",
|
|
@@ -324,7 +328,7 @@ async function fetchMetadataModels(sdk, platformIndex) {
|
|
|
324
328
|
for (const hit of result.hits) {
|
|
325
329
|
models.push({ _id: hit._id, _source: hit._source });
|
|
326
330
|
}
|
|
327
|
-
result = await result.next();
|
|
331
|
+
result = await result.next(); // NOSONAR: scroll pages must be fetched sequentially
|
|
328
332
|
}
|
|
329
333
|
return models;
|
|
330
334
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MetadataReferential.js","sourceRoot":"","sources":["../../../../lib/modules/model/MetadataReferential.ts"],"names":[],"mappings":";;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"MetadataReferential.js","sourceRoot":"","sources":["../../../../lib/modules/model/MetadataReferential.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ class ModelModule extends Module_1.Module {
|
|
|
9
9
|
super(plugin);
|
|
10
10
|
this.logger = this.plugin.context.logger.child("models-module");
|
|
11
11
|
}
|
|
12
|
-
|
|
12
|
+
init() {
|
|
13
13
|
this.modelService = new ModelService_1.ModelService(this.plugin, this.logger);
|
|
14
14
|
this.modelController = new ModelsController_1.ModelsController(this.modelService, this.logger);
|
|
15
15
|
this.plugin.api["device-manager/models"] = this.modelController.definition;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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,IAAI;QACT,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"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { ModelContent } from "./types/ModelContent";
|
|
2
2
|
export declare class ModelSerializer {
|
|
3
3
|
static id<T extends ModelContent>(type: string, model: T): string;
|
|
4
|
+
private static assetId;
|
|
5
|
+
private static groupId;
|
|
6
|
+
private static measureId;
|
|
4
7
|
static title<T extends ModelContent>(type: string, model: T): string;
|
|
5
8
|
}
|
|
@@ -2,50 +2,66 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ModelSerializer = void 0;
|
|
4
4
|
const kuzzle_1 = require("kuzzle");
|
|
5
|
+
/**
|
|
6
|
+
* Code-unit order (same as the default `Array#sort`), since it is part of persisted model IDs
|
|
7
|
+
*/
|
|
8
|
+
function compareCodeUnits(a, b) {
|
|
9
|
+
if (a < b) {
|
|
10
|
+
return -1;
|
|
11
|
+
}
|
|
12
|
+
return a > b ? 1 : 0;
|
|
13
|
+
}
|
|
14
|
+
function joinSorted(values) {
|
|
15
|
+
return [...values].sort(compareCodeUnits).join("+");
|
|
16
|
+
}
|
|
5
17
|
class ModelSerializer {
|
|
6
18
|
static id(type, model) {
|
|
7
19
|
if (type === "asset") {
|
|
8
|
-
|
|
9
|
-
if (assetModel.indexes?.length) {
|
|
10
|
-
const sortedEngines = [...assetModel.indexes].sort().join("+");
|
|
11
|
-
return `model-asset-${sortedEngines}-${ModelSerializer.title(type, model)}`;
|
|
12
|
-
}
|
|
13
|
-
if (assetModel.tenantClasses.length > 1) {
|
|
14
|
-
const sortedGroups = [...assetModel.tenantClasses].sort().join("+");
|
|
15
|
-
return `model-asset-${sortedGroups}-${ModelSerializer.title(type, model)}`;
|
|
16
|
-
}
|
|
17
|
-
return `model-asset-${ModelSerializer.title(type, model)}`;
|
|
20
|
+
return ModelSerializer.assetId(model);
|
|
18
21
|
}
|
|
19
22
|
else if (type === "device") {
|
|
20
23
|
return `model-device-${ModelSerializer.title(type, model)}`;
|
|
21
24
|
}
|
|
22
25
|
else if (type === "group") {
|
|
23
|
-
|
|
24
|
-
if (groupModel.tenantClasses.length > 1) {
|
|
25
|
-
const sortedGroups = [...groupModel.tenantClasses].sort().join("+");
|
|
26
|
-
return `model-group-${sortedGroups}-${ModelSerializer.title(type, model)}`;
|
|
27
|
-
}
|
|
28
|
-
return `model-group-${ModelSerializer.title(type, model)}`;
|
|
26
|
+
return ModelSerializer.groupId(model);
|
|
29
27
|
}
|
|
30
28
|
else if (type === "measure") {
|
|
31
|
-
|
|
32
|
-
if (measureModel.indexes?.length) {
|
|
33
|
-
const sortedEngines = [...measureModel.indexes].sort().join("+");
|
|
34
|
-
if (measureModel.tenantClasses?.length) {
|
|
35
|
-
const sortedGroups = [...measureModel.tenantClasses].sort().join("+");
|
|
36
|
-
return `model-measure-${sortedGroups}-${sortedEngines}-${ModelSerializer.title(type, model)}`;
|
|
37
|
-
}
|
|
38
|
-
return `model-measure-${sortedEngines}-${ModelSerializer.title(type, model)}`;
|
|
39
|
-
}
|
|
40
|
-
if (measureModel.tenantClasses?.length &&
|
|
41
|
-
measureModel.tenantClasses.length > 1) {
|
|
42
|
-
const sortedGroups = [...measureModel.tenantClasses].sort().join("+");
|
|
43
|
-
return `model-measure-${sortedGroups}-${ModelSerializer.title(type, model)}`;
|
|
44
|
-
}
|
|
45
|
-
return `model-measure-${ModelSerializer.title(type, model)}`;
|
|
29
|
+
return ModelSerializer.measureId(model);
|
|
46
30
|
}
|
|
47
31
|
throw new kuzzle_1.BadRequestError(`Unknown model type "${type}"`);
|
|
48
32
|
}
|
|
33
|
+
static assetId(assetModel) {
|
|
34
|
+
const title = ModelSerializer.title("asset", assetModel);
|
|
35
|
+
if (assetModel.indexes?.length) {
|
|
36
|
+
return `model-asset-${joinSorted(assetModel.indexes)}-${title}`;
|
|
37
|
+
}
|
|
38
|
+
if (assetModel.tenantClasses.length > 1) {
|
|
39
|
+
return `model-asset-${joinSorted(assetModel.tenantClasses)}-${title}`;
|
|
40
|
+
}
|
|
41
|
+
return `model-asset-${title}`;
|
|
42
|
+
}
|
|
43
|
+
static groupId(groupModel) {
|
|
44
|
+
const title = ModelSerializer.title("group", groupModel);
|
|
45
|
+
if (groupModel.tenantClasses.length > 1) {
|
|
46
|
+
return `model-group-${joinSorted(groupModel.tenantClasses)}-${title}`;
|
|
47
|
+
}
|
|
48
|
+
return `model-group-${title}`;
|
|
49
|
+
}
|
|
50
|
+
static measureId(measureModel) {
|
|
51
|
+
const title = ModelSerializer.title("measure", measureModel);
|
|
52
|
+
if (measureModel.indexes?.length) {
|
|
53
|
+
const sortedEngines = joinSorted(measureModel.indexes);
|
|
54
|
+
if (measureModel.tenantClasses?.length) {
|
|
55
|
+
return `model-measure-${joinSorted(measureModel.tenantClasses)}-${sortedEngines}-${title}`;
|
|
56
|
+
}
|
|
57
|
+
return `model-measure-${sortedEngines}-${title}`;
|
|
58
|
+
}
|
|
59
|
+
if (measureModel.tenantClasses?.length &&
|
|
60
|
+
measureModel.tenantClasses.length > 1) {
|
|
61
|
+
return `model-measure-${joinSorted(measureModel.tenantClasses)}-${title}`;
|
|
62
|
+
}
|
|
63
|
+
return `model-measure-${title}`;
|
|
64
|
+
}
|
|
49
65
|
static title(type, model) {
|
|
50
66
|
if (type === "asset") {
|
|
51
67
|
return model.asset.model;
|