@victronenergy/mfd-modules 10.4.2 → 11.1.0

package/dist/src/Modules/Mqtt/Mqtt.store.js

@@ -6,10 +6,9 @@ import Logger from "../../utils/logger";
 import { getMessageJson } from "../../utils/util";
 import { useMemo } from "react";
 import { assign } from "lodash-es";
-var store;
-var MqttStore = /** @class */ (function () {
-    function MqttStore() {
-        var _this = this;
+let store;
+export class MqttStore {
+    constructor() {
         Object.defineProperty(this, "client", {
             enumerable: true,
             configurable: true,
@@ -103,10 +102,10 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: computedFn(function (topic) {
+            value: computedFn((topic) => {
                 // Logger.log(`DEBUG: messageFromTopic: ${JSON.stringify(topic)}`)
                 // trace()
-                return topic ? _this.messages[topic] : undefined;
+                return topic ? this.messages[topic] : undefined;
             }, { name: "Mqtt.store.messageFromTopic", equals: comparer.identity })
         });
         /**
@@ -132,23 +131,22 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: computedFn(function (topics) {
+            value: computedFn((topics) => {
                 // Logger.log(`DEBUG: messagesByTopics: ${JSON.stringify(topics)}`)
                 // trace()
                 if (!topics) {
                     return {};
                 }
-                var result = {};
-                Object.entries(topics).forEach(function (_a) {
-                    var label = _a[0], topic = _a[1];
+                const result = {};
+                Object.entries(topics).forEach(([label, topic]) => {
                     if (Array.isArray(topic)) {
-                        result[label] = topic.map(function (t) { return _this.messageFromTopic(t); });
+                        result[label] = topic.map((t) => this.messageFromTopic(t));
                     }
                     else if (topic === undefined) {
                         result[label] = undefined;
                     }
                     else {
-                        result[label] = _this.messageFromTopic(topic);
+                        result[label] = this.messageFromTopic(topic);
                     }
                 });
                 return result;
@@ -176,47 +174,47 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: computedFn(function (wildcard) {
+            value: computedFn((wildcard) => {
                 // Logger.log(`DEBUG: messagesByWildcard: ${JSON.stringify(wildcard)}`)
                 // trace()
                 if (wildcard === undefined || wildcard === "" || wildcard === null)
                     return {};
-                var topicRegex = new RegExp(wildcard.replace(/\+/g, "\\w*")); // + in mqtt is anything -> .*
-                return Object.fromEntries(Object.keys(_this.messages)
-                    .filter(function (topic) { return topic.match(topicRegex); })
-                    .map(function (topic) { return [topic, _this.messages[topic]]; })
+                const topicRegex = new RegExp(wildcard.replace(/\+/g, "\\w*")); // + in mqtt is anything -> .*
+                return Object.fromEntries(Object.keys(this.messages)
+                    .filter((topic) => topic.match(topicRegex))
+                    .map((topic) => [topic, this.messages[topic]])
                     // Filter out empty results
-                    .filter(function (_a) {
-                    var _ = _a[0], message = _a[1];
-                    return message !== undefined &&
-                        message !== null &&
-                        (!Array.isArray(message) ||
-                            (message.length !== 0 && !message.every(function (v) { return v === undefined || v === null; })));
-                }));
+                    .filter(([_key, message]) => message !== undefined &&
+                    message !== null &&
+                    (!Array.isArray(message) ||
+                        (message.length !== 0 && !message.every((v) => v === undefined || v === null)))));
             }, { name: "Mqtt.store.messagesByWildcard", equals: comparer.identity })
         });
         Object.defineProperty(this, "subscribeToTopic", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function (topic) {
+            value: (topic) => {
                 var _a;
                 if (!topic)
                     return;
                 if (topic.includes("undefined"))
                     return;
-                if (!_this.topicsSubscribed.has(topic)) {
-                    Logger.log("Subscribing to ".concat(topic));
-                    (_a = _this.client) === null || _a === void 0 ? void 0 : _a.subscribe(topic, function (err, granted) {
+                if (!this.topicsSubscribed.has(topic)) {
+                    Logger.log(`Subscribing to ${topic}`);
+                    (_a = this.client) === null || _a === void 0 ? void 0 : _a.subscribe(topic, (err, granted) => {
                         if (err) {
                             Logger.error(err);
                             return;
                         }
-                        granted !== undefined && granted[0]
-                            ? Logger.log("Subscribed to ".concat(granted[0].topic, " with Qos ").concat(granted[0].qos))
-                            : Logger.log("Subscribed to ".concat(topic, " with Qos unknown"));
+                        if (granted !== undefined && granted[0]) {
+                            Logger.log(`Subscribed to ${granted[0].topic} with Qos ${granted[0].qos}`);
+                        }
+                        else {
+                            Logger.log(`Subscribed to ${topic} with Qos unknown`);
+                        }
                     });
-                    _this.topicsSubscribed.add(topic);
+                    this.topicsSubscribed.add(topic);
                 }
             }
         });
@@ -224,17 +222,16 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function (topic, message) {
-                var _a, _b;
+            value: (topic, message) => {
                 // Logger.log(`DEBUG: addMessage: topic: ${topic}, urgentPrefixes: ${JSON.stringify(this.urgentTopicPrefixes)}`)
-                if (_this.urgentTopicPrefixes.some(function (prefix) { return topic.startsWith(prefix); })) {
+                if (this.urgentTopicPrefixes.some((prefix) => topic.startsWith(prefix))) {
                     // NOTE: If topic starts with one of the urgent prefixes, deliver it immediately
-                    _this.messages[topic] = (_a = message.value) !== null && _a !== void 0 ? _a : undefined;
+                    this.messages[topic] = message.value;
                 }
                 else {
                     // NOTE: Otherwise store message to the queue, and move messages from the queue
                     // NOTE: to the React components that are MobX observers periodically and in batches
-                    _this.messageQueue[topic] = (_b = message.value) !== null && _b !== void 0 ? _b : undefined;
+                    this.messageQueue[topic] = message.value;
                 }
             }
         });
@@ -242,12 +239,12 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () {
-                if (Object.values(_this.messageQueue).length > 0) {
+            value: () => {
+                if (Object.values(this.messageQueue).length > 0) {
                     // Logger.log(`DEBUG: addMessagesFromQueue: in queue: ${JSON.stringify(Object.values(this.messageQueue).length)}`)
-                    assign(_this.messages, _this.messageQueue);
+                    assign(this.messages, this.messageQueue);
                     // Logger.log(`DEBUG: addMessagesFromQueue: to process: ${JSON.stringify(Object.values(this.messages).length)}`)
-                    _this.messageQueue = {};
+                    this.messageQueue = {};
                 }
             }
         });
@@ -255,16 +252,16 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function (timeout) {
-                _this.queueWorker = setTimeout(function () {
-                    var started = performance.now();
-                    _this.addMessagesFromQueue();
-                    var ended = performance.now();
-                    _this.meanQueueWorkerPassDuration = addToMean(_this.meanQueueWorkerPassDuration, 10, ended - started);
+            value: (timeout) => {
+                this.queueWorker = setTimeout(() => {
+                    const started = performance.now();
+                    this.addMessagesFromQueue();
+                    const ended = performance.now();
+                    this.meanQueueWorkerPassDuration = addToMean(this.meanQueueWorkerPassDuration, 10, ended - started);
                     // Schedule next update after 1 - 3 seconds
                     // depending on how fast we were able to process the incoming messages
-                    var newTimeout = Math.max(1000, Math.min(_this.meanQueueWorkerPassDuration * 50, 3000));
-                    _this.scheduleNextQueueWorkerPass(newTimeout);
+                    const newTimeout = Math.max(1000, Math.min(this.meanQueueWorkerPassDuration * 50, 3000));
+                    this.scheduleNextQueueWorkerPass(newTimeout);
                 }, timeout);
             }
         });
@@ -272,120 +269,121 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () {
-                _this.removeQueueWorker();
-                _this.meanQueueWorkerPassDuration = 20; // ms
-                _this.scheduleNextQueueWorkerPass(1000); // ms
+            value: () => {
+                this.removeQueueWorker();
+                this.meanQueueWorkerPassDuration = 20; // ms
+                this.scheduleNextQueueWorkerPass(1000); // ms
             }
         });
         Object.defineProperty(this, "removeQueueWorker", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () {
-                if (_this.queueWorker) {
-                    clearInterval(_this.queueWorker);
+            value: () => {
+                if (this.queueWorker) {
+                    clearTimeout(this.queueWorker);
                 }
-                _this.queueWorker = undefined;
+                this.queueWorker = undefined;
             }
         });
         Object.defineProperty(this, "setPortalId", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function (portalId) {
-                _this.portalId = portalId;
-                _this.urgentTopicPrefixes = ["N/".concat(portalId, "/switch/"), "N/".concat(portalId, "/system/0/SwitchableOutput")];
+            value: (portalId) => {
+                this.portalId = portalId;
+                this.urgentTopicPrefixes = [
+                    `N/${portalId}/switch/`,
+                    `N/${portalId}/system/0/SwitchableOutput`,
+                    `N/${portalId}/system/0/GenericInput`,
+                ];
             }
         });
         Object.defineProperty(this, "boot", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function (protocol, host, port, path, remote, portalId) {
-                if (host === void 0) { host = "localhost"; }
-                if (path === void 0) { path = "websocket-mqtt"; }
-                if (remote === void 0) { remote = false; }
+            value: (protocol, host = "localhost", port, path = "websocket-mqtt", remote = false, portalId) => {
                 Logger.log("MQTT booting");
-                var client = _this.client;
+                let client = this.client;
                 if (client) {
                     client.end(true);
-                    _this.client = undefined;
-                    _this.portalId = undefined;
-                    _this.topicsSubscribed = new Set();
-                    _this.urgentTopicPrefixes = [];
+                    this.client = undefined;
+                    this.portalId = undefined;
+                    this.topicsSubscribed = new Set();
+                    this.urgentTopicPrefixes = [];
                 }
-                var url;
+                let url;
                 if (remote) {
                     if (!host) {
                         return;
                     }
                     // remote connection to VRM broker always uses MQTTS over 443
-                    url = "mqtts://".concat(host, ":443");
+                    url = `mqtts://${host}:443`;
                 }
                 else {
                     // local connection derives websocket protocol from web app protocol
-                    var wsproto = protocol === "https:" ? "wss:" : "ws:";
+                    const wsproto = protocol === "https:" ? "wss:" : "ws:";
                     if (port) {
-                        url = "".concat(wsproto, "//").concat(host, ":").concat(port, "/").concat(path);
+                        url = `${wsproto}//${host}:${port}/${path}`;
                     }
                     else {
-                        url = "".concat(wsproto, "//").concat(host, "/").concat(path);
+                        url = `${wsproto}//${host}/${path}`;
                     }
                 }
-                Logger.log("MQTT connecting to ".concat(url));
+                Logger.log(`MQTT connecting to ${url}`);
                 client = mqtt.connect(url, { resubscribe: false });
-                _this.client = client;
-                _this.portalId = portalId;
-                client.on("error", function (error) {
+                this.client = client;
+                this.portalId = portalId;
+                client.on("error", (error) => {
                     Logger.log("MQTT error");
-                    runInAction(function () {
-                        _this.setError(error);
-                        _this.setStatus(STATUS.DISCONNECTED);
+                    runInAction(() => {
+                        this.setError(error);
+                        this.setStatus(STATUS.DISCONNECTED);
                     });
-                    _this.removeQueueWorker();
-                    _this.clearKeepaliveTimer();
-                    _this.clearSubscribedTopics();
+                    this.removeQueueWorker();
+                    this.clearKeepaliveTimer();
+                    this.clearSubscribedTopics();
                 });
-                client.on("offline", function () {
+                client.on("offline", () => {
                     Logger.log("MQTT offline");
-                    runInAction(function () {
-                        _this.setError(true);
-                        _this.setStatus(STATUS.OFFLINE);
+                    runInAction(() => {
+                        this.setError(true);
+                        this.setStatus(STATUS.OFFLINE);
                     });
-                    _this.removeQueueWorker();
-                    _this.clearKeepaliveTimer();
-                    _this.clearSubscribedTopics();
+                    this.removeQueueWorker();
+                    this.clearKeepaliveTimer();
+                    this.clearSubscribedTopics();
                 });
-                client.on("connect", function () {
+                client.on("connect", () => {
                     Logger.log("MQTT connected");
-                    runInAction(function () {
-                        _this.setError(null);
-                        _this.setStatus(STATUS.CONNECTED);
+                    runInAction(() => {
+                        this.setError(null);
+                        this.setStatus(STATUS.CONNECTED);
                         // Never use wildcard when connecting remotely
-                        _this.subscribeToTopic("N/".concat(remote ? portalId : "+", "/system/0/Serial"));
-                        _this.setupKeepaliveTimer();
+                        this.subscribeToTopic(`N/${remote ? portalId : "+"}/system/0/Serial`);
+                        this.setupKeepaliveTimer();
                     });
                 });
-                client.on("message", function (topic, message) {
+                client.on("message", (topic, message) => {
                     // Logger.log(`DEBUG: Message received: ${topic} - ${message.toString()}`)
-                    if (topic.endsWith("/system/0/Serial") && !_this.portalId) {
-                        var portalId_1 = getMessageJson(message).value;
-                        if (_this.portalId !== portalId_1 && portalId_1 !== undefined) {
-                            _this.setPortalId(portalId_1);
+                    if (topic.endsWith("/system/0/Serial") && !this.portalId) {
+                        const portalId = getMessageJson(message).value;
+                        if (this.portalId !== portalId && portalId !== undefined) {
+                            this.setPortalId(portalId);
                         }
-                        runInAction(function () { return _this.subscribeToAllTopics(); });
+                        runInAction(() => this.subscribeToAllTopics());
                     }
                     if (topic.endsWith("full_publish_completed")) {
-                        var uniqueId = getMessageJson(message)["full-publish-completed-echo"] || "";
-                        Logger.log("Received full_publish_completed for ".concat(_this.portalId, " with full-publish-completed-echo: '").concat(uniqueId, "'"));
-                        if (uniqueId === _this.uniqueId) {
-                            _this.addMessagesFromQueue();
-                            _this.setupQueueWorker();
+                        const uniqueId = getMessageJson(message)["full-publish-completed-echo"] || "";
+                        Logger.log(`Received full_publish_completed for ${this.portalId} with full-publish-completed-echo: '${uniqueId}'`);
+                        if (uniqueId === this.uniqueId) {
+                            this.addMessagesFromQueue();
+                            this.setupQueueWorker();
                         }
                     }
                     if (message.toString() !== "") {
-                        _this.addMessage(topic, getMessageJson(message));
+                        this.addMessage(topic, getMessageJson(message));
                     }
                 });
                 Logger.log("MQTT booted");
@@ -395,32 +393,32 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () {
+            value: () => {
                 var _a;
-                var topics = [
-                    "N/".concat(_this.portalId, "/settings/#"),
-                    "N/".concat(_this.portalId, "/system/#"),
-                    "N/".concat(_this.portalId, "/vebus/#"),
-                    "N/".concat(_this.portalId, "/alternator/#"),
-                    "N/".concat(_this.portalId, "/battery/#"),
-                    "N/".concat(_this.portalId, "/charger/#"),
-                    "N/".concat(_this.portalId, "/dcsource/#"),
-                    "N/".concat(_this.portalId, "/generator/#"),
-                    "N/".concat(_this.portalId, "/genset/#"),
-                    "N/".concat(_this.portalId, "/dcgenset/#"),
-                    "N/".concat(_this.portalId, "/inverter/#"),
-                    "N/".concat(_this.portalId, "/tank/#"),
-                    "N/".concat(_this.portalId, "/temperature/#"),
-                    "N/".concat(_this.portalId, "/switch/#"),
-                    "N/".concat(_this.portalId, "/full_publish_completed"),
+                const topics = [
+                    `N/${this.portalId}/settings/#`,
+                    `N/${this.portalId}/system/#`,
+                    `N/${this.portalId}/vebus/#`,
+                    `N/${this.portalId}/alternator/#`,
+                    `N/${this.portalId}/battery/#`,
+                    `N/${this.portalId}/charger/#`,
+                    `N/${this.portalId}/dcsource/#`,
+                    `N/${this.portalId}/generator/#`,
+                    `N/${this.portalId}/genset/#`,
+                    `N/${this.portalId}/dcgenset/#`,
+                    `N/${this.portalId}/inverter/#`,
+                    `N/${this.portalId}/tank/#`,
+                    `N/${this.portalId}/temperature/#`,
+                    `N/${this.portalId}/switch/#`,
+                    `N/${this.portalId}/full_publish_completed`,
                 ];
-                (_a = _this.client) === null || _a === void 0 ? void 0 : _a.subscribe(topics, function (err) {
+                (_a = this.client) === null || _a === void 0 ? void 0 : _a.subscribe(topics, (err) => {
                     if (err) {
                         Logger.error(err);
                         return;
                     }
                     // When we received all topics we send a full keepalive.
-                    _this.sendFullKeepalive();
+                    this.sendFullKeepalive();
                 });
             }
         });
@@ -428,13 +426,13 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () {
+            value: () => {
                 var _a;
-                if (_this.portalId) {
-                    var options = JSON.stringify({ "keepalive-options": ["suppress-republish"] });
-                    var topic = "R/".concat(_this.portalId, "/keepalive");
-                    Logger.log("Sending keepalive for ".concat(_this.portalId, " with ").concat(options));
-                    (_a = _this.client) === null || _a === void 0 ? void 0 : _a.publish(topic, options);
+                if (this.portalId) {
+                    const options = JSON.stringify({ "keepalive-options": ["suppress-republish"] });
+                    const topic = `R/${this.portalId}/keepalive`;
+                    Logger.log(`Sending keepalive for ${this.portalId} with ${options}`);
+                    (_a = this.client) === null || _a === void 0 ? void 0 : _a.publish(topic, options);
                 }
             }
         });
@@ -442,13 +440,12 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () {
+            value: () => {
                 var _a;
-                if (_this.portalId) {
-                    var topic = "R/".concat(_this.portalId, "/keepalive");
-                    Logger.log("Sending first keepalive for ".concat(_this.portalId, " with full-publish-completed-echo: '").concat(_this.uniqueId, "'"));
-                    _this.client &&
-                        ((_a = _this.client) === null || _a === void 0 ? void 0 : _a.publish(topic, "{ \"keepalive-options\" : [ {\"full-publish-completed-echo\": \"".concat(_this.uniqueId, "\" } ] }")));
+                if (this.portalId) {
+                    const topic = `R/${this.portalId}/keepalive`;
+                    Logger.log(`Sending first keepalive for ${this.portalId} with full-publish-completed-echo: '${this.uniqueId}'`);
+                    (_a = this.client) === null || _a === void 0 ? void 0 : _a.publish(topic, `{ "keepalive-options" : [ {"full-publish-completed-echo": "${this.uniqueId}" } ] }`);
                 }
             }
         });
@@ -456,36 +453,37 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () {
-                _this.clearKeepaliveTimer();
-                _this.keepAliveHandlerRef = setInterval(_this.sendSuppressedKeepalive, 30000);
-                _this.sendFullKeepalive();
+            value: () => {
+                this.clearKeepaliveTimer();
+                this.keepAliveHandlerRef = setInterval(this.sendSuppressedKeepalive, 30000);
+                this.sendFullKeepalive();
             }
         });
         Object.defineProperty(this, "clearKeepaliveTimer", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () {
-                var ref = _this.keepAliveHandlerRef;
+            value: () => {
+                const ref = this.keepAliveHandlerRef;
                 if (ref) {
                     clearInterval(ref);
                 }
-                _this.keepAliveHandlerRef = undefined;
+                this.keepAliveHandlerRef = undefined;
             }
         });
         Object.defineProperty(this, "publish", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function (topic, data, options) {
+            value: (topic, data, options) => {
                 var _a;
-                if (_this.status !== STATUS.CONNECTED || !_this.client) {
+                if (this.status !== STATUS.CONNECTED || !this.client) {
                     Logger.log("Could not publish value, not connected to MQTT broker");
+                    return;
                 }
-                var message = typeof data === "object" && data !== null && "raw" in data ? data.raw : JSON.stringify({ value: data });
-                Logger.log("Publishing to ".concat(topic, ": ").concat(message));
-                (_a = _this.client) === null || _a === void 0 ? void 0 : _a.publish(topic, message, options !== null && options !== void 0 ? options : {});
+                const message = typeof data === "object" && data !== null && "raw" in data ? data.raw : JSON.stringify({ value: data });
+                Logger.log(`Publishing to ${topic}: ${message}`);
+                (_a = this.client) === null || _a === void 0 ? void 0 : _a.publish(topic, message, options !== null && options !== void 0 ? options : {});
             }
         });
         makeAutoObservable(this, {
@@ -503,45 +501,23 @@ var MqttStore = /** @class */ (function () {
             clearSubscribedTopics: false,
         });
     }
-    Object.defineProperty(MqttStore.prototype, "isConnected", {
-        get: function () {
-            return this.status === STATUS.CONNECTED;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(MqttStore.prototype, "clearSubscribedTopics", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function () {
-            var _this = this;
-            this.topicsSubscribed.clear();
-            this.urgentTopicPrefixes = [];
-            runInAction(function () {
-                _this.portalId = undefined;
-            });
-        }
-    });
-    Object.defineProperty(MqttStore.prototype, "setStatus", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (status) {
-            this.status = status;
-        }
-    });
-    Object.defineProperty(MqttStore.prototype, "setError", {
-        enumerable: false,
-        configurable: true,
-        writable: true,
-        value: function (error) {
-            this.error = error;
-        }
-    });
-    return MqttStore;
-}());
-export { MqttStore };
+    get isConnected() {
+        return this.status === STATUS.CONNECTED;
+    }
+    clearSubscribedTopics() {
+        this.topicsSubscribed.clear();
+        this.urgentTopicPrefixes = [];
+        runInAction(() => {
+            this.portalId = undefined;
+        });
+    }
+    setStatus(status) {
+        this.status = status;
+    }
+    setError(error) {
+        this.error = error;
+    }
+}
 /**
  * Compute mean by providing existing mean, number of samples, and new sample.
  *
@@ -557,7 +533,7 @@ function addToMean(mean, n, newValue) {
     return mean + (newValue - mean) / (n + 1);
 }
 function initializeStore() {
-    var _store = store !== null && store !== void 0 ? store : new MqttStore();
+    const _store = store !== null && store !== void 0 ? store : new MqttStore();
     // For SSG and SSR always create a new store
     if (typeof window === "undefined")
         return _store;
@@ -567,6 +543,6 @@ function initializeStore() {
     return _store;
 }
 export function useMqtt() {
-    return useMemo(function () { return initializeStore(); }, []);
+    return useMemo(() => initializeStore(), []);
 }
 //# sourceMappingURL=Mqtt.store.js.map