kuzzle-device-manager 2.0.9 → 2.1.0
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/core/DeviceManagerPlugin.d.ts +0 -3
- package/dist/lib/core/DeviceManagerPlugin.js +9 -24
- package/dist/lib/core/DeviceManagerPlugin.js.map +1 -1
- package/dist/lib/core/registers/DecodersRegister.d.ts +8 -8
- package/dist/lib/core/registers/DecodersRegister.js +22 -66
- package/dist/lib/core/registers/DecodersRegister.js.map +1 -1
- package/dist/lib/modules/asset/AssetModule.js +4 -2
- package/dist/lib/modules/asset/AssetModule.js.map +1 -1
- package/dist/lib/modules/decoder/DecoderModule.js +4 -2
- package/dist/lib/modules/decoder/DecoderModule.js.map +1 -1
- package/dist/lib/modules/decoder/PayloadService.d.ts +7 -2
- package/dist/lib/modules/decoder/PayloadService.js +24 -6
- package/dist/lib/modules/decoder/PayloadService.js.map +1 -1
- package/dist/lib/modules/decoder/PayloadsController.js +3 -2
- package/dist/lib/modules/decoder/PayloadsController.js.map +1 -1
- package/dist/lib/modules/decoder/collections/payloadsMappings.d.ts +3 -0
- package/dist/lib/modules/decoder/collections/payloadsMappings.js +1 -0
- package/dist/lib/modules/decoder/collections/payloadsMappings.js.map +1 -1
- package/dist/lib/modules/decoder/types/PayloadEvents.d.ts +15 -0
- package/dist/lib/modules/decoder/types/PayloadEvents.js +3 -0
- package/dist/lib/modules/decoder/types/PayloadEvents.js.map +1 -0
- package/dist/lib/modules/device/DeviceModule.js +6 -3
- package/dist/lib/modules/device/DeviceModule.js.map +1 -1
- package/dist/lib/modules/device/DeviceService.d.ts +4 -0
- package/dist/lib/modules/device/DeviceService.js +29 -8
- package/dist/lib/modules/device/DeviceService.js.map +1 -1
- package/dist/lib/modules/device/DevicesController.d.ts +1 -0
- package/dist/lib/modules/device/DevicesController.js +42 -1
- package/dist/lib/modules/device/DevicesController.js.map +1 -1
- package/dist/lib/modules/device/types/DeviceApi.d.ts +15 -1
- package/dist/lib/modules/measure/MeasureModule.js +4 -2
- package/dist/lib/modules/measure/MeasureModule.js.map +1 -1
- package/dist/lib/modules/measure/MeasureService.js +1 -2
- package/dist/lib/modules/measure/MeasureService.js.map +1 -1
- package/dist/lib/modules/measure/types/MeasureEvents.d.ts +8 -9
- package/dist/lib/modules/shared/index.d.ts +0 -1
- package/dist/lib/modules/shared/index.js +0 -1
- package/dist/lib/modules/shared/index.js.map +1 -1
- package/dist/lib/modules/shared/utils/ask.d.ts +1 -1
- package/dist/lib/modules/shared/utils/ask.js +1 -1
- package/dist/lib/modules/shared/utils/ask.js.map +1 -1
- package/package.json +11 -11
- package/dist/lib/modules/shared/utils/snakeCase.d.ts +0 -7
- package/dist/lib/modules/shared/utils/snakeCase.js +0 -18
- package/dist/lib/modules/shared/utils/snakeCase.js.map +0 -1
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { Plugin, PluginContext, JSONObject } from "kuzzle";
|
|
2
2
|
import { MeasureDefinition } from "../modules/measure";
|
|
3
3
|
import { AssetModelDefinition, DeviceModelDefinition } from "../modules/model";
|
|
4
|
-
import { KuzzleRole } from "../modules/shared";
|
|
5
4
|
import { DeviceManagerConfiguration } from "./DeviceManagerConfiguration";
|
|
6
5
|
export declare class DeviceManagerPlugin extends Plugin {
|
|
7
6
|
config: DeviceManagerConfiguration;
|
|
8
|
-
roles: KuzzleRole[];
|
|
9
7
|
private deviceManagerEngine;
|
|
10
8
|
private adminConfigManager;
|
|
11
9
|
private engineConfigManager;
|
|
@@ -95,7 +93,6 @@ export declare class DeviceManagerPlugin extends Plugin {
|
|
|
95
93
|
* Init the plugin
|
|
96
94
|
*/
|
|
97
95
|
init(config: JSONObject, context: PluginContext): Promise<void>;
|
|
98
|
-
private createDefaultRoles;
|
|
99
96
|
/**
|
|
100
97
|
* Initialize the administration index of the plugin
|
|
101
98
|
*/
|
|
@@ -105,9 +105,8 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
|
|
|
105
105
|
}
|
|
106
106
|
constructor() {
|
|
107
107
|
super({
|
|
108
|
-
kuzzleVersion: ">=2.
|
|
108
|
+
kuzzleVersion: ">=2.20.2 <3",
|
|
109
109
|
});
|
|
110
|
-
this.roles = [];
|
|
111
110
|
/* eslint-disable sort-keys */
|
|
112
111
|
this.api = {};
|
|
113
112
|
this.pipes = {
|
|
@@ -116,6 +115,12 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
|
|
|
116
115
|
"generic:document:beforeDelete": [],
|
|
117
116
|
};
|
|
118
117
|
this.hooks = {};
|
|
118
|
+
this.imports = {
|
|
119
|
+
roles: {},
|
|
120
|
+
users: {},
|
|
121
|
+
profiles: {},
|
|
122
|
+
onExistingUsers: "skip",
|
|
123
|
+
};
|
|
119
124
|
this.config = {
|
|
120
125
|
ignoreStartupErrors: false,
|
|
121
126
|
engine: {
|
|
@@ -181,7 +186,7 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
|
|
|
181
186
|
await this.decoderModule.init();
|
|
182
187
|
await this.measureModule.init();
|
|
183
188
|
await this.modelModule.init();
|
|
184
|
-
this.decodersRegister.init(this.context);
|
|
189
|
+
this.decodersRegister.init(this, this.context);
|
|
185
190
|
this.modelsRegister.init(this);
|
|
186
191
|
this.adminConfigManager = new kuzzle_plugin_commons_1.ConfigManager(this, {
|
|
187
192
|
mappings: this.config.adminCollections.config.mappings,
|
|
@@ -205,20 +210,7 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
|
|
|
205
210
|
});
|
|
206
211
|
this.deviceManagerEngine = new DeviceManagerEngine_1.DeviceManagerEngine(this, this.adminConfigManager, this.engineConfigManager);
|
|
207
212
|
this.engineController = new kuzzle_plugin_commons_1.EngineController("device-manager", this, this.deviceManagerEngine);
|
|
208
|
-
this.
|
|
209
|
-
try {
|
|
210
|
-
await this.decodersRegister.createDefaultRights();
|
|
211
|
-
await this.createDefaultRoles();
|
|
212
|
-
}
|
|
213
|
-
catch (error) {
|
|
214
|
-
if (this.config.ignoreStartupErrors) {
|
|
215
|
-
this.context.log.warn(`WARNING: An error occured during plugin initialization: ${error.message}`);
|
|
216
|
-
}
|
|
217
|
-
else {
|
|
218
|
-
throw error;
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
};
|
|
213
|
+
this.decodersRegister.registerDefaultRights();
|
|
222
214
|
this.decodersRegister.printDecoders();
|
|
223
215
|
try {
|
|
224
216
|
await this.initDatabase();
|
|
@@ -235,13 +227,6 @@ class DeviceManagerPlugin extends kuzzle_1.Plugin {
|
|
|
235
227
|
this.context.log.warn('WARNING: The "ignoreStartupErrors" option is enabled. Additional errors may appears at runtime.');
|
|
236
228
|
}
|
|
237
229
|
}
|
|
238
|
-
async createDefaultRoles() {
|
|
239
|
-
const promises = [];
|
|
240
|
-
for (const role of this.roles) {
|
|
241
|
-
promises.push(this.sdk.security.createOrReplaceRole(role.name, role.definition));
|
|
242
|
-
}
|
|
243
|
-
await Promise.all(promises);
|
|
244
|
-
}
|
|
245
230
|
/**
|
|
246
231
|
* Initialize the administration index of the plugin
|
|
247
232
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceManagerPlugin.js","sourceRoot":"","sources":["../../../lib/core/DeviceManagerPlugin.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AACvB,mCAOgB;AAChB,iEAAwE;AAExE,gDAO4B;AAE5B,8CAAkE;AAClE,gDAAmD;AACnD,4CAA+C;AAC/C,gDAAqE;AACrE,4CAK0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"DeviceManagerPlugin.js","sourceRoot":"","sources":["../../../lib/core/DeviceManagerPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { PluginContext } from "kuzzle";
|
|
2
2
|
import { Decoder, DecoderContent } from "../../modules/decoder";
|
|
3
|
+
import { DeviceManagerPlugin } from "..";
|
|
3
4
|
export declare class DecodersRegister {
|
|
4
5
|
private context;
|
|
6
|
+
private plugin;
|
|
5
7
|
/**
|
|
6
8
|
* Map<deviceModel, Decoder>
|
|
7
9
|
*/
|
|
8
10
|
private _decoders;
|
|
9
11
|
private get sdk();
|
|
10
12
|
get decoders(): Decoder[];
|
|
11
|
-
init(context: PluginContext): void;
|
|
13
|
+
init(plugin: DeviceManagerPlugin, context: PluginContext): void;
|
|
12
14
|
get(deviceModel: string): Decoder;
|
|
13
15
|
list(): DecoderContent[];
|
|
14
16
|
/**
|
|
@@ -29,13 +31,11 @@ export declare class DecodersRegister {
|
|
|
29
31
|
};
|
|
30
32
|
printDecoders(): void;
|
|
31
33
|
/**
|
|
32
|
-
*
|
|
34
|
+
* Register default role, profile and user associated to the generated actions
|
|
33
35
|
* in the Payload controller.
|
|
34
|
-
*
|
|
35
|
-
* This method never returns a rejected promise.
|
|
36
36
|
*/
|
|
37
|
-
|
|
38
|
-
private
|
|
39
|
-
private
|
|
40
|
-
private
|
|
37
|
+
registerDefaultRights(): void;
|
|
38
|
+
private registerDefaultUser;
|
|
39
|
+
private registerDefaultProfile;
|
|
40
|
+
private registerDefaultRole;
|
|
41
41
|
}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DecodersRegister = void 0;
|
|
4
4
|
const kuzzle_1 = require("kuzzle");
|
|
5
|
-
const shared_1 = require("../../modules/shared");
|
|
6
5
|
class DecodersRegister {
|
|
7
6
|
constructor() {
|
|
8
7
|
/**
|
|
@@ -16,7 +15,8 @@ class DecodersRegister {
|
|
|
16
15
|
get decoders() {
|
|
17
16
|
return Array.from(this._decoders.values());
|
|
18
17
|
}
|
|
19
|
-
init(context) {
|
|
18
|
+
init(plugin, context) {
|
|
19
|
+
this.plugin = plugin;
|
|
20
20
|
this.context = context;
|
|
21
21
|
}
|
|
22
22
|
get(deviceModel) {
|
|
@@ -64,86 +64,42 @@ class DecodersRegister {
|
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
/**
|
|
67
|
-
*
|
|
67
|
+
* Register default role, profile and user associated to the generated actions
|
|
68
68
|
* in the Payload controller.
|
|
69
|
-
*
|
|
70
|
-
* This method never returns a rejected promise.
|
|
71
69
|
*/
|
|
72
|
-
|
|
70
|
+
registerDefaultRights() {
|
|
73
71
|
if (this.decoders.length === 0) {
|
|
74
72
|
return;
|
|
75
73
|
}
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
this.context.log.info("Default rights for payload controller has been registered.");
|
|
74
|
+
this.registerDefaultRole();
|
|
75
|
+
this.registerDefaultProfile();
|
|
76
|
+
this.registerDefaultUser();
|
|
80
77
|
}
|
|
81
|
-
|
|
82
|
-
const promises = [];
|
|
78
|
+
registerDefaultUser() {
|
|
83
79
|
const gatewayUser = {
|
|
84
80
|
content: {
|
|
85
|
-
profileIds: [],
|
|
81
|
+
profileIds: ["payload_gateway"],
|
|
86
82
|
},
|
|
87
83
|
};
|
|
88
|
-
|
|
89
|
-
const userId = `payload_gateway.${(0, shared_1.snakeCase)(decoder.action)}`;
|
|
90
|
-
const user = {
|
|
91
|
-
content: {
|
|
92
|
-
// each created user has only the profile of the same name
|
|
93
|
-
profileIds: [userId],
|
|
94
|
-
},
|
|
95
|
-
};
|
|
96
|
-
gatewayUser.content.profileIds.push(userId);
|
|
97
|
-
promises.push(this.sdk.security.createUser(userId, user).catch((error) => {
|
|
98
|
-
if (error.id !== "security.user.already_exists") {
|
|
99
|
-
throw error;
|
|
100
|
-
}
|
|
101
|
-
return this.sdk.security.updateUser(userId, user);
|
|
102
|
-
}));
|
|
103
|
-
}
|
|
104
|
-
promises.push(this.sdk.security
|
|
105
|
-
.createUser("payload_gateway", gatewayUser)
|
|
106
|
-
.catch((error) => {
|
|
107
|
-
if (error.id !== "security.user.already_exists") {
|
|
108
|
-
throw error;
|
|
109
|
-
}
|
|
110
|
-
return this.sdk.security.updateUser("payload_gateway", gatewayUser);
|
|
111
|
-
}));
|
|
112
|
-
await Promise.all(promises);
|
|
84
|
+
this.plugin.imports.users.payload_gateway = gatewayUser;
|
|
113
85
|
}
|
|
114
|
-
|
|
115
|
-
const promises = [];
|
|
86
|
+
registerDefaultProfile() {
|
|
116
87
|
const gatewayProfile = {
|
|
117
|
-
policies: [],
|
|
88
|
+
policies: [{ roleId: "payload_gateway" }],
|
|
118
89
|
};
|
|
119
|
-
|
|
120
|
-
const profileId = `payload_gateway.${(0, shared_1.snakeCase)(decoder.action)}`;
|
|
121
|
-
const profile = {
|
|
122
|
-
// each created profile has only the role of the same name
|
|
123
|
-
policies: [{ roleId: profileId }],
|
|
124
|
-
};
|
|
125
|
-
gatewayProfile.policies.push({ roleId: profileId });
|
|
126
|
-
promises.push(this.sdk.security.createOrReplaceProfile(profileId, profile));
|
|
127
|
-
}
|
|
128
|
-
promises.push(this.sdk.security.createOrReplaceProfile("payload_gateway", gatewayProfile));
|
|
129
|
-
await Promise.all(promises);
|
|
90
|
+
this.plugin.imports.profiles.payload_gateway = gatewayProfile;
|
|
130
91
|
}
|
|
131
|
-
|
|
132
|
-
const
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
"device-manager/payloads": {
|
|
138
|
-
actions: {
|
|
139
|
-
[decoder.action]: true,
|
|
140
|
-
},
|
|
92
|
+
registerDefaultRole() {
|
|
93
|
+
const role = {
|
|
94
|
+
controllers: {
|
|
95
|
+
"device-manager/payloads": {
|
|
96
|
+
actions: {
|
|
97
|
+
"*": true,
|
|
141
98
|
},
|
|
142
99
|
},
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
await Promise.all(promises);
|
|
100
|
+
},
|
|
101
|
+
};
|
|
102
|
+
this.plugin.imports.roles.payload_gateway = role;
|
|
147
103
|
}
|
|
148
104
|
}
|
|
149
105
|
exports.DecodersRegister = DecodersRegister;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DecodersRegister.js","sourceRoot":"","sources":["../../../../lib/core/registers/DecodersRegister.ts"],"names":[],"mappings":";;;AAAA,mCAKgB;
|
|
1
|
+
{"version":3,"file":"DecodersRegister.js","sourceRoot":"","sources":["../../../../lib/core/registers/DecodersRegister.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,10 @@ class AssetModule extends Module_1.Module {
|
|
|
13
13
|
this.assetService = new AssetService_1.AssetService(this.plugin, this.assetHistoryService);
|
|
14
14
|
this.assetController = new AssetsController_1.AssetsController(this.assetService);
|
|
15
15
|
this.plugin.api["device-manager/assets"] = this.assetController.definition;
|
|
16
|
-
this.plugin.roles
|
|
17
|
-
|
|
16
|
+
this.plugin.imports.roles[RoleAssetsAdmin_1.RoleAssetsAdmin.name] =
|
|
17
|
+
RoleAssetsAdmin_1.RoleAssetsAdmin.definition;
|
|
18
|
+
this.plugin.imports.roles[RoleAssetsReader_1.RoleAssetsReader.name] =
|
|
19
|
+
RoleAssetsReader_1.RoleAssetsReader.definition;
|
|
18
20
|
}
|
|
19
21
|
}
|
|
20
22
|
exports.AssetModule = AssetModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AssetModule.js","sourceRoot":"","sources":["../../../../lib/modules/asset/AssetModule.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,+DAA4D;AAC5D,yDAAsD;AACtD,iDAA8C;AAC9C,6DAA0D;AAC1D,+DAA4D;AAE5D,MAAa,WAAY,SAAQ,eAAM;IAK9B,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC5E,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE/D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;QAE3E,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,iCAAe,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AssetModule.js","sourceRoot":"","sources":["../../../../lib/modules/asset/AssetModule.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,+DAA4D;AAC5D,yDAAsD;AACtD,iDAA8C;AAC9C,6DAA0D;AAC1D,+DAA4D;AAE5D,MAAa,WAAY,SAAQ,eAAM;IAK9B,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChE,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC5E,IAAI,CAAC,eAAe,GAAG,IAAI,mCAAgB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE/D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;QAE3E,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,iCAAe,CAAC,IAAI,CAAC;YAC7C,iCAAe,CAAC,UAAU,CAAC;QAC7B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAgB,CAAC,IAAI,CAAC;YAC9C,mCAAgB,CAAC,UAAU,CAAC;IAChC,CAAC;CACF;AAjBD,kCAiBC"}
|
|
@@ -21,8 +21,10 @@ class DecoderModule extends Module_1.Module {
|
|
|
21
21
|
this.decoderController.definition;
|
|
22
22
|
this.plugin.api["device-manager/payloads"] =
|
|
23
23
|
this.payloadsController.definition;
|
|
24
|
-
this.plugin.roles
|
|
25
|
-
|
|
24
|
+
this.plugin.imports.roles[RoleDecodersAdmin_1.RoleDecodersAdmin.name] =
|
|
25
|
+
RoleDecodersAdmin_1.RoleDecodersAdmin.definition;
|
|
26
|
+
this.plugin.imports.roles[RolePayloadsAll_1.RolePayloadsAll.name] =
|
|
27
|
+
RolePayloadsAll_1.RolePayloadsAll.definition;
|
|
26
28
|
}
|
|
27
29
|
}
|
|
28
30
|
exports.DecoderModule = DecoderModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DecoderModule.js","sourceRoot":"","sources":["../../../../lib/modules/decoder/DecoderModule.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,6DAA0D;AAC1D,6DAA0D;AAC1D,qDAAkD;AAClD,iEAA8D;AAC9D,6DAA0D;AAE1D,MAAa,aAAc,SAAQ,eAAM;IAKvC,2CAA2C;IAC3C,IAAY,gBAAgB;QAC1B,wCAAwC;QACxC,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,iBAAiB,GAAG,IAAI,uCAAkB,CAC7C,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,gBAAgB,CACtB,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAC9C,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,gBAAgB,CACtB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,CAAC;YACxC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;QAEpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,CAAC;YACxC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC;QAErC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,qCAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DecoderModule.js","sourceRoot":"","sources":["../../../../lib/modules/decoder/DecoderModule.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,6DAA0D;AAC1D,6DAA0D;AAC1D,qDAAkD;AAClD,iEAA8D;AAC9D,6DAA0D;AAE1D,MAAa,aAAc,SAAQ,eAAM;IAKvC,2CAA2C;IAC3C,IAAY,gBAAgB;QAC1B,wCAAwC;QACxC,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACzC,CAAC;IAEM,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,iBAAiB,GAAG,IAAI,uCAAkB,CAC7C,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,gBAAgB,CACtB,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,uCAAkB,CAC9C,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,gBAAgB,CACtB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,CAAC;YACxC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC;QAEpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,CAAC;YACxC,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC;QAErC,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,iCAAe,CAAC,IAAI,CAAC;YAC7C,iCAAe,CAAC,UAAU,CAAC;IAC/B,CAAC;CACF;AAjCD,sCAiCC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import { JSONObject, KuzzleRequest } from "kuzzle";
|
|
1
|
+
import { JSONObject, KDocument, KuzzleRequest } from "kuzzle";
|
|
2
2
|
import { DeviceManagerPlugin } from "../../core";
|
|
3
|
+
import { DeviceContent } from "../device";
|
|
4
|
+
import { DecodedMeasurement } from "../measure";
|
|
3
5
|
import { Decoder } from "./Decoder";
|
|
4
6
|
export declare class PayloadService {
|
|
5
7
|
private config;
|
|
@@ -16,6 +18,9 @@ export declare class PayloadService {
|
|
|
16
18
|
receive(request: KuzzleRequest, decoder: Decoder, { refresh }?: any): Promise<{
|
|
17
19
|
valid: boolean;
|
|
18
20
|
}>;
|
|
21
|
+
receiveFormated(device: KDocument<DeviceContent>, measurements: DecodedMeasurement[], { payloadUuids }?: {
|
|
22
|
+
payloadUuids?: string[];
|
|
23
|
+
}): Promise<void>;
|
|
19
24
|
/**
|
|
20
25
|
* Method used to save the payload and catch + log the error if any.
|
|
21
26
|
*
|
|
@@ -30,5 +35,5 @@ export declare class PayloadService {
|
|
|
30
35
|
prune(days: number, onlyValid: boolean, { deviceModel }?: {
|
|
31
36
|
deviceModel?: string;
|
|
32
37
|
}): Promise<number>;
|
|
33
|
-
receiveUnknown(deviceModel: string, payload: JSONObject): Promise<void>;
|
|
38
|
+
receiveUnknown(deviceModel: string, payload: JSONObject, apiAction: string): Promise<void>;
|
|
34
39
|
}
|
|
@@ -4,6 +4,7 @@ exports.PayloadService = void 0;
|
|
|
4
4
|
const uuid_1 = require("uuid");
|
|
5
5
|
const core_1 = require("../../core");
|
|
6
6
|
const device_1 = require("../device");
|
|
7
|
+
const shared_1 = require("../shared");
|
|
7
8
|
const DecodedPayload_1 = require("./DecodedPayload");
|
|
8
9
|
class PayloadService {
|
|
9
10
|
get sdk() {
|
|
@@ -15,6 +16,11 @@ class PayloadService {
|
|
|
15
16
|
constructor(plugin) {
|
|
16
17
|
this.config = plugin.config;
|
|
17
18
|
this.context = plugin.context;
|
|
19
|
+
(0, shared_1.onAsk)("ask:device-manager:payload:receive-formated", async (payload) => {
|
|
20
|
+
await this.receiveFormated(payload.device, payload.measures, {
|
|
21
|
+
payloadUuids: payload.payloadUuids,
|
|
22
|
+
});
|
|
23
|
+
});
|
|
18
24
|
}
|
|
19
25
|
/**
|
|
20
26
|
* Process a payload by validating and decode it with the `decoder` associated
|
|
@@ -24,6 +30,7 @@ class PayloadService {
|
|
|
24
30
|
*/
|
|
25
31
|
async receive(request, decoder, { refresh } = {}) {
|
|
26
32
|
const payload = request.getBody();
|
|
33
|
+
const apiAction = `${request.input.controller}:${request.input.action}`;
|
|
27
34
|
const uuid = request.input.args.uuid || (0, uuid_1.v4)();
|
|
28
35
|
let valid = true;
|
|
29
36
|
try {
|
|
@@ -37,13 +44,13 @@ class PayloadService {
|
|
|
37
44
|
throw error;
|
|
38
45
|
}
|
|
39
46
|
finally {
|
|
40
|
-
await this.savePayload(decoder.deviceModel, uuid, valid, payload);
|
|
47
|
+
await this.savePayload(decoder.deviceModel, uuid, valid, payload, apiAction);
|
|
41
48
|
}
|
|
42
49
|
let decodedPayload = new DecodedPayload_1.DecodedPayload(decoder);
|
|
43
50
|
decodedPayload = await decoder.decode(decodedPayload, payload, request);
|
|
44
51
|
const devices = await this.retrieveDevices(decoder.deviceModel, decodedPayload.references, { refresh });
|
|
45
52
|
for (const device of devices) {
|
|
46
|
-
await
|
|
53
|
+
await (0, shared_1.ask)("device-manager:measures:ingest", {
|
|
47
54
|
device,
|
|
48
55
|
measurements: decodedPayload.getMeasurements(device._source.reference),
|
|
49
56
|
metadata: decodedPayload.getMetadata(device._source.reference),
|
|
@@ -52,14 +59,25 @@ class PayloadService {
|
|
|
52
59
|
}
|
|
53
60
|
return { valid };
|
|
54
61
|
}
|
|
62
|
+
async receiveFormated(device, measurements, { payloadUuids } = {}) {
|
|
63
|
+
const apiAction = "device-manager/devices:receiveMeasure";
|
|
64
|
+
// Payload is already formated thus valid
|
|
65
|
+
await this.savePayload(device._source.model, payloadUuids[0], true, measurements, apiAction);
|
|
66
|
+
await (0, shared_1.ask)("device-manager:measures:ingest", {
|
|
67
|
+
device,
|
|
68
|
+
measurements,
|
|
69
|
+
metadata: {},
|
|
70
|
+
payloadUuids,
|
|
71
|
+
});
|
|
72
|
+
}
|
|
55
73
|
/**
|
|
56
74
|
* Method used to save the payload and catch + log the error if any.
|
|
57
75
|
*
|
|
58
76
|
* This method never returns a rejected promise.
|
|
59
77
|
*/
|
|
60
|
-
async savePayload(deviceModel, uuid, valid, payload) {
|
|
78
|
+
async savePayload(deviceModel, uuid, valid, payload, apiAction) {
|
|
61
79
|
try {
|
|
62
|
-
await this.sdk.document.create(this.config.adminIndex, "payloads", { deviceModel, payload, uuid, valid }, uuid);
|
|
80
|
+
await this.sdk.document.create(this.config.adminIndex, "payloads", { apiAction, deviceModel, payload, uuid, valid }, uuid);
|
|
63
81
|
}
|
|
64
82
|
catch (error) {
|
|
65
83
|
this.app.log.error(`Cannot save the payload from "${deviceModel}": ${error}`);
|
|
@@ -128,8 +146,8 @@ class PayloadService {
|
|
|
128
146
|
const deleted = await this.context.accessors.sdk.bulk.deleteByQuery(this.config.adminIndex, "payloads", { query: { bool: { filter } } });
|
|
129
147
|
return deleted;
|
|
130
148
|
}
|
|
131
|
-
async receiveUnknown(deviceModel, payload) {
|
|
132
|
-
await this.savePayload(deviceModel, (0, uuid_1.v4)(), false, payload);
|
|
149
|
+
async receiveUnknown(deviceModel, payload, apiAction) {
|
|
150
|
+
await this.savePayload(deviceModel, (0, uuid_1.v4)(), false, payload, apiAction);
|
|
133
151
|
}
|
|
134
152
|
}
|
|
135
153
|
exports.PayloadService = PayloadService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayloadService.js","sourceRoot":"","sources":["../../../../lib/modules/decoder/PayloadService.ts"],"names":[],"mappings":";;;AAOA,+BAAoC;AAEpC,qCAIoB;AACpB,sCAA4D;AAE5D,qDAAkD;AAIlD,MAAa,cAAc;IAIzB,IAAY,GAAG;QACb,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC;IACpC,CAAC;IAED,IAAY,GAAG;QACb,OAAO,MAAM,CAAC,GAAG,CAAC;IACpB,CAAC;IAED,YAAY,MAA2B;QACrC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAa,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"PayloadService.js","sourceRoot":"","sources":["../../../../lib/modules/decoder/PayloadService.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,8 +48,9 @@ class PayloadsController {
|
|
|
48
48
|
}
|
|
49
49
|
async receiveUnknown(request) {
|
|
50
50
|
const payload = request.getBody();
|
|
51
|
-
const deviceModel = request.getString("deviceModel");
|
|
52
|
-
|
|
51
|
+
const deviceModel = request.getString("deviceModel", "unknownModel");
|
|
52
|
+
const apiAction = `${request.input.controller}:${request.input.action}`;
|
|
53
|
+
await this.payloadService.receiveUnknown(deviceModel, payload, apiAction);
|
|
53
54
|
}
|
|
54
55
|
}
|
|
55
56
|
exports.PayloadsController = PayloadsController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayloadsController.js","sourceRoot":"","sources":["../../../../lib/modules/decoder/PayloadsController.ts"],"names":[],"mappings":";;;AAOA,MAAa,kBAAkB;IAM7B,YACE,cAA8B,EAC9B,gBAAkC;QAElC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAEzC,IAAI,CAAC,UAAU,GAAG;YAChB,OAAO,EAAE;gBACP,cAAc,EAAE;oBACd,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;oBACvC,IAAI,EAAE;wBACJ;4BACE,OAAO,EAAE;gCACP,WAAW,EAAE,iCAAiC;gCAC9C,UAAU,EAAE;oCACV;wCACE,EAAE,EAAE,MAAM;wCACV,IAAI,EAAE,aAAa;wCACnB,QAAQ,EAAE,IAAI;wCACd,MAAM,EAAE;4CACN,IAAI,EAAE,QAAQ;yCACf;qCACF;oCACD;wCACE,EAAE,EAAE,MAAM;wCACV,IAAI,EAAE,SAAS;wCACf,QAAQ,EAAE,IAAI;wCACd,MAAM,EAAE;4CACN,IAAI,EAAE,QAAQ;yCACf;qCACF;iCACF;6BACF;4BACD,IAAI,EAAE,qCAAqC;4BAC3C,IAAI,EAAE,MAAM;yBACb;qBACF;iBACF;aACF;SACF,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACpD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;gBACxC,OAAO,EAAE,CAAC,OAAsB,EAAE,EAAE,CAClC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC;gBAC/C,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,OAAsB;QAEtB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"PayloadsController.js","sourceRoot":"","sources":["../../../../lib/modules/decoder/PayloadsController.ts"],"names":[],"mappings":";;;AAOA,MAAa,kBAAkB;IAM7B,YACE,cAA8B,EAC9B,gBAAkC;QAElC,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAEzC,IAAI,CAAC,UAAU,GAAG;YAChB,OAAO,EAAE;gBACP,cAAc,EAAE;oBACd,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;oBACvC,IAAI,EAAE;wBACJ;4BACE,OAAO,EAAE;gCACP,WAAW,EAAE,iCAAiC;gCAC9C,UAAU,EAAE;oCACV;wCACE,EAAE,EAAE,MAAM;wCACV,IAAI,EAAE,aAAa;wCACnB,QAAQ,EAAE,IAAI;wCACd,MAAM,EAAE;4CACN,IAAI,EAAE,QAAQ;yCACf;qCACF;oCACD;wCACE,EAAE,EAAE,MAAM;wCACV,IAAI,EAAE,SAAS;wCACf,QAAQ,EAAE,IAAI;wCACd,MAAM,EAAE;4CACN,IAAI,EAAE,QAAQ;yCACf;qCACF;iCACF;6BACF;4BACD,IAAI,EAAE,qCAAqC;4BAC3C,IAAI,EAAE,MAAM;yBACb;qBACF;iBACF;aACF;SACF,CAAC;QAEF,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACpD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;gBACxC,OAAO,EAAE,CAAC,OAAsB,EAAE,EAAE,CAClC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC;gBAC/C,IAAI,EAAE,OAAO,CAAC,IAAI;aACnB,CAAC;SACH;IACH,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,OAAsB;QAEtB,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;QACrE,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAExE,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC5E,CAAC;CACF;AAlED,gDAkEC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payloadsMappings.js","sourceRoot":"","sources":["../../../../../lib/modules/decoder/collections/payloadsMappings.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,OAAO,EAAE,QAAQ;IACjB,UAAU,EAAE;QACV,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAChC,OAAO,EAAE;YACP,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,EAAE;SACf;QACD,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QACzB,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"payloadsMappings.js","sourceRoot":"","sources":["../../../../../lib/modules/decoder/collections/payloadsMappings.ts"],"names":[],"mappings":";;;AAAa,QAAA,gBAAgB,GAAG;IAC9B,OAAO,EAAE,QAAQ;IACjB,UAAU,EAAE;QACV,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAChC,OAAO,EAAE;YACP,OAAO,EAAE,OAAO;YAChB,UAAU,EAAE,EAAE;SACf;QACD,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QACzB,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;QAC1B,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE;KAC/B;CACF,CAAC"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { KDocument } from "kuzzle-sdk";
|
|
2
|
+
import { DeviceContent } from "../../device";
|
|
3
|
+
import { DecodedMeasurement } from "../../measure";
|
|
4
|
+
/**
|
|
5
|
+
* @internal
|
|
6
|
+
*/
|
|
7
|
+
export type AskPayloadReceiveFormated = {
|
|
8
|
+
name: "ask:device-manager:payload:receive-formated";
|
|
9
|
+
payload: {
|
|
10
|
+
device: KDocument<DeviceContent>;
|
|
11
|
+
measures: DecodedMeasurement[];
|
|
12
|
+
payloadUuids: string[];
|
|
13
|
+
};
|
|
14
|
+
result: void;
|
|
15
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PayloadEvents.js","sourceRoot":"","sources":["../../../../../lib/modules/decoder/types/PayloadEvents.ts"],"names":[],"mappings":""}
|
|
@@ -13,9 +13,12 @@ class DeviceModule extends Module_1.Module {
|
|
|
13
13
|
this.deviceController = new DevicesController_1.DevicesController(this.deviceService);
|
|
14
14
|
this.plugin.api["device-manager/devices"] =
|
|
15
15
|
this.deviceController.definition;
|
|
16
|
-
this.plugin.roles
|
|
17
|
-
|
|
18
|
-
this.plugin.roles.
|
|
16
|
+
this.plugin.imports.roles[RoleDevicesAdmin_1.RoleDevicesAdmin.name] =
|
|
17
|
+
RoleDevicesAdmin_1.RoleDevicesAdmin.definition;
|
|
18
|
+
this.plugin.imports.roles[RoleDevicesPlatformAdmin_1.RoleDevicesPlatformAdmin.name] =
|
|
19
|
+
RoleDevicesPlatformAdmin_1.RoleDevicesPlatformAdmin.definition;
|
|
20
|
+
this.plugin.imports.roles[RoleDevicesReader_1.RoleDevicesReader.name] =
|
|
21
|
+
RoleDevicesReader_1.RoleDevicesReader.definition;
|
|
19
22
|
}
|
|
20
23
|
}
|
|
21
24
|
exports.DeviceModule = DeviceModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceModule.js","sourceRoot":"","sources":["../../../../lib/modules/device/DeviceModule.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,2DAAwD;AACxD,mDAAgD;AAChD,+DAA4D;AAC5D,+EAA4E;AAC5E,iEAA8D;AAE9D,MAAa,YAAa,SAAQ,eAAM;IAI/B,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,aAAa,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,gBAAgB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAElE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC;YACvC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,mCAAgB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"DeviceModule.js","sourceRoot":"","sources":["../../../../lib/modules/device/DeviceModule.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,2DAAwD;AACxD,mDAAgD;AAChD,+DAA4D;AAC5D,+EAA4E;AAC5E,iEAA8D;AAE9D,MAAa,YAAa,SAAQ,eAAM;IAI/B,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,aAAa,GAAG,IAAI,6BAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,IAAI,CAAC,gBAAgB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAElE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC;YACvC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC;QAEnC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,mCAAgB,CAAC,IAAI,CAAC;YAC9C,mCAAgB,CAAC,UAAU,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,mDAAwB,CAAC,IAAI,CAAC;YACtD,mDAAwB,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,qCAAiB,CAAC,IAAI,CAAC;YAC/C,qCAAiB,CAAC,UAAU,CAAC;IACjC,CAAC;CACF;AAlBD,oCAkBC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { JSONObject, KDocument, KHit, Plugin, SearchResult, User } from "kuzzle";
|
|
2
2
|
import { AssetContent } from "./../asset";
|
|
3
3
|
import { Metadata } from "../shared";
|
|
4
|
+
import { DecodedMeasurement } from "../measure";
|
|
4
5
|
import { DeviceContent } from "./types/DeviceContent";
|
|
5
6
|
import { ApiDeviceLinkAssetRequest, ApiDeviceGetMeasuresResult } from "./types/DeviceApi";
|
|
6
7
|
export declare class DeviceService {
|
|
@@ -64,6 +65,7 @@ export declare class DeviceService {
|
|
|
64
65
|
asset: KDocument<AssetContent>;
|
|
65
66
|
device: KDocument<DeviceContent>;
|
|
66
67
|
}>;
|
|
68
|
+
receiveMeasures(engineId: string, deviceId: string, measures: DecodedMeasurement[], payloadUuids: string[]): Promise<void>;
|
|
67
69
|
/**
|
|
68
70
|
* Checks if the asset does not already have a linked device using one of the
|
|
69
71
|
* requested measure names.
|
|
@@ -100,4 +102,6 @@ export declare class DeviceService {
|
|
|
100
102
|
private checkEngineExists;
|
|
101
103
|
private checkAttachedToEngine;
|
|
102
104
|
private getEngine;
|
|
105
|
+
private getDeviceModel;
|
|
106
|
+
private getAssetModel;
|
|
103
107
|
}
|
|
@@ -46,7 +46,7 @@ class DeviceService {
|
|
|
46
46
|
};
|
|
47
47
|
return (0, shared_1.lock)(`device:create:${device._id}`, async () => {
|
|
48
48
|
var _a;
|
|
49
|
-
const deviceModel = await
|
|
49
|
+
const deviceModel = await this.getDeviceModel(model);
|
|
50
50
|
for (const metadataName of Object.keys(deviceModel.device.metadataMappings)) {
|
|
51
51
|
(_a = device._source.metadata)[metadataName] || (_a[metadataName] = null);
|
|
52
52
|
}
|
|
@@ -188,13 +188,8 @@ class DeviceService {
|
|
|
188
188
|
}
|
|
189
189
|
const asset = await this.sdk.document.get(device._source.engineId, core_1.InternalCollection.ASSETS, assetId);
|
|
190
190
|
const [assetModel, deviceModel] = await Promise.all([
|
|
191
|
-
(
|
|
192
|
-
|
|
193
|
-
model: asset._source.model,
|
|
194
|
-
}),
|
|
195
|
-
(0, shared_1.ask)("ask:device-manager:model:device:get", {
|
|
196
|
-
model: device._source.model,
|
|
197
|
-
}),
|
|
191
|
+
this.getAssetModel(engine.group, asset._source.model),
|
|
192
|
+
this.getDeviceModel(device._source.model),
|
|
198
193
|
]);
|
|
199
194
|
this.checkAlreadyProvidedMeasures(asset, measureNames);
|
|
200
195
|
if (implicitMeasuresLinking) {
|
|
@@ -227,6 +222,21 @@ class DeviceService {
|
|
|
227
222
|
return { asset: updatedAsset, device: updatedDevice };
|
|
228
223
|
});
|
|
229
224
|
}
|
|
225
|
+
async receiveMeasures(engineId, deviceId, measures, payloadUuids) {
|
|
226
|
+
const device = await this.get(engineId, deviceId);
|
|
227
|
+
const deviceModel = await this.getDeviceModel(device._source.model);
|
|
228
|
+
for (const measure of measures) {
|
|
229
|
+
const declaredMeasure = deviceModel.device.measures.some((m) => m.name === measure.measureName && m.type === measure.type);
|
|
230
|
+
if (!declaredMeasure) {
|
|
231
|
+
throw new kuzzle_1.BadRequestError(`Measure "${measure.measureName}" is not declared for this device model.`);
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
await (0, shared_1.ask)("ask:device-manager:payload:receive-formated", {
|
|
235
|
+
device,
|
|
236
|
+
measures,
|
|
237
|
+
payloadUuids,
|
|
238
|
+
});
|
|
239
|
+
}
|
|
230
240
|
/**
|
|
231
241
|
* Checks if the asset does not already have a linked device using one of the
|
|
232
242
|
* requested measure names.
|
|
@@ -354,6 +364,17 @@ class DeviceService {
|
|
|
354
364
|
const engine = await this.sdk.document.get(this.config.adminIndex, core_1.InternalCollection.CONFIG, `engine-device-manager--${engineId}`);
|
|
355
365
|
return engine._source.engine;
|
|
356
366
|
}
|
|
367
|
+
getDeviceModel(model) {
|
|
368
|
+
return (0, shared_1.ask)("ask:device-manager:model:device:get", {
|
|
369
|
+
model,
|
|
370
|
+
});
|
|
371
|
+
}
|
|
372
|
+
getAssetModel(engineGroup, model) {
|
|
373
|
+
return (0, shared_1.ask)("ask:device-manager:model:asset:get", {
|
|
374
|
+
engineGroup,
|
|
375
|
+
model,
|
|
376
|
+
});
|
|
377
|
+
}
|
|
357
378
|
}
|
|
358
379
|
exports.DeviceService = DeviceService;
|
|
359
380
|
//# sourceMappingURL=DeviceService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeviceService.js","sourceRoot":"","sources":["../../../../lib/modules/device/DeviceService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DeviceService.js","sourceRoot":"","sources":["../../../../lib/modules/device/DeviceService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.DevicesController = void 0;
|
|
7
|
+
const kuzzle_1 = require("kuzzle");
|
|
8
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
4
9
|
const AssetSerializer_1 = require("../asset/model/AssetSerializer");
|
|
5
10
|
const DeviceSerializer_1 = require("./model/DeviceSerializer");
|
|
6
11
|
class DevicesController {
|
|
@@ -86,6 +91,15 @@ class DevicesController {
|
|
|
86
91
|
},
|
|
87
92
|
],
|
|
88
93
|
},
|
|
94
|
+
receiveMeasures: {
|
|
95
|
+
handler: this.receiveMeasures.bind(this),
|
|
96
|
+
http: [
|
|
97
|
+
{
|
|
98
|
+
path: "device-manager/:engineId/devices/:_id/measures",
|
|
99
|
+
verb: "put",
|
|
100
|
+
},
|
|
101
|
+
],
|
|
102
|
+
},
|
|
89
103
|
},
|
|
90
104
|
};
|
|
91
105
|
/* eslint-enable sort-keys */
|
|
@@ -169,7 +183,7 @@ class DevicesController {
|
|
|
169
183
|
const deviceId = request.getId();
|
|
170
184
|
const engineId = request.getString("engineId");
|
|
171
185
|
const assetId = request.getString("assetId");
|
|
172
|
-
const measureNames = request.getBodyArray("measureNames");
|
|
186
|
+
const measureNames = request.getBodyArray("measureNames", []);
|
|
173
187
|
const implicitMeasuresLinking = request.getBoolean("implicitMeasuresLinking");
|
|
174
188
|
const refresh = request.getRefresh();
|
|
175
189
|
const { asset, device } = await this.deviceService.linkAsset(request.getUser(), engineId, deviceId, assetId, measureNames, { implicitMeasuresLinking, refresh });
|
|
@@ -215,6 +229,33 @@ class DevicesController {
|
|
|
215
229
|
});
|
|
216
230
|
return { measures, total };
|
|
217
231
|
}
|
|
232
|
+
async receiveMeasures(request) {
|
|
233
|
+
const engineId = request.getString("engineId");
|
|
234
|
+
const deviceId = request.getId();
|
|
235
|
+
const measures = request.getBodyArray("measures");
|
|
236
|
+
const payloadUuids = request.getBodyArray("payloadUuids", []);
|
|
237
|
+
if (payloadUuids.length === 0) {
|
|
238
|
+
payloadUuids.push(request.id);
|
|
239
|
+
}
|
|
240
|
+
for (let i = 0; i < measures.length; i++) {
|
|
241
|
+
if (typeof measures[i].measureName !== "string") {
|
|
242
|
+
throw new kuzzle_1.BadRequestError(`body.measures[${i}].measureName must be a string`);
|
|
243
|
+
}
|
|
244
|
+
if (typeof measures[i].measuredAt === "undefined") {
|
|
245
|
+
measures[i].measuredAt = Date.now();
|
|
246
|
+
}
|
|
247
|
+
else if (typeof measures[i].measuredAt !== "number") {
|
|
248
|
+
throw new kuzzle_1.BadRequestError(`body.measures[${i}].measuredAt must be a number`);
|
|
249
|
+
}
|
|
250
|
+
if (typeof measures[i].type !== "string") {
|
|
251
|
+
throw new kuzzle_1.BadRequestError(`body.measures[${i}].type must be a string`);
|
|
252
|
+
}
|
|
253
|
+
if (!lodash_1.default.isPlainObject(measures[i].values)) {
|
|
254
|
+
throw new kuzzle_1.BadRequestError(`body.measures[${i}].values must be an object`);
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
await this.deviceService.receiveMeasures(engineId, deviceId, measures, payloadUuids);
|
|
258
|
+
}
|
|
218
259
|
}
|
|
219
260
|
exports.DevicesController = DevicesController;
|
|
220
261
|
//# sourceMappingURL=DevicesController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DevicesController.js","sourceRoot":"","sources":["../../../../lib/modules/device/DevicesController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DevicesController.js","sourceRoot":"","sources":["../../../../lib/modules/device/DevicesController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { JSONObject, KDocument, KHit, SearchResult } from "kuzzle";
|
|
2
|
-
import { MeasureContent } from "../../measure";
|
|
2
|
+
import { DecodedMeasurement, MeasureContent } from "../../measure";
|
|
3
3
|
import { AssetContent } from "../../asset";
|
|
4
4
|
import { Metadata } from "../../shared";
|
|
5
5
|
import { DeviceContent } from "./DeviceContent";
|
|
@@ -130,4 +130,18 @@ export type ApiDeviceGetMeasuresResult = {
|
|
|
130
130
|
measures: Array<KDocument<MeasureContent<JSONObject>>>;
|
|
131
131
|
total: number;
|
|
132
132
|
};
|
|
133
|
+
export interface ApiDeviceReceiveMeasuresRequest<TMeasureValues extends JSONObject = JSONObject> extends DevicesControllerRequest {
|
|
134
|
+
action: "receiveMeasures";
|
|
135
|
+
_id: string;
|
|
136
|
+
body: {
|
|
137
|
+
payloadUuids?: string[];
|
|
138
|
+
measures: Array<{
|
|
139
|
+
measureName: DecodedMeasurement<TMeasureValues>["measureName"];
|
|
140
|
+
measuredAt?: DecodedMeasurement<TMeasureValues>["measuredAt"];
|
|
141
|
+
type: DecodedMeasurement<TMeasureValues>["type"];
|
|
142
|
+
values: DecodedMeasurement<TMeasureValues>["values"];
|
|
143
|
+
}>;
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
export type ApiDeviceReceiveMeasuresResult = void;
|
|
133
147
|
export {};
|
|
@@ -8,8 +8,10 @@ const RoleMeasuresReader_1 = require("./roles/RoleMeasuresReader");
|
|
|
8
8
|
class MeasureModule extends Module_1.Module {
|
|
9
9
|
async init() {
|
|
10
10
|
this.measureService = new MeasureService_1.MeasureService(this.plugin);
|
|
11
|
-
this.plugin.roles
|
|
12
|
-
|
|
11
|
+
this.plugin.imports.roles[RoleMeasuresAdmin_1.RoleMeasuresAdmin.name] =
|
|
12
|
+
RoleMeasuresAdmin_1.RoleMeasuresAdmin.definition;
|
|
13
|
+
this.plugin.imports.roles[RoleMeasuresReader_1.RoleMeasuresReader.name] =
|
|
14
|
+
RoleMeasuresReader_1.RoleMeasuresReader.definition;
|
|
13
15
|
}
|
|
14
16
|
}
|
|
15
17
|
exports.MeasureModule = MeasureModule;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasureModule.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureModule.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,qDAAkD;AAClD,iEAA8D;AAC9D,mEAAgE;AAEhE,MAAa,aAAc,SAAQ,eAAM;IAGhC,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,qCAAiB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"MeasureModule.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureModule.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAE1C,qDAAkD;AAClD,iEAA8D;AAC9D,mEAAgE;AAEhE,MAAa,aAAc,SAAQ,eAAM;IAGhC,KAAK,CAAC,IAAI;QACf,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEtD,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;AAXD,sCAWC"}
|
|
@@ -19,9 +19,8 @@ class MeasureService {
|
|
|
19
19
|
constructor(plugin) {
|
|
20
20
|
this.config = plugin.config;
|
|
21
21
|
this.context = plugin.context;
|
|
22
|
-
|
|
22
|
+
(0, shared_1.onAsk)("device-manager:measures:ingest", async (payload) => {
|
|
23
23
|
await this.ingest(payload.device, payload.measurements, payload.metadata, payload.payloadUuids);
|
|
24
|
-
return payload;
|
|
25
24
|
});
|
|
26
25
|
}
|
|
27
26
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeasureService.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureService.ts"],"names":[],"mappings":";;;;;;AAAA,mCAMgB;AAChB,oDAAuB;AAEvB,qCAIoB;AAQpB,
|
|
1
|
+
{"version":3,"file":"MeasureService.js","sourceRoot":"","sources":["../../../../lib/modules/measure/MeasureService.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,16 +6,15 @@ import { DecodedMeasurement, MeasureContent } from "./MeasureContent";
|
|
|
6
6
|
/**
|
|
7
7
|
* @internal
|
|
8
8
|
*/
|
|
9
|
-
export type
|
|
9
|
+
export type AskMeasureIngest = {
|
|
10
10
|
name: "device-manager:measures:ingest";
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
];
|
|
11
|
+
payload: {
|
|
12
|
+
device: KDocument<DeviceContent>;
|
|
13
|
+
measurements: DecodedMeasurement<JSONObject>[];
|
|
14
|
+
metadata: Metadata;
|
|
15
|
+
payloadUuids: string[];
|
|
16
|
+
};
|
|
17
|
+
result: void;
|
|
19
18
|
};
|
|
20
19
|
/**
|
|
21
20
|
* Event before starting to process new measures.
|
|
@@ -21,6 +21,5 @@ __exportStar(require("./types/KuzzleRole"), exports);
|
|
|
21
21
|
__exportStar(require("./utils/lock"), exports);
|
|
22
22
|
__exportStar(require("./utils/flattenObject"), exports);
|
|
23
23
|
__exportStar(require("./utils/ask"), exports);
|
|
24
|
-
__exportStar(require("./utils/snakeCase"), exports);
|
|
25
24
|
__exportStar(require("./Module"), exports);
|
|
26
25
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/modules/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6DAA2C;AAC3C,mDAAiC;AACjC,0DAAwC;AACxC,qDAAmC;AACnC,+CAA6B;AAC7B,wDAAsC;AACtC,8CAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../lib/modules/shared/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,6DAA2C;AAC3C,mDAAiC;AACjC,0DAAwC;AACxC,qDAAmC;AACnC,+CAA6B;AAC7B,wDAAsC;AACtC,8CAA4B;AAC5B,2CAAyB"}
|
|
@@ -4,5 +4,5 @@ export type AskEventDefinition = {
|
|
|
4
4
|
result: any;
|
|
5
5
|
};
|
|
6
6
|
export type AskEventHandler<TAskEventDefinition extends AskEventDefinition = AskEventDefinition> = (payload?: TAskEventDefinition["payload"]) => Promise<TAskEventDefinition["result"]>;
|
|
7
|
-
export declare function onAsk<TAskEventDefinition extends AskEventDefinition = AskEventDefinition>(event: TAskEventDefinition["name"], handler: AskEventHandler<TAskEventDefinition>):
|
|
7
|
+
export declare function onAsk<TAskEventDefinition extends AskEventDefinition = AskEventDefinition>(event: TAskEventDefinition["name"], handler: AskEventHandler<TAskEventDefinition>): any;
|
|
8
8
|
export declare function ask<TAskEventDefinition extends AskEventDefinition = AskEventDefinition>(event: TAskEventDefinition["name"], payload?: TAskEventDefinition["payload"]): Promise<TAskEventDefinition["result"]>;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ask = exports.onAsk = void 0;
|
|
4
|
-
|
|
4
|
+
function onAsk(event, handler) {
|
|
5
5
|
return global.kuzzle.onAsk(event, handler);
|
|
6
6
|
}
|
|
7
7
|
exports.onAsk = onAsk;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.js","sourceRoot":"","sources":["../../../../../lib/modules/shared/utils/ask.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"ask.js","sourceRoot":"","sources":["../../../../../lib/modules/shared/utils/ask.ts"],"names":[],"mappings":";;;AAcA,SAAgB,KAAK,CAGnB,KAAkC,EAClC,OAA6C;IAE7C,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7C,CAAC;AAPD,sBAOC;AAEM,KAAK,UAAU,GAAG,CAGvB,KAAkC,EAClC,OAAwC;IAExC,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC;AAPD,kBAOC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "kuzzle-device-manager",
|
|
3
|
-
"version": "2.0
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "Manage your IoT devices and assets. Choose a provisioning strategy, receive and decode payload, handle your IoT business logic.",
|
|
5
5
|
"author": "The Kuzzle Team (support@kuzzle.io)",
|
|
6
6
|
"repository": {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"test:unit": "mocha",
|
|
18
18
|
"test:functional": "npm run test:cucumber && npm run test:jest",
|
|
19
19
|
"test:cucumber": "cucumber-js --require-module ts-node/register --exit --fail-fast",
|
|
20
|
-
"test:jest": "jest",
|
|
20
|
+
"test:jest": "jest --runInBand",
|
|
21
21
|
"test:lint": "eslint ./lib ./tests --ext .ts --config .eslintrc.json",
|
|
22
22
|
"test:lint:fix": "eslint ./lib ./tests --ext .ts --config .eslintrc.json --fix",
|
|
23
23
|
"prettier": "npx prettier lib/ features/ tests/ --write",
|
|
@@ -31,22 +31,22 @@
|
|
|
31
31
|
"uuid": "~9.0.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@types/jest": "^29.
|
|
35
|
-
"@types/node": "^18.
|
|
36
|
-
"axios": "^1.2
|
|
34
|
+
"@types/jest": "^29.4.0",
|
|
35
|
+
"@types/node": "^18.13.0",
|
|
36
|
+
"axios": "^1.3.2",
|
|
37
37
|
"cucumber": "^6.0.5",
|
|
38
38
|
"ergol": "^1.0.2",
|
|
39
39
|
"eslint-plugin-kuzzle": "^0.0.6",
|
|
40
|
-
"jest": "^29.
|
|
41
|
-
"kuzzle": "^2.20.
|
|
42
|
-
"kuzzle-sdk": "^7.10.
|
|
40
|
+
"jest": "^29.4.1",
|
|
41
|
+
"kuzzle": "^2.20.2",
|
|
42
|
+
"kuzzle-sdk": "^7.10.5",
|
|
43
43
|
"should": "^13.2.3",
|
|
44
|
+
"ts-jest": "^29.0.5",
|
|
44
45
|
"ts-node": "^10.9.1",
|
|
45
|
-
"
|
|
46
|
-
"typescript": "^4.9.4"
|
|
46
|
+
"typescript": "^4.9.5"
|
|
47
47
|
},
|
|
48
48
|
"peerDependencies": {
|
|
49
|
-
"kuzzle": "^2.
|
|
49
|
+
"kuzzle": "^2.20.2"
|
|
50
50
|
},
|
|
51
51
|
"files": [
|
|
52
52
|
"dist/**/*"
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.snakeCase = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* Convert a string to snake_case
|
|
6
|
-
*
|
|
7
|
-
* @todo use Inflector.snakeCase when
|
|
8
|
-
* https://github.com/kuzzleio/kuzzle/pull/2415 is released
|
|
9
|
-
*/
|
|
10
|
-
function snakeCase(str) {
|
|
11
|
-
return str
|
|
12
|
-
.replace(/\W+/g, " ")
|
|
13
|
-
.split(/ |\B(?=[A-Z])/)
|
|
14
|
-
.map((word) => word.toLowerCase())
|
|
15
|
-
.join("_");
|
|
16
|
-
}
|
|
17
|
-
exports.snakeCase = snakeCase;
|
|
18
|
-
//# sourceMappingURL=snakeCase.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"snakeCase.js","sourceRoot":"","sources":["../../../../../lib/modules/shared/utils/snakeCase.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,SAAgB,SAAS,CAAC,GAAW;IACnC,OAAO,GAAG;SACP,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;SACpB,KAAK,CAAC,eAAe,CAAC;SACtB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;SACjC,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAND,8BAMC"}
|