@victronenergy/mfd-modules 3.3.10 → 3.3.12
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/src/Modules/AcLoads/AcLoads.provider.js +1 -2
- package/dist/src/Modules/AcLoads/AcLoads.provider.js.map +1 -1
- package/dist/src/Modules/AcMode/AcMode.provider.js +1 -2
- package/dist/src/Modules/AcMode/AcMode.provider.js.map +1 -1
- package/dist/src/Modules/ActiveSource/ActiveInValues.provider.js +1 -2
- package/dist/src/Modules/ActiveSource/ActiveInValues.provider.js.map +1 -1
- package/dist/src/Modules/ActiveSource/ActiveSource.provider.js +1 -2
- package/dist/src/Modules/ActiveSource/ActiveSource.provider.js.map +1 -1
- package/dist/src/Modules/Alternators/Alternator.provider.js +1 -2
- package/dist/src/Modules/Alternators/Alternator.provider.js.map +1 -1
- package/dist/src/Modules/Alternators/Alternators.provider.js +1 -2
- package/dist/src/Modules/Alternators/Alternators.provider.js.map +1 -1
- package/dist/src/Modules/App/App.provider.js +1 -2
- package/dist/src/Modules/App/App.provider.js.map +1 -1
- package/dist/src/Modules/Battery/Batteries.provider.js +1 -2
- package/dist/src/Modules/Battery/Batteries.provider.js.map +1 -1
- package/dist/src/Modules/Battery/Battery.provider.js +1 -2
- package/dist/src/Modules/Battery/Battery.provider.js.map +1 -1
- package/dist/src/Modules/Chargers/Charger.provider.js +1 -2
- package/dist/src/Modules/Chargers/Charger.provider.js.map +1 -1
- package/dist/src/Modules/Chargers/Chargers.provider.js +1 -2
- package/dist/src/Modules/Chargers/Chargers.provider.js.map +1 -1
- package/dist/src/Modules/DcLoads/DcLoads.provider.js +1 -2
- package/dist/src/Modules/DcLoads/DcLoads.provider.js.map +1 -1
- package/dist/src/Modules/Generators/GeneratorFp.provider.js +1 -2
- package/dist/src/Modules/Generators/GeneratorFp.provider.js.map +1 -1
- package/dist/src/Modules/Generators/GeneratorRelay.provider.js +1 -2
- package/dist/src/Modules/Generators/GeneratorRelay.provider.js.map +1 -1
- package/dist/src/Modules/Generators/GensetValues.provider.js +1 -2
- package/dist/src/Modules/Generators/GensetValues.provider.js.map +1 -1
- package/dist/src/Modules/Header/Header.provider.js +1 -2
- package/dist/src/Modules/Header/Header.provider.js.map +1 -1
- package/dist/src/Modules/InverterCharger/InputLimit.provider.js +1 -2
- package/dist/src/Modules/InverterCharger/InputLimit.provider.js.map +1 -1
- package/dist/src/Modules/InverterCharger/InputLimitSelector.provider.js +1 -2
- package/dist/src/Modules/InverterCharger/InputLimitSelector.provider.js.map +1 -1
- package/dist/src/Modules/InverterCharger/InverterCharger.provider.js +1 -2
- package/dist/src/Modules/InverterCharger/InverterCharger.provider.js.map +1 -1
- package/dist/src/Modules/Inverters/Inverter.provider.js +1 -2
- package/dist/src/Modules/Inverters/Inverter.provider.js.map +1 -1
- package/dist/src/Modules/Inverters/Inverters.provider.js +1 -2
- package/dist/src/Modules/Inverters/Inverters.provider.js.map +1 -1
- package/dist/src/Modules/Language/Language.provider.js +1 -2
- package/dist/src/Modules/Language/Language.provider.js.map +1 -1
- package/dist/src/Modules/Mqtt/Mqtt.provider.d.ts +0 -1
- package/dist/src/Modules/Mqtt/Mqtt.provider.js +0 -7
- package/dist/src/Modules/Mqtt/Mqtt.provider.js.map +1 -1
- package/dist/src/Modules/Mqtt/Mqtt.store.d.ts +6 -9
- package/dist/src/Modules/Mqtt/Mqtt.store.js +57 -71
- package/dist/src/Modules/Mqtt/Mqtt.store.js.map +1 -1
- package/dist/src/Modules/PvCharger/PvCharger.provider.js +1 -2
- package/dist/src/Modules/PvCharger/PvCharger.provider.js.map +1 -1
- package/dist/src/Modules/ShorePowerInput/ShorePowerInput.provider.js +1 -2
- package/dist/src/Modules/ShorePowerInput/ShorePowerInput.provider.js.map +1 -1
- package/dist/src/Modules/SystemState/SystemState.provider.js +1 -2
- package/dist/src/Modules/SystemState/SystemState.provider.js.map +1 -1
- package/dist/src/Modules/Tanks/Tank.provider.js +1 -2
- package/dist/src/Modules/Tanks/Tank.provider.js.map +1 -1
- package/dist/src/Modules/Tanks/Tanks.provider.js +1 -2
- package/dist/src/Modules/Tanks/Tanks.provider.js.map +1 -1
- package/dist/src/Modules/Temperatures/Temperature.provider.js +1 -4
- package/dist/src/Modules/Temperatures/Temperature.provider.js.map +1 -1
- package/dist/src/Modules/Temperatures/Temperatures.provider.js +1 -2
- package/dist/src/Modules/Temperatures/Temperatures.provider.js.map +1 -1
- package/dist/src/Modules/Vebus/Vebus.provider.js +1 -13
- package/dist/src/Modules/Vebus/Vebus.provider.js.map +1 -1
- package/dist/src/Modules/WindGenerators/WindGenerator.provider.js +1 -2
- package/dist/src/Modules/WindGenerators/WindGenerator.provider.js.map +1 -1
- package/dist/src/Modules/WindGenerators/WindGenerators.provider.js +1 -2
- package/dist/src/Modules/WindGenerators/WindGenerators.provider.js.map +1 -1
- package/dist/src/utils/constants.d.ts +80 -88
- package/dist/src/utils/constants.js.map +1 -1
- package/dist/src/utils/logger.d.ts +2 -2
- package/dist/src/utils/logger.js +1 -2
- package/dist/src/utils/logger.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="lodash" />
|
|
2
1
|
import * as mqtt from "mqtt";
|
|
3
2
|
import { MqttClient } from "mqtt";
|
|
4
3
|
import { MqttMessage, MqttMessages, PortalId, Topics } from "../Mqtt";
|
|
@@ -20,9 +19,6 @@ export declare class MqttStore {
|
|
|
20
19
|
constructor();
|
|
21
20
|
get isConnected(): boolean;
|
|
22
21
|
subscribeToTopic: (topic?: string | undefined) => void;
|
|
23
|
-
unsubscribeFromTopic: (topic?: string | undefined) => void;
|
|
24
|
-
subscribeToTopics: (topics: Topics) => void;
|
|
25
|
-
unsubscribeFromTopics: (topics: Topics) => void;
|
|
26
22
|
addMessage: (topic: string, message: {
|
|
27
23
|
value: string | null;
|
|
28
24
|
}) => Promise<void>;
|
|
@@ -30,14 +26,15 @@ export declare class MqttStore {
|
|
|
30
26
|
setupQueueWorker: () => void;
|
|
31
27
|
removeQueueWorker: () => void;
|
|
32
28
|
setPortalId: (portalId: string) => void;
|
|
29
|
+
setStatus(status: string): void;
|
|
30
|
+
setError(error: object | null | boolean): void;
|
|
31
|
+
setFirstKeepalive(f: boolean): void;
|
|
33
32
|
boot: (host: string | undefined, port: number | null, remote?: boolean, portalId?: string | undefined) => void;
|
|
34
|
-
|
|
35
|
-
|
|
33
|
+
subscribeToAllTopics: () => void;
|
|
34
|
+
sendSuppressedKeepalive: () => void;
|
|
35
|
+
sendFullKeepalive: () => void;
|
|
36
36
|
setupKeepalive: () => void;
|
|
37
37
|
publish: (topic: string, data: string | number, options?: mqtt.IClientPublishOptions | undefined) => void;
|
|
38
38
|
messagesByWildcard: (wildcard?: string | undefined) => any;
|
|
39
|
-
setStatus(status: string): void;
|
|
40
|
-
setError(error: object | null | boolean): void;
|
|
41
|
-
setFirstKeepalive(f: boolean): void;
|
|
42
39
|
}
|
|
43
40
|
export declare function useMqtt(): MqttStore;
|
|
@@ -41,7 +41,7 @@ import { STATUS } from "../Mqtt";
|
|
|
41
41
|
import Logger from "../../utils/logger";
|
|
42
42
|
import { getMessageJson } from "../../utils/util";
|
|
43
43
|
import { useMemo } from "react";
|
|
44
|
-
import { assign
|
|
44
|
+
import { assign } from "lodash-es";
|
|
45
45
|
var store;
|
|
46
46
|
var MqttStore = /** @class */ (function () {
|
|
47
47
|
function MqttStore() {
|
|
@@ -155,49 +155,15 @@ var MqttStore = /** @class */ (function () {
|
|
|
155
155
|
Logger.error(err);
|
|
156
156
|
return;
|
|
157
157
|
}
|
|
158
|
-
|
|
158
|
+
granted[0]
|
|
159
|
+
? Logger.warn("Subscribed to " + granted[0].topic + " with Qos " + granted[0].qos)
|
|
160
|
+
: Logger.warn("Subscribed to " + topic + " with Qos unknown");
|
|
159
161
|
});
|
|
160
162
|
_this.topicsSubscribed.add(topic);
|
|
163
|
+
_this.setFirstKeepalive(true);
|
|
161
164
|
}
|
|
162
165
|
}
|
|
163
166
|
});
|
|
164
|
-
Object.defineProperty(this, "unsubscribeFromTopic", {
|
|
165
|
-
enumerable: true,
|
|
166
|
-
configurable: true,
|
|
167
|
-
writable: true,
|
|
168
|
-
value: function (topic) {
|
|
169
|
-
var _a;
|
|
170
|
-
if (!topic)
|
|
171
|
-
return;
|
|
172
|
-
if (_this.topicsSubscribed.has(topic)) {
|
|
173
|
-
(_a = _this.client) === null || _a === void 0 ? void 0 : _a.unsubscribe(topic, function (err) {
|
|
174
|
-
if (err) {
|
|
175
|
-
Logger.error(err);
|
|
176
|
-
return;
|
|
177
|
-
}
|
|
178
|
-
Logger.log("Unsubscribed from " + topic);
|
|
179
|
-
});
|
|
180
|
-
_this.topicsSubscribed.delete(topic);
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
});
|
|
184
|
-
Object.defineProperty(this, "subscribeToTopics", {
|
|
185
|
-
enumerable: true,
|
|
186
|
-
configurable: true,
|
|
187
|
-
writable: true,
|
|
188
|
-
value: function (topics) {
|
|
189
|
-
topics && Object.values(topics).flat().map(function (value) { return _this.subscribeToTopic(value); });
|
|
190
|
-
}
|
|
191
|
-
});
|
|
192
|
-
Object.defineProperty(this, "unsubscribeFromTopics", {
|
|
193
|
-
enumerable: true,
|
|
194
|
-
configurable: true,
|
|
195
|
-
writable: true,
|
|
196
|
-
value: function (topics) {
|
|
197
|
-
_this.setFirstKeepalive(true);
|
|
198
|
-
topics && Object.values(topics).flat().map(function (value) { return _this.unsubscribeFromTopic(value); });
|
|
199
|
-
}
|
|
200
|
-
});
|
|
201
167
|
Object.defineProperty(this, "addMessage", {
|
|
202
168
|
enumerable: true,
|
|
203
169
|
configurable: true,
|
|
@@ -302,8 +268,8 @@ var MqttStore = /** @class */ (function () {
|
|
|
302
268
|
runInAction(function () { return _this.setError(null); });
|
|
303
269
|
runInAction(function () { return _this.setStatus(STATUS.CONNECTED); });
|
|
304
270
|
runInAction(function () { return _this.subscribeToTopic("N/" + (remote ? portalId : "+") + "/system/0/Serial"); }); // Never use wildcard when connecting remotely
|
|
305
|
-
_this.setupQueueWorker();
|
|
306
271
|
runInAction(function () { return _this.setupKeepalive(); });
|
|
272
|
+
// this.setupQueueWorker()
|
|
307
273
|
});
|
|
308
274
|
client.on("message", function (topic, message) { return __awaiter(_this, void 0, void 0, function () {
|
|
309
275
|
var portalId_1;
|
|
@@ -311,47 +277,78 @@ var MqttStore = /** @class */ (function () {
|
|
|
311
277
|
return __generator(this, function (_a) {
|
|
312
278
|
switch (_a.label) {
|
|
313
279
|
case 0:
|
|
314
|
-
Logger.log(
|
|
280
|
+
// Logger.log(`Message received: ${topic} - ${message.toString()}`)
|
|
315
281
|
if (topic.endsWith("/system/0/Serial") && !this.portalId) {
|
|
316
282
|
portalId_1 = getMessageJson(message).value;
|
|
317
283
|
if (this.portalId !== portalId_1 && portalId_1 !== undefined) {
|
|
318
284
|
this.setPortalId(portalId_1);
|
|
319
|
-
this.setFirstKeepalive(true);
|
|
320
|
-
this.sendKeepalive();
|
|
321
|
-
setTimeout(function () {
|
|
322
|
-
_this.setFirstKeepalive(true);
|
|
323
|
-
_this.sendKeepalive();
|
|
324
|
-
}, 1000);
|
|
325
285
|
}
|
|
286
|
+
runInAction(function () { return _this.subscribeToAllTopics(); });
|
|
326
287
|
}
|
|
327
|
-
if (!
|
|
328
|
-
return [4 /*yield*/, this.
|
|
288
|
+
if (!topic.endsWith("full_publish_completed")) return [3 /*break*/, 2];
|
|
289
|
+
return [4 /*yield*/, this.addMessagesFromQueue()];
|
|
329
290
|
case 1:
|
|
330
291
|
_a.sent();
|
|
292
|
+
this.setupQueueWorker();
|
|
331
293
|
_a.label = 2;
|
|
332
|
-
case 2:
|
|
294
|
+
case 2:
|
|
295
|
+
if (!(message.toString() !== "")) return [3 /*break*/, 4];
|
|
296
|
+
return [4 /*yield*/, this.addMessage(topic, getMessageJson(message))];
|
|
297
|
+
case 3:
|
|
298
|
+
_a.sent();
|
|
299
|
+
_a.label = 4;
|
|
300
|
+
case 4: return [2 /*return*/];
|
|
333
301
|
}
|
|
334
302
|
});
|
|
335
303
|
}); });
|
|
336
304
|
Logger.log("MQTT booted");
|
|
337
305
|
}
|
|
338
306
|
});
|
|
339
|
-
Object.defineProperty(this, "
|
|
307
|
+
Object.defineProperty(this, "subscribeToAllTopics", {
|
|
340
308
|
enumerable: true,
|
|
341
309
|
configurable: true,
|
|
342
310
|
writable: true,
|
|
343
|
-
value:
|
|
311
|
+
value: function () {
|
|
312
|
+
var _a;
|
|
313
|
+
var topic = "N/" + _this.portalId + "/#";
|
|
314
|
+
(_a = _this.client) === null || _a === void 0 ? void 0 : _a.subscribe(topic, function (err) {
|
|
315
|
+
if (err) {
|
|
316
|
+
Logger.error(err);
|
|
317
|
+
return;
|
|
318
|
+
}
|
|
319
|
+
// When we received all topics we send a full keepalive.
|
|
320
|
+
_this.sendFullKeepalive();
|
|
321
|
+
});
|
|
322
|
+
}
|
|
323
|
+
});
|
|
324
|
+
Object.defineProperty(this, "sendSuppressedKeepalive", {
|
|
325
|
+
enumerable: true,
|
|
326
|
+
configurable: true,
|
|
327
|
+
writable: true,
|
|
328
|
+
value: function () {
|
|
329
|
+
var _a;
|
|
330
|
+
if (_this.portalId) {
|
|
331
|
+
var options = JSON.stringify({ "keepalive-options": ["suppress-republish"] });
|
|
332
|
+
var topic = "R/" + _this.portalId + "/keepalive";
|
|
333
|
+
Logger.log("Sending keepalive for " + _this.portalId + " with " + options);
|
|
334
|
+
(_a = _this.client) === null || _a === void 0 ? void 0 : _a.publish(topic, options);
|
|
335
|
+
_this.setFirstKeepalive(false);
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
});
|
|
339
|
+
Object.defineProperty(this, "sendFullKeepalive", {
|
|
340
|
+
enumerable: true,
|
|
341
|
+
configurable: true,
|
|
342
|
+
writable: true,
|
|
343
|
+
value: function () {
|
|
344
344
|
var _a;
|
|
345
345
|
if (_this.portalId) {
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
(_a = _this.client) === null || _a === void 0 ? void 0 : _a.publish("R/" + _this.portalId + "/keepalive", _this.firstKeepalive
|
|
350
|
-
? ""
|
|
351
|
-
: JSON.stringify({ "keepalive-options": ["suppress-republish"] }));
|
|
346
|
+
var topic = "R/" + _this.portalId + "/keepalive";
|
|
347
|
+
Logger.log("Sending keepalive for " + _this.portalId + " without options");
|
|
348
|
+
_this.client && ((_a = _this.client) === null || _a === void 0 ? void 0 : _a.publish(topic, ""));
|
|
352
349
|
_this.setFirstKeepalive(false);
|
|
353
350
|
}
|
|
354
|
-
}
|
|
351
|
+
}
|
|
355
352
|
});
|
|
356
353
|
Object.defineProperty(this, "setupKeepalive", {
|
|
357
354
|
enumerable: true,
|
|
@@ -362,7 +359,7 @@ var MqttStore = /** @class */ (function () {
|
|
|
362
359
|
if (ref) {
|
|
363
360
|
clearInterval(ref);
|
|
364
361
|
}
|
|
365
|
-
_this.keepAliveHandlerRef = setInterval(_this.
|
|
362
|
+
_this.keepAliveHandlerRef = setInterval(_this.sendSuppressedKeepalive, 30000);
|
|
366
363
|
}
|
|
367
364
|
});
|
|
368
365
|
Object.defineProperty(this, "publish", {
|
|
@@ -415,17 +412,6 @@ var MqttStore = /** @class */ (function () {
|
|
|
415
412
|
enumerable: false,
|
|
416
413
|
configurable: true
|
|
417
414
|
});
|
|
418
|
-
Object.defineProperty(MqttStore.prototype, "subscribedTopicsWithoutIdentifier", {
|
|
419
|
-
get: function () {
|
|
420
|
-
if (this.portalId === undefined) {
|
|
421
|
-
return [];
|
|
422
|
-
}
|
|
423
|
-
var portalId = this.portalId;
|
|
424
|
-
return Array.from(this.topicsSubscribed).map(function (topic) { return topic.indexOf(portalId) !== -1 ? topic.substring(topic.indexOf(portalId) + portalId.length + 1) : topic; });
|
|
425
|
-
},
|
|
426
|
-
enumerable: false,
|
|
427
|
-
configurable: true
|
|
428
|
-
});
|
|
429
415
|
Object.defineProperty(MqttStore.prototype, "setStatus", {
|
|
430
416
|
enumerable: false,
|
|
431
417
|
configurable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Mqtt.store.js","sourceRoot":"","sources":["../../../../src/Modules/Mqtt/Mqtt.store.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"Mqtt.store.js","sourceRoot":"","sources":["../../../../src/Modules/Mqtt/Mqtt.store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useMqtt, useTopicsState
|
|
1
|
+
import { useMqtt, useTopicsState } from "../Mqtt";
|
|
2
2
|
import { useMemo } from "react";
|
|
3
3
|
export function usePvCharger() {
|
|
4
4
|
var getTopics = function (portalId) { return ({
|
|
@@ -7,7 +7,6 @@ export function usePvCharger() {
|
|
|
7
7
|
}); };
|
|
8
8
|
var portalId = useMqtt().portalId;
|
|
9
9
|
var topics = useMemo(function () { return getTopics(portalId); }, [portalId]);
|
|
10
|
-
useTopicSubscriptions(topics);
|
|
11
10
|
var _a = useTopicsState(topics), power = _a.power, current = _a.current;
|
|
12
11
|
return { power: power, current: current };
|
|
13
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PvCharger.provider.js","sourceRoot":"","sources":["../../../../src/Modules/PvCharger/PvCharger.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"PvCharger.provider.js","sourceRoot":"","sources":["../../../../src/Modules/PvCharger/PvCharger.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAY/B,MAAM,UAAU,YAAY;IAC1B,IAAM,SAAS,GAAG,UAAC,QAAkB,IAAK,OAAA,CAAC;QACzC,KAAK,EAAE,OAAK,QAAQ,0BAAuB;QAC3C,OAAO,EAAE,OAAK,QAAQ,4BAAyB;KAChD,CAAC,EAHwC,CAGxC,CAAA;IAEM,IAAA,QAAQ,GAAK,OAAO,EAAE,SAAd,CAAc;IAC9B,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,SAAS,CAAC,QAAQ,CAAC,EAAnB,CAAmB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEzD,IAAA,KAAqB,cAAc,CAAiB,MAAM,CAAC,EAAzD,KAAK,WAAA,EAAE,OAAO,aAA2C,CAAA;IAE/D,OAAO,EAAE,KAAK,OAAA,EAAE,OAAO,SAAA,EAAE,CAAA;AAC3B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useMemo } from "react";
|
|
2
|
-
import { useMqtt
|
|
2
|
+
import { useMqtt } from "../Mqtt";
|
|
3
3
|
import { AC_SOURCE_TYPE } from "../../utils/constants";
|
|
4
4
|
import { useShorePowerInputStore } from "./ShorePowerInput.store";
|
|
5
5
|
import { reaction } from "mobx";
|
|
@@ -13,7 +13,6 @@ export function useShorePowerInput() {
|
|
|
13
13
|
var mqtt = useMqtt();
|
|
14
14
|
var shorePowerInputStore = useShorePowerInputStore();
|
|
15
15
|
var topics = useMemo(function () { return getTopics(mqtt.portalId); }, [mqtt.portalId]);
|
|
16
|
-
useTopicSubscriptions(topics);
|
|
17
16
|
reaction(function () { return mqtt.messagesByTopics(topics); }, function (messages) {
|
|
18
17
|
var acInput1 = messages.acInput1, acInput2 = messages.acInput2;
|
|
19
18
|
var inputId = undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShorePowerInput.provider.js","sourceRoot":"","sources":["../../../../src/Modules/ShorePowerInput/ShorePowerInput.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAY,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"ShorePowerInput.provider.js","sourceRoot":"","sources":["../../../../src/Modules/ShorePowerInput/ShorePowerInput.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC/B,OAAO,EAAY,OAAO,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAwB,uBAAuB,EAAE,MAAM,yBAAyB,CAAA;AACvF,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAA;AAE/B,MAAM,UAAU,kBAAkB;IAChC,IAAM,SAAS,GAAG,UAAC,QAAkB;QACnC,OAAO;YACL,QAAQ,EAAE,OAAK,QAAQ,8CAA2C;YAClE,QAAQ,EAAE,OAAK,QAAQ,8CAA2C;SACnE,CAAA;IACH,CAAC,CAAA;IACD,IAAM,IAAI,GAAG,OAAO,EAAE,CAAA;IACtB,IAAM,oBAAoB,GAAG,uBAAuB,EAAE,CAAA;IAEtD,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAxB,CAAwB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEvE,QAAQ,CAAC,cAAM,OAAA,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAA7B,CAA6B,EAAE,UAAC,QAAQ;QAC7C,IAAA,QAAQ,GAAe,QAAQ,SAAvB,EAAE,QAAQ,GAAK,QAAQ,SAAb,CAAa;QAEvC,IAAI,OAAO,GAAG,SAAS,CAAA;QAEvB,yCAAyC;QACzC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,cAAc,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,cAAc,CAAC,IAAI,EAAE;YACzF,OAAO,GAAG,CAAC,CAAA;SACZ;aAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,cAAc,CAAC,KAAK,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,cAAc,CAAC,IAAI,EAAE;YAChG,OAAO,GAAG,CAAC,CAAA;SACZ;aAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,cAAc,CAAC,UAAU,EAAE;YACzD,OAAO,GAAG,CAAC,CAAC;SACb;aAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,cAAc,CAAC,UAAU,EAAE;YACzD,OAAO,GAAG,CAAC,CAAC;SACb;QAED,oBAAoB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC1C,CAAC,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;IAE7B,OAAO,EAAE,OAAO,EAAE,oBAAoB,CAAC,OAAO,EAAE,CAAA;AAClD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useMqtt, useTopicsState
|
|
1
|
+
import { useMqtt, useTopicsState } from "../Mqtt";
|
|
2
2
|
import { useMemo } from "react";
|
|
3
3
|
export function useSystemState() {
|
|
4
4
|
var getTopics = function (portalId) { return ({
|
|
@@ -6,7 +6,6 @@ export function useSystemState() {
|
|
|
6
6
|
}); };
|
|
7
7
|
var portalId = useMqtt().portalId;
|
|
8
8
|
var topics = useMemo(function () { return getTopics(portalId); }, [portalId]);
|
|
9
|
-
useTopicSubscriptions(topics);
|
|
10
9
|
return useTopicsState(topics);
|
|
11
10
|
}
|
|
12
11
|
//# sourceMappingURL=SystemState.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SystemState.provider.js","sourceRoot":"","sources":["../../../../src/Modules/SystemState/SystemState.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"SystemState.provider.js","sourceRoot":"","sources":["../../../../src/Modules/SystemState/SystemState.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAU/B,MAAM,UAAU,cAAc;IAC5B,IAAM,SAAS,GAAG,UAAC,QAAkB,IAAK,OAAA,CAAC;QACzC,KAAK,EAAE,OAAK,QAAQ,gCAA6B;KAClD,CAAC,EAFwC,CAExC,CAAA;IAEM,IAAA,QAAQ,GAAK,OAAO,EAAE,SAAd,CAAc;IAC9B,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,SAAS,CAAC,QAAQ,CAAC,EAAnB,CAAmB,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAE7D,OAAO,cAAc,CAAmB,MAAM,CAAC,CAAA;AACjD,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useMqtt, useTopicsState
|
|
1
|
+
import { useMqtt, useTopicsState } from "../Mqtt";
|
|
2
2
|
import { useMemo } from "react";
|
|
3
3
|
export function useTank(tankId) {
|
|
4
4
|
var getTopics = function (portalId, tankId) { return ({
|
|
@@ -11,7 +11,6 @@ export function useTank(tankId) {
|
|
|
11
11
|
}); };
|
|
12
12
|
var portalId = useMqtt().portalId;
|
|
13
13
|
var topics = useMemo(function () { return getTopics(portalId, tankId); }, [portalId, tankId]);
|
|
14
|
-
useTopicSubscriptions(topics);
|
|
15
14
|
return useTopicsState(topics);
|
|
16
15
|
}
|
|
17
16
|
//# sourceMappingURL=Tank.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tank.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Tanks/Tank.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"Tank.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Tanks/Tank.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAoB/B,MAAM,UAAU,OAAO,CAAC,MAAsB;IAC5C,IAAM,SAAS,GAAG,UAAC,QAAkB,EAAE,MAAsB,IAAK,OAAA,CAAC;QACjE,QAAQ,EAAE,OAAK,QAAQ,cAAS,MAAM,cAAW;QACjD,KAAK,EAAE,OAAK,QAAQ,cAAS,MAAM,WAAQ;QAC3C,SAAS,EAAE,OAAK,QAAQ,cAAS,MAAM,eAAY;QACnD,SAAS,EAAE,OAAK,QAAQ,cAAS,MAAM,eAAY;QACnD,IAAI,EAAE,OAAK,QAAQ,2CAAwC;QAC3D,UAAU,EAAE,OAAK,QAAQ,cAAS,MAAM,gBAAa;KACtD,CAAC,EAPgE,CAOhE,CAAA;IAEM,IAAA,QAAQ,GAAK,OAAO,EAAE,SAAd,CAAc;IAC9B,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAA3B,CAA2B,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;IAE7E,OAAO,cAAc,CAAY,MAAM,CAAC,CAAA;AAC1C,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Logger from "../../utils/logger";
|
|
2
|
-
import { useMqtt
|
|
2
|
+
import { useMqtt } from "../Mqtt";
|
|
3
3
|
import { useTanksStore } from "./Tanks.store";
|
|
4
4
|
import { useMemo, useEffect } from "react";
|
|
5
5
|
export var useTanks = function () {
|
|
@@ -9,7 +9,6 @@ export var useTanks = function () {
|
|
|
9
9
|
}); };
|
|
10
10
|
var mqtt = useMqtt();
|
|
11
11
|
var topics = useMemo(function () { return getTopics(mqtt.portalId); }, [mqtt.portalId]);
|
|
12
|
-
useTopicSubscriptions(topics);
|
|
13
12
|
var messages = mqtt.messagesByWildcard(topics.tanks);
|
|
14
13
|
useEffect(function () {
|
|
15
14
|
if (!messages || Object.entries(messages).length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tanks.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Tanks/Tanks.provider.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAY,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Tanks.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Tanks/Tanks.provider.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAY,OAAO,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAkB,aAAa,EAAE,MAAM,eAAe,CAAA;AAC7D,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAE1C,MAAM,CAAC,IAAM,QAAQ,GAAG;IACtB,IAAM,UAAU,GAAG,aAAa,EAAE,CAAA;IAElC,IAAM,SAAS,GAAG,UAAC,QAAkB,IAAK,OAAA,CAAC;QACzC,KAAK,EAAE,OAAK,QAAQ,2BAAwB;KAC7C,CAAC,EAFwC,CAExC,CAAA;IAEF,IAAM,IAAI,GAAG,OAAO,EAAE,CAAA;IACtB,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAxB,CAAwB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEvE,IAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAEtD,SAAS,CAAC;QACR,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACtD,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;SACnC;aAAM;YACL,IAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAqB,CAAA;YACnE,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;SACrC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEd,IAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAA;IAE9B,OAAO,EAAE,KAAK,OAAA,EAAE,CAAA;AAClB,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useMqtt, useTopicsState
|
|
1
|
+
import { useMqtt, useTopicsState } from "../Mqtt";
|
|
2
2
|
import { useMemo } from "react";
|
|
3
3
|
export function useTemperature(temperatureId) {
|
|
4
4
|
var getTopics = function (portalId, temperatureInstanceId) { return ({
|
|
@@ -8,7 +8,6 @@ export function useTemperature(temperatureId) {
|
|
|
8
8
|
}); };
|
|
9
9
|
var portalId = useMqtt().portalId;
|
|
10
10
|
var topics = useMemo(function () { return getTopics(portalId, temperatureId); }, [portalId, temperatureId]);
|
|
11
|
-
useTopicSubscriptions(topics);
|
|
12
11
|
return useTopicsState(topics);
|
|
13
12
|
}
|
|
14
13
|
export function useHumidity(temperatureId) {
|
|
@@ -19,7 +18,6 @@ export function useHumidity(temperatureId) {
|
|
|
19
18
|
}); };
|
|
20
19
|
var portalId = useMqtt().portalId;
|
|
21
20
|
var topics = useMemo(function () { return getTopics(portalId, temperatureId); }, [portalId, temperatureId]);
|
|
22
|
-
useTopicSubscriptions(topics);
|
|
23
21
|
return useTopicsState(topics);
|
|
24
22
|
}
|
|
25
23
|
export function usePressure(temperatureId) {
|
|
@@ -30,7 +28,6 @@ export function usePressure(temperatureId) {
|
|
|
30
28
|
}); };
|
|
31
29
|
var portalId = useMqtt().portalId;
|
|
32
30
|
var topics = useMemo(function () { return getTopics(portalId, temperatureId); }, [portalId, temperatureId]);
|
|
33
|
-
useTopicSubscriptions(topics);
|
|
34
31
|
return useTopicsState(topics);
|
|
35
32
|
}
|
|
36
33
|
//# sourceMappingURL=Temperature.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Temperature.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Temperatures/Temperature.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,cAAc,
|
|
1
|
+
{"version":3,"file":"Temperature.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Temperatures/Temperature.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,OAAO,EACP,cAAc,EACf,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAkBhC,MAAM,UAAU,cAAc,CAAC,aAAoC;IACjE,IAAM,SAAS,GAAG,UAChB,QAAkB,EAClB,qBAA4C,IACzC,OAAA,CAAC;QACJ,UAAU,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,gBAAa;QAC3E,WAAW,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,iBAAc;QAC7E,eAAe,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,qBAAkB;KACtF,CAAC,EAJG,CAIH,CAAC;IAEK,IAAA,QAAQ,GAAK,OAAO,EAAE,SAAd,CAAe;IAC/B,IAAM,MAAM,GAAG,OAAO,CACpB,cAAM,OAAA,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAlC,CAAkC,EACxC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAC1B,CAAC;IAEF,OAAO,cAAc,CAAmB,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,aAAoC;IAC9D,IAAM,SAAS,GAAG,UAChB,QAAkB,EAClB,qBAA4C,IACzC,OAAA,CAAC;QACJ,UAAU,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,gBAAa;QAC3E,QAAQ,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,cAAW;QACvE,eAAe,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,qBAAkB;KACtF,CAAC,EAJG,CAIH,CAAC;IAEK,IAAA,QAAQ,GAAK,OAAO,EAAE,SAAd,CAAe;IAC/B,IAAM,MAAM,GAAG,OAAO,CACpB,cAAM,OAAA,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAlC,CAAkC,EACxC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAC1B,CAAC;IAEF,OAAO,cAAc,CAAmB,MAAM,CAAC,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,aAAoC;IAC9D,IAAM,SAAS,GAAG,UAChB,QAAkB,EAClB,qBAA4C,IACzC,OAAA,CAAC;QACJ,UAAU,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,gBAAa;QAC3E,QAAQ,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,cAAW;QACvE,eAAe,EAAE,OAAK,QAAQ,qBAAgB,qBAAqB,qBAAkB;KACtF,CAAC,EAJG,CAIH,CAAC;IAEK,IAAA,QAAQ,GAAK,OAAO,EAAE,SAAd,CAAe;IAC/B,IAAM,MAAM,GAAG,OAAO,CACpB,cAAM,OAAA,SAAS,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAlC,CAAkC,EACxC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAC1B,CAAC;IAEF,OAAO,cAAc,CAAmB,MAAM,CAAC,CAAC;AAClD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useEffect, useMemo } from "react";
|
|
2
|
-
import { useMqtt
|
|
2
|
+
import { useMqtt } from "../Mqtt";
|
|
3
3
|
import { useTemperaturesStore, } from "./Temperatures.store";
|
|
4
4
|
import Logger from "../../utils/logger";
|
|
5
5
|
export function useTemperatures() {
|
|
@@ -9,7 +9,6 @@ export function useTemperatures() {
|
|
|
9
9
|
temperatureInstances: "N/" + portalId + "/temperature/+/DeviceInstance",
|
|
10
10
|
}); };
|
|
11
11
|
var topics = useMemo(function () { return getTopics(mqtt.portalId); }, [mqtt.portalId]);
|
|
12
|
-
useTopicSubscriptions(topics);
|
|
13
12
|
var temperatures = temperaturesStore.temperatures;
|
|
14
13
|
useEffect(function () {
|
|
15
14
|
var messages = mqtt.messagesByWildcard(topics.temperatureInstances);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Temperatures.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Temperatures/Temperatures.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAY,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Temperatures.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Temperatures/Temperatures.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAY,OAAO,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,EAEL,oBAAoB,GACrB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAExC,MAAM,UAAU,eAAe;IAC7B,IAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC;IACjD,IAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,IAAM,SAAS,GAAG,UAAC,QAAkB,IAAK,OAAA,CAAC;QACzC,oBAAoB,EAAE,OAAK,QAAQ,kCAA+B;KACnE,CAAC,EAFwC,CAExC,CAAC;IAEH,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAxB,CAAwB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAExE,IAAM,YAAY,GAAG,iBAAiB,CAAC,YAAY,CAAC;IAEpD,SAAS,CAAC;QACR,IAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QACtE,IAAI,CAAC,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACtD,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;SAC3C;aAAM;YACL,IAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CACnC,QAAQ,CACkB,CAAC;YAC7B,iBAAiB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;SACpD;IACH,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAE3D,OAAO,EAAE,YAAY,cAAA,EAAE,CAAC;AAC1B,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { useEffect, useMemo } from "react";
|
|
|
2
2
|
import { runInAction, toJS, when } from "mobx";
|
|
3
3
|
import { isEqual } from "lodash-es";
|
|
4
4
|
import Logger from "../../utils/logger";
|
|
5
|
-
import { useMqtt, useTopicsState
|
|
5
|
+
import { useMqtt, useTopicsState } from "../Mqtt";
|
|
6
6
|
import { useVebusStore, } from "./Vebus.store";
|
|
7
7
|
export var useVebus = function () {
|
|
8
8
|
var mqtt = useMqtt();
|
|
@@ -13,7 +13,6 @@ export var useVebus = function () {
|
|
|
13
13
|
}); };
|
|
14
14
|
var topics = useMemo(function () { return getTopics(portalId); }, [portalId]);
|
|
15
15
|
var messages = mqtt.messagesByWildcard(topics.deviceInstances);
|
|
16
|
-
useTopicSubscriptions(topics);
|
|
17
16
|
// Checks for old inverter paths, if not equal, set new path.
|
|
18
17
|
when(function () { return Object.entries(messages).length > 0; }, function () {
|
|
19
18
|
var deviceInstances = Object.values(messages);
|
|
@@ -29,7 +28,6 @@ export var useVebus = function () {
|
|
|
29
28
|
});
|
|
30
29
|
}
|
|
31
30
|
});
|
|
32
|
-
useTopicSubscriptions(vebusStore.possibleInvertersPaths);
|
|
33
31
|
var subsMessages = useTopicsState(vebusStore.possibleInvertersPaths);
|
|
34
32
|
// set vebus instanceId (system with multiple inputs)
|
|
35
33
|
useEffect(function () {
|
|
@@ -67,16 +65,6 @@ export var useVebus = function () {
|
|
|
67
65
|
vebusStore.setVebusInverters(vebusInverters);
|
|
68
66
|
}
|
|
69
67
|
}, [subsMessages]);
|
|
70
|
-
// Solves #337
|
|
71
|
-
useEffect(function () {
|
|
72
|
-
if (!messages || Object.entries(messages).length === 0) {
|
|
73
|
-
Logger.log("Waiting for vebus inverters...");
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
var deviceInstances = Object.values(messages);
|
|
77
|
-
vebusStore.setVebusInverters(deviceInstances);
|
|
78
|
-
}
|
|
79
|
-
}, [messages]);
|
|
80
68
|
return vebusStore;
|
|
81
69
|
};
|
|
82
70
|
//# sourceMappingURL=Vebus.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Vebus.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Vebus/Vebus.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAEL,OAAO,EACP,cAAc,
|
|
1
|
+
{"version":3,"file":"Vebus.provider.js","sourceRoot":"","sources":["../../../../src/Modules/Vebus/Vebus.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useMqtt, useTopicsState
|
|
1
|
+
import { useMqtt, useTopicsState } from "../Mqtt";
|
|
2
2
|
import { useMemo } from "react";
|
|
3
3
|
export function useWindGenerator(windGeneratorId) {
|
|
4
4
|
var getTopics = function (portalId) { return ({
|
|
@@ -8,7 +8,6 @@ export function useWindGenerator(windGeneratorId) {
|
|
|
8
8
|
}); };
|
|
9
9
|
var mqtt = useMqtt();
|
|
10
10
|
var topics = useMemo(function () { return getTopics(mqtt.portalId); }, [mqtt.portalId]);
|
|
11
|
-
useTopicSubscriptions(topics);
|
|
12
11
|
return useTopicsState(topics);
|
|
13
12
|
}
|
|
14
13
|
//# sourceMappingURL=WindGenerator.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WindGenerator.provider.js","sourceRoot":"","sources":["../../../../src/Modules/WindGenerators/WindGenerator.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"WindGenerator.provider.js","sourceRoot":"","sources":["../../../../src/Modules/WindGenerators/WindGenerator.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAQ/B,MAAM,UAAU,gBAAgB,CAAC,eAAuB;IACtD,IAAM,SAAS,GAAG,UAAC,QAAkB,IAAK,OAAA,CAAC;QACzC,OAAO,EAAE,OAAK,QAAQ,kBAAa,eAAe,kBAAe;QACjE,OAAO,EAAE,OAAK,QAAQ,kBAAa,eAAe,kBAAe;QACjE,WAAW,EAAE,OAAK,QAAQ,kBAAa,eAAe,sBAAmB;KAC1E,CAAC,EAJwC,CAIxC,CAAA;IACF,IAAM,IAAI,GAAG,OAAO,EAAE,CAAA;IAEtB,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAxB,CAAwB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEvE,OAAO,cAAc,CAAqB,MAAM,CAAC,CAAA;AACnD,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useEffect, useMemo } from "react";
|
|
2
|
-
import { useMqtt
|
|
2
|
+
import { useMqtt } from "../Mqtt";
|
|
3
3
|
import { useWindGeneratorsStore } from "./WindGenerators.store";
|
|
4
4
|
import { DC_SOURCE_MONITOR_MODE } from "../../utils/constants";
|
|
5
5
|
export var useWindGenerators = function () {
|
|
@@ -9,7 +9,6 @@ export var useWindGenerators = function () {
|
|
|
9
9
|
dcSourceMonitorModes: "N/" + portalId + "/dcsource/+/Settings/MonitorMode",
|
|
10
10
|
}); };
|
|
11
11
|
var topics = useMemo(function () { return getTopics(mqtt.portalId); }, [mqtt.portalId]);
|
|
12
|
-
useTopicSubscriptions(topics);
|
|
13
12
|
useEffect(function () {
|
|
14
13
|
var messages = mqtt.messagesByWildcard(topics.dcSourceMonitorModes);
|
|
15
14
|
if (messages && Object.entries(messages).length !== 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WindGenerators.provider.js","sourceRoot":"","sources":["../../../../src/Modules/WindGenerators/WindGenerators.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAY,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"WindGenerators.provider.js","sourceRoot":"","sources":["../../../../src/Modules/WindGenerators/WindGenerators.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAY,OAAO,EAAE,MAAM,SAAS,CAAA;AAC3C,OAAO,EAAmB,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,MAAM,CAAC,IAAM,iBAAiB,GAAG;IAC/B,IAAM,mBAAmB,GAAG,sBAAsB,EAAE,CAAA;IACpD,IAAM,IAAI,GAAG,OAAO,EAAE,CAAA;IAEtB,IAAM,SAAS,GAAG,UAAC,QAAkB,IAAK,OAAA,CAAC;QACzC,oBAAoB,EAAE,OAAK,QAAQ,qCAAkC;KACtE,CAAC,EAFwC,CAExC,CAAA;IAEF,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAxB,CAAwB,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;IAEvE,SAAS,CAAC;QACR,IAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAA;QAErE,IAAI,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACrD,IAAM,gBAAc,GAAG,mBAAmB,CAAC,cAAc,CAAA;YACzD,IAAM,iBAAe,GAAsB,EAAE,CAAA;YAE7C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAA,IAAI;;gBAChC,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,sBAAsB,CAAC,cAAc,EAAE;oBAC5D,IAAM,UAAU,GAAG,IAAI,MAAM,CAAC,6BAA6B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACvE,IAAM,QAAQ,GAAG,MAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,MAAM,0CAAE,QAAQ,mCAAI,EAAE,CAAA;oBACnD,IAAI,QAAQ,KAAK,EAAE;wBAAE,iBAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAA;iBACrD;YACH,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC,gBAAc,IAAI,CAAC,iBAAe,CAAC,KAAK,CAAC,UAAC,EAAE,IAAK,OAAA,gBAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,EAA3B,CAA2B,CAAC,EAAE;gBAClF,mBAAmB,CAAC,iBAAiB,CAAC,iBAAe,CAAC,CAAA;aACvD;SACF;IACH,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAA;IAE1D,OAAO,mBAAmB,CAAA;AAC5B,CAAC,CAAA"}
|