@victronenergy/mfd-modules 9.3.0 → 9.5.0

package/dist/src/Modules/Mqtt/Mqtt.store.d.ts

@@ -12,10 +12,65 @@ export declare class MqttStore {
     keepAliveHandlerRef: any;
     queueWorker: any;
     meanQueueWorkerPassDuration: number;
+    urgentTopicPrefixes: string[];
+    /**
+      * Returns the current cached message for a given MQTT topic.
+      *
+      * React Components using this method will re-render when their specific
+      * topic's message changes.
+      *
+      * Using comparer.identity will trigger the re-renders any time
+      * a message arrives for the given topic. We rely on the fact
+      * that MQTT will only re-send a message when the value changes,
+      * or on a full keep alive.
+      *
+      * Note: Receiving the same message for a given topic will cause re-renders,
+      * as we do not check structural identity of the message.
+      *
+      * @param topic - The MQTT topic to retrieve the message for
+      * @returns The message object for the topic, or undefined if topic is not provided or not found
+      */
     messageFromTopic: (topic?: string) => MqttMessage;
+    /**
+      * Returns the current cached messages for a given set of MQTT topics.
+      *
+      * This is a memoized computed function - each set of topics has its own cached value.
+      *
+      * React Components using this method will re-render when
+      * any of the messages for specified topics change.
+      *
+      * Using comparer.identity will trigger the re-renders any time
+      * a message arrives for any of the specified topics. We rely on the fact
+      * that MQTT will only re-send a message when the value changes,
+      * or on a full keep alive.
+
+      * Note: Receiving the same message for a given topic will cause re-renders,
+      * as we do not check structural identity of the message.
+      *
+      * @param topics - The MQTT topics to retrieve the messages for
+      * @returns The messages objects for the given topics, or empty dictionary if topics not found
+      */
     messagesByTopics: (topics?: Topics) => {
         [key: string]: MqttMessage | MqttMessage[];
     };
+    /**
+      * Returns the current cached messages for MQTT topics specified via regex.
+      *
+      * React Components using this method will re-render when
+      * values of any of the matched topics change. The components also re-render
+      * when new MQTT topics are received and match needs to be checked.
+      *
+      * Using comparer.identity will trigger the re-renders any time
+      * a message arrives for any of the matched topics. We rely on the fact
+      * that MQTT will only re-send a message when the value changes,
+      * or on a full keep alive.
+      *
+      * Note: Receiving the same message for a given topic will cause re-renders,
+      * as we do not check structural identity of the message.
+      *
+      * @param wildcard - The MQTT wildcard to retrieve the message for
+      * @returns The messages objects for the given topics, or empty dictionary if topics not found
+      */
     messagesByWildcard: (wildcard?: string) => any;
     constructor();
     get isConnected(): boolean;
@@ -23,8 +78,8 @@ export declare class MqttStore {
     clearSubscribedTopics(): void;
     addMessage: (topic: string, message: {
         value: string | null;
-    }) => Promise<void>;
-    addMessagesFromQueue: () => Promise<void>;
+    }) => void;
+    addMessagesFromQueue: () => void;
     scheduleNextQueueWorkerPass: (timeout: number) => void;
     setupQueueWorker: () => void;
     removeQueueWorker: () => void;

package/dist/src/Modules/Mqtt/Mqtt.store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Mqtt.store.d.ts","sourceRoot":"/","sources":["src/Modules/Mqtt/Mqtt.store.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,qBAAqB,EAAE,UAAU,EAAC,MAAM,MAAM,CAAA;AACtD,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAU,MAAM,EAAC,MAAM,SAAS,CAAA;AAQ3E,qBAAa,SAAS;IAClB,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAoB;IAClC,QAAQ,EAAE,YAAY,CAAK;IAC3B,YAAY,EAAE,YAAY,CAAK;IAC/B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAoB;IACjD,QAAQ,EAAE,QAAQ,CAAA;IAClB,QAAQ,EAAE,MAAM,CAA0C;IAC1D,mBAAmB,EAAE,GAAG,CAAA;IACxB,WAAW,EAAE,GAAG,CAAA;IAChB,2BAA2B,EAAE,MAAM,CAAI;IAMvC,gBAAgB,WAAuB,MAAM,iBAIyB;IAMtE,gBAAgB,YAAwB,MAAM;;MAoBwB;IAYtE,kBAAkB,cAA0B,MAAM,SAiBsB;;IAkBxE,IAAI,WAAW,YAEd;IAED,gBAAgB,GAAI,QAAQ,MAAM,UAmBjC;IAED,qBAAqB;IAKrB,UAAU,GAAU,OAAO,MAAM,EAAE,SAAS;QAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,mBAEnE;IAED,oBAAoB,sBAOnB;IAED,2BAA2B,GAAI,SAAS,MAAM,UAW7C;IAED,gBAAgB,aAKf;IAED,iBAAiB,aAKhB;IAED,WAAW,GAAI,UAAU,MAAM,UAE9B;IAED,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO;IAIvC,IAAI,GACA,UAAU,MAAM,EAChB,MAAM,MAAM,YAAc,EAC1B,MAAM,MAAM,GAAG,IAAI,EACnB,OAAM,MAAyB,EAC/B,SAAQ,OAAe,EACvB,WAAW,MAAM,UAgGpB;IAED,oBAAoB,aA4BnB;IAED,uBAAuB,aAStB;IAED,iBAAiB,aAQhB;IAED,mBAAmB,aAMlB;IAED,mBAAmB,aAMlB;IAED,OAAO,GAAI,OAAO,MAAM,EAAE,MAAM,MAAM,GAAG,MAAM,EAAE,UAAU,qBAAqB,UAS/E;CACJ;AA2BD,wBAAgB,OAAO,cAEtB"}
+{"version":3,"file":"Mqtt.store.d.ts","sourceRoot":"/","sources":["src/Modules/Mqtt/Mqtt.store.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,qBAAqB,EAAE,UAAU,EAAC,MAAM,MAAM,CAAA;AACtD,OAAO,EAAC,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAU,MAAM,EAAC,MAAM,SAAS,CAAA;AAQ3E,qBAAa,SAAS;IAClB,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAA;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAA;IAC/B,MAAM,EAAE,MAAM,CAAoB;IAClC,QAAQ,EAAE,YAAY,CAAK;IAC3B,YAAY,EAAE,YAAY,CAAK;IAC/B,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAoB;IACjD,QAAQ,EAAE,QAAQ,CAAA;IAClB,QAAQ,EAAE,MAAM,CAA0C;IAC1D,mBAAmB,EAAE,GAAG,CAAA;IACxB,WAAW,EAAE,GAAG,CAAA;IAChB,2BAA2B,EAAE,MAAM,CAAI;IACvC,mBAAmB,EAAE,MAAM,EAAE,CAAK;IAElC;;;;;;;;;;;;;;;;QAgBI;IACJ,gBAAgB,WAAuB,MAAM,iBAIyB;IAEtE;;;;;;;;;;;;;;;;;;QAkBI;IACJ,gBAAgB,YAAwB,MAAM;;MAoBwB;IAEtE;;;;;;;;;;;;;;;;;QAiBI;IACJ,kBAAkB,cAA0B,MAAM,SAiBsB;;IAmBxE,IAAI,WAAW,YAEd;IAED,gBAAgB,GAAI,QAAQ,MAAM,UAmBjC;IAED,qBAAqB;IAMrB,UAAU,GAAI,OAAO,MAAM,EAAE,SAAS;QAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,UAW7D;IAED,oBAAoB,aAOnB;IAED,2BAA2B,GAAI,SAAS,MAAM,UAW7C;IAED,gBAAgB,aAKf;IAED,iBAAiB,aAKhB;IAED,WAAW,GAAI,UAAU,MAAM,UAK9B;IAED,SAAS,CAAC,MAAM,EAAE,MAAM;IAIxB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO;IAIvC,IAAI,GACA,UAAU,MAAM,EAChB,MAAM,MAAM,YAAc,EAC1B,MAAM,MAAM,GAAG,IAAI,EACnB,OAAM,MAAyB,EAC/B,SAAQ,OAAe,EACvB,WAAW,MAAM,UAkGpB;IAED,oBAAoB,aA4BnB;IAED,uBAAuB,aAStB;IAED,iBAAiB,aAQhB;IAED,mBAAmB,aAMlB;IAED,mBAAmB,aAMlB;IAED,OAAO,GAAI,OAAO,MAAM,EAAE,MAAM,MAAM,GAAG,MAAM,EAAE,UAAU,qBAAqB,UAS/E;CACJ;AA2BD,wBAAgB,OAAO,cAEtB"}

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

@@ -1,39 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 import { comparer, makeAutoObservable, runInAction } from "mobx";
 import { computedFn } from "mobx-utils";
 import * as mqtt from "mqtt";
@@ -112,10 +76,29 @@ var MqttStore = /** @class */ (function () {
             writable: true,
             value: 0
         });
-        // Use comparer.identity to check the message we get for given topic.
-        // Will cause re-render when new message for given topic arrives.
-        // We rely on the fact that MQTT will only re-send a message when it
-        // changes, and on full keep alive only.
+        Object.defineProperty(this, "urgentTopicPrefixes", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        /**
+          * Returns the current cached message for a given MQTT topic.
+          *
+          * React Components using this method will re-render when their specific
+          * topic's message changes.
+          *
+          * Using comparer.identity will trigger the re-renders any time
+          * a message arrives for the given topic. We rely on the fact
+          * that MQTT will only re-send a message when the value changes,
+          * or on a full keep alive.
+          *
+          * Note: Receiving the same message for a given topic will cause re-renders,
+          * as we do not check structural identity of the message.
+          *
+          * @param topic - The MQTT topic to retrieve the message for
+          * @returns The message object for the topic, or undefined if topic is not provided or not found
+          */
         Object.defineProperty(this, "messageFromTopic", {
             enumerable: true,
             configurable: true,
@@ -126,10 +109,25 @@ var MqttStore = /** @class */ (function () {
                 return topic ? _this.messages[topic] : undefined;
             }, { name: "Mqtt.store.messageFromTopic", equals: comparer.identity })
         });
-        // Use comparer.identity to check the messages we get for given topics.
-        // Will cause re-render when any new message for one of the topics arrives.
-        // We rely on the fact that MQTT will only re-send a message when it
-        // changes, and on full keep alive only.
+        /**
+          * Returns the current cached messages for a given set of MQTT topics.
+          *
+          * This is a memoized computed function - each set of topics has its own cached value.
+          *
+          * React Components using this method will re-render when
+          * any of the messages for specified topics change.
+          *
+          * Using comparer.identity will trigger the re-renders any time
+          * a message arrives for any of the specified topics. We rely on the fact
+          * that MQTT will only re-send a message when the value changes,
+          * or on a full keep alive.
+    
+          * Note: Receiving the same message for a given topic will cause re-renders,
+          * as we do not check structural identity of the message.
+          *
+          * @param topics - The MQTT topics to retrieve the messages for
+          * @returns The messages objects for the given topics, or empty dictionary if topics not found
+          */
         Object.defineProperty(this, "messagesByTopics", {
             enumerable: true,
             configurable: true,
@@ -156,16 +154,24 @@ var MqttStore = /** @class */ (function () {
                 return result;
             }, { name: "Mqtt.store.messagesByTopics", equals: comparer.identity })
         });
-        // Use comparer.identity to check the messages we get for given topics.
-        // Will cause re-render when any new message for one of the topic arrives,
-        // or when we receive a new (yet unseen) topic.
-        // We rely on the fact that MQTT will only re-send a message when it
-        // changes, and on full keep alive
-        // Only access Object.keys(this.messages),
-        // and this.messages[k], where k matches the wildcard regex,
-        // to make sure we invalidate:
-        // - when new topics arrive
-        // - when message with matching topic changes
+        /**
+          * Returns the current cached messages for MQTT topics specified via regex.
+          *
+          * React Components using this method will re-render when
+          * values of any of the matched topics change. The components also re-render
+          * when new MQTT topics are received and match needs to be checked.
+          *
+          * Using comparer.identity will trigger the re-renders any time
+          * a message arrives for any of the matched topics. We rely on the fact
+          * that MQTT will only re-send a message when the value changes,
+          * or on a full keep alive.
+          *
+          * Note: Receiving the same message for a given topic will cause re-renders,
+          * as we do not check structural identity of the message.
+          *
+          * @param wildcard - The MQTT wildcard to retrieve the message for
+          * @returns The messages objects for the given topics, or empty dictionary if topics not found
+          */
         Object.defineProperty(this, "messagesByWildcard", {
             enumerable: true,
             configurable: true,
@@ -216,52 +222,49 @@ var MqttStore = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function (topic, message) { return __awaiter(_this, void 0, void 0, function () {
-                var _a;
-                return __generator(this, function (_b) {
-                    this.messageQueue[topic] = (_a = message.value) !== null && _a !== void 0 ? _a : undefined;
-                    return [2 /*return*/];
-                });
-            }); }
+            value: function (topic, message) {
+                var _a, _b;
+                // Logger.log(`DEBUG: addMessage: topic: ${topic}, urgentPrefixes: ${JSON.stringify(this.urgentTopicPrefixes)}`)
+                if (_this.urgentTopicPrefixes.some(function (prefix) { return topic.startsWith(prefix); })) {
+                    Logger.log("DEBUG: addMessage: topic: ".concat(topic));
+                    // 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;
+                }
+                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;
+                }
+            }
         });
         Object.defineProperty(this, "addMessagesFromQueue", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: function () { return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    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);
-                        // Logger.log(`DEBUG: addMessagesFromQueue: to process: ${JSON.stringify(Object.values(this.messages).length)}`)
-                        this.messageQueue = {};
-                    }
-                    return [2 /*return*/];
-                });
-            }); }
+            value: function () {
+                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);
+                    // Logger.log(`DEBUG: addMessagesFromQueue: to process: ${JSON.stringify(Object.values(this.messages).length)}`)
+                    _this.messageQueue = {};
+                }
+            }
         });
         Object.defineProperty(this, "scheduleNextQueueWorkerPass", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: function (timeout) {
-                _this.queueWorker = setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
-                    var started, ended, newTimeout;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                started = performance.now();
-                                return [4 /*yield*/, this.addMessagesFromQueue()];
-                            case 1:
-                                _a.sent();
-                                ended = performance.now();
-                                this.meanQueueWorkerPassDuration = addToMean(this.meanQueueWorkerPassDuration, 10, ended - started);
-                                newTimeout = Math.max(1000, Math.min(this.meanQueueWorkerPassDuration * 50, 3000));
-                                this.scheduleNextQueueWorkerPass(newTimeout);
-                                return [2 /*return*/];
-                        }
-                    });
-                }); }, timeout);
+                _this.queueWorker = setTimeout(function () {
+                    var started = performance.now();
+                    _this.addMessagesFromQueue();
+                    var 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);
+                }, timeout);
             }
         });
         Object.defineProperty(this, "setupQueueWorker", {
@@ -291,6 +294,9 @@ var MqttStore = /** @class */ (function () {
             writable: true,
             value: function (portalId) {
                 _this.portalId = portalId;
+                _this.urgentTopicPrefixes = [
+                    "N/".concat(portalId, "/switch/"),
+                ];
             }
         });
         Object.defineProperty(this, "boot", {
@@ -308,6 +314,7 @@ var MqttStore = /** @class */ (function () {
                     _this.client = undefined;
                     _this.portalId = undefined;
                     _this.topicsSubscribed = new Set();
+                    _this.urgentTopicPrefixes = [];
                 }
                 var url;
                 if (remote) {
@@ -361,39 +368,27 @@ var MqttStore = /** @class */ (function () {
                         _this.setupKeepaliveTimer();
                     });
                 });
-                client.on("message", function (topic, message) { return __awaiter(_this, void 0, void 0, function () {
-                    var portalId_1, uniqueId;
-                    var _this = this;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0:
-                                // Logger.log(`DEBUG: Message received: ${topic} - ${message.toString()}`)
-                                if (topic.endsWith("/system/0/Serial") && !this.portalId) {
-                                    portalId_1 = getMessageJson(message).value;
-                                    if (this.portalId !== portalId_1 && portalId_1 !== undefined) {
-                                        this.setPortalId(portalId_1);
-                                    }
-                                    runInAction(function () { return _this.subscribeToAllTopics(); });
-                                }
-                                if (!topic.endsWith("full_publish_completed")) return [3 /*break*/, 2];
-                                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)) return [3 /*break*/, 2];
-                                return [4 /*yield*/, this.addMessagesFromQueue()];
-                            case 1:
-                                _a.sent();
-                                this.setupQueueWorker();
-                                _a.label = 2;
-                            case 2:
-                                if (!(message.toString() !== "")) return [3 /*break*/, 4];
-                                return [4 /*yield*/, this.addMessage(topic, getMessageJson(message))];
-                            case 3:
-                                _a.sent();
-                                _a.label = 4;
-                            case 4: return [2 /*return*/];
+                client.on("message", function (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);
                         }
-                    });
-                }); });
+                        runInAction(function () { return _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();
+                        }
+                    }
+                    if (message.toString() !== "") {
+                        _this.addMessage(topic, getMessageJson(message));
+                    }
+                });
                 Logger.log("MQTT booted");
             }
         });
@@ -495,6 +490,7 @@ var MqttStore = /** @class */ (function () {
         });
         makeAutoObservable(this, {
             messageQueue: false,
+            urgentTopicPrefixes: false,
             setupKeepaliveTimer: false,
             clearKeepaliveTimer: false,
             sendFullKeepalive: false,
@@ -521,6 +517,7 @@ var MqttStore = /** @class */ (function () {
         value: function () {
             this.topicsSubscribed.clear();
             this.portalId = undefined;
+            this.urgentTopicPrefixes = [];
         }
     });
     Object.defineProperty(MqttStore.prototype, "setStatus", {

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

@@ -1 +1 @@
-{"version":3,"file":"Mqtt.store.js","sourceRoot":"/","sources":["src/Modules/Mqtt/Mqtt.store.ts"],"names":[],"mappings":"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","sourcesContent":["import {comparer, makeAutoObservable, runInAction} from \"mobx\"\nimport {computedFn} from \"mobx-utils\"\nimport * as mqtt from \"mqtt\"\nimport {IClientPublishOptions, MqttClient} from \"mqtt\"\nimport {MqttMessage, MqttMessages, PortalId, STATUS, Topics} from \"../Mqtt\"\nimport Logger from \"../../utils/logger\"\nimport {getMessageJson} from \"../../utils/util\"\nimport {useMemo} from \"react\"\nimport {assign} from \"lodash-es\"\n\nlet store: MqttStore\n\nexport class MqttStore {\n    client?: MqttClient | null\n    error?: object | null | boolean\n    status: string = STATUS.CONNECTING\n    messages: MqttMessages = {}\n    messageQueue: MqttMessages = {}\n    topicsSubscribed: Set<string> = new Set<string>()\n    portalId: PortalId\n    uniqueId: string = Math.random().toString(16).substr(2, 8)\n    keepAliveHandlerRef: any\n    queueWorker: any\n    meanQueueWorkerPassDuration: number = 0\n\n    // Use comparer.identity to check the message we get for given topic.\n    // Will cause re-render when new message for given topic arrives.\n    // We rely on the fact that MQTT will only re-send a message when it\n    // changes, and on full keep alive only.\n    messageFromTopic = computedFn((topic?: string) => {\n        // Logger.log(`DEBUG: messageFromTopic: ${JSON.stringify(topic)}`)\n        // trace()\n        return topic ? this.messages[topic] : undefined\n    }, { name: \"Mqtt.store.messageFromTopic\", equals: comparer.identity })\n\n    // Use comparer.identity to check the messages we get for given topics.\n    // Will cause re-render when any new message for one of the topics arrives.\n    // We rely on the fact that MQTT will only re-send a message when it\n    // changes, and on full keep alive only.\n    messagesByTopics = computedFn((topics?: Topics) => {\n        // Logger.log(`DEBUG: messagesByTopics: ${JSON.stringify(topics)}`)\n        // trace()\n        if (!topics) {\n            return {}\n        }\n\n        const result: { [key: string]: MqttMessage | MqttMessage[] } = {}\n\n        Object.entries(topics).forEach(([label, topic]) => {\n            if (Array.isArray(topic)) {\n                result[label] = topic.map((t) => this.messageFromTopic(t))\n            } else if (topic === undefined) {\n                result[label] = undefined\n            } else {\n                result[label] = this.messageFromTopic(topic)\n            }\n        })\n\n        return result\n    }, { name: \"Mqtt.store.messagesByTopics\", equals: comparer.identity })\n\n    // Use comparer.identity to check the messages we get for given topics.\n    // Will cause re-render when any new message for one of the topic arrives,\n    // or when we receive a new (yet unseen) topic.\n    // We rely on the fact that MQTT will only re-send a message when it\n    // changes, and on full keep alive\n    // Only access Object.keys(this.messages),\n    // and this.messages[k], where k matches the wildcard regex,\n    // to make sure we invalidate:\n    // - when new topics arrive\n    // - when message with matching topic changes\n    messagesByWildcard = computedFn((wildcard?: string) => {\n        // Logger.log(`DEBUG: messagesByWildcard: ${JSON.stringify(wildcard)}`)\n        // trace()\n        if (wildcard === undefined || wildcard === \"\" || wildcard === null) return {}\n\n        const topicRegex = new RegExp(wildcard.replace(/\\+/g, \"\\\\w*\")) // + in mqtt is anything -> .*\n\n        return Object.fromEntries(\n            Object.keys(this.messages)\n                .filter((topic) => topic.match(topicRegex))\n                .map((topic) => [topic, this.messages[topic]])\n                // Filter out empty results\n                .filter(([_, message]) =>\n                    message !== undefined && message !== null\n                    && (!Array.isArray(message) || (message.length !== 0 && !message.every((v) => v === undefined || v === null)))\n            ),\n        )\n    }, { name: \"Mqtt.store.messagesByWildcard\", equals: comparer.identity })\n\n    constructor() {\n        makeAutoObservable(this, {\n            messageQueue: false,\n            setupKeepaliveTimer: false,\n            clearKeepaliveTimer: false,\n            sendFullKeepalive: false,\n            sendSuppressedKeepalive: false,\n            setupQueueWorker: false,\n            removeQueueWorker: false,\n            scheduleNextQueueWorkerPass: false,\n            subscribeToTopic: false,\n            subscribeToAllTopics: false,\n            clearSubscribedTopics: false,\n        })\n    }\n\n    get isConnected() {\n        return this.status === STATUS.CONNECTED\n    }\n\n    subscribeToTopic = (topic?: string) => {\n        if (!topic) return\n        if (topic.includes(\"undefined\")) return\n\n        if (!this.topicsSubscribed.has(topic)) {\n            Logger.log(`Subscribing to ${topic}`)\n            this.client?.subscribe(topic, (err, granted) => {\n                if (err) {\n                    Logger.error(err)\n                    return\n                }\n\n                (granted !== undefined && granted[0])\n                    ? Logger.log(`Subscribed to ${granted[0].topic} with Qos ${granted[0].qos}`)\n                    : Logger.log(`Subscribed to ${topic} with Qos unknown`);\n            })\n\n            this.topicsSubscribed.add(topic)\n        }\n    }\n\n    clearSubscribedTopics() {\n      this.topicsSubscribed.clear()\n      this.portalId = undefined\n    }\n\n    addMessage = async (topic: string, message: { value: string | null }) => {\n        this.messageQueue[topic] = message.value ?? undefined\n    }\n\n    addMessagesFromQueue = async () => {\n        if (Object.values(this.messageQueue).length > 0) {\n            // Logger.log(`DEBUG: addMessagesFromQueue: in queue: ${JSON.stringify(Object.values(this.messageQueue).length)}`)\n            assign(this.messages, this.messageQueue)\n            // Logger.log(`DEBUG: addMessagesFromQueue: to process: ${JSON.stringify(Object.values(this.messages).length)}`)\n            this.messageQueue = {}\n        }\n    }\n\n    scheduleNextQueueWorkerPass = (timeout: number) => {\n        this.queueWorker = setTimeout(async () => {\n            const started = performance.now()\n            await this.addMessagesFromQueue()\n            const ended = performance.now()\n            this.meanQueueWorkerPassDuration = addToMean(this.meanQueueWorkerPassDuration, 10, ended - started)\n            // Schedule next update after 1 - 3 seconds\n            // depending on how fast we were able to process the incoming messages\n            const newTimeout = Math.max(1000, Math.min(this.meanQueueWorkerPassDuration * 50, 3000))\n            this.scheduleNextQueueWorkerPass(newTimeout)\n        }, timeout)\n    }\n\n    setupQueueWorker = () => {\n        this.removeQueueWorker()\n\n        this.meanQueueWorkerPassDuration = 20 // ms\n        this.scheduleNextQueueWorkerPass(1000) // ms\n    }\n\n    removeQueueWorker = () => {\n        if (this.queueWorker) {\n            clearInterval(this.queueWorker)\n        }\n        this.queueWorker = undefined\n    }\n\n    setPortalId = (portalId: string) => {\n        this.portalId = portalId\n    }\n\n    setStatus(status: string) {\n        this.status = status\n    }\n\n    setError(error: object | null | boolean) {\n        this.error = error\n    }\n\n    boot = (\n        protocol: string,\n        host: string = \"localhost\",\n        port: number | null,\n        path: string = \"websocket-mqtt\",\n        remote: boolean = false,\n        portalId?: string,\n    ) => {\n        Logger.log(\"MQTT booting\")\n\n        let client = this.client\n\n        if (client) {\n            client.end(true)\n            this.client = undefined\n            this.portalId = undefined\n            this.topicsSubscribed = new Set<string>()\n        }\n\n        let url\n        if (remote) {\n            if (!host) {\n                return\n            }\n            // remote connection to VRM broker always uses MQTTS over 443\n            url = `mqtts://${host}:443`\n        } else {\n          // local connection derives websocket protocol from web app protocol\n          const wsproto = protocol === \"https:\" ? \"wss:\" : \"ws:\"\n          if (port) {\n            url = `${wsproto}//${host}:${port}/${path}`\n          } else {\n            url = `${wsproto}//${host}/${path}`\n          }\n        }\n\n        Logger.log(`MQTT connecting to ${url}`)\n        client = mqtt.connect(url, { resubscribe: false })\n\n        this.client = client\n        this.portalId = portalId\n\n        client.on(\"error\", (error) => {\n            Logger.log(\"MQTT error\")\n            runInAction(() => {\n              this.setError(error)\n              this.setStatus(STATUS.DISCONNECTED)\n            })\n            this.removeQueueWorker()\n            this.clearKeepaliveTimer()\n            this.clearSubscribedTopics()\n        })\n\n        client.on(\"offline\", () => {\n            Logger.log(\"MQTT offline\")\n            runInAction(() => {\n              this.setError(true)\n              this.setStatus(STATUS.OFFLINE)\n            })\n            this.removeQueueWorker()\n            this.clearKeepaliveTimer()\n            this.clearSubscribedTopics()\n        })\n\n        client.on(\"connect\", () => {\n            Logger.log(\"MQTT connected\")\n            runInAction(() => {\n               this.setError(null)\n               this.setStatus(STATUS.CONNECTED)\n               // Never use wildcard when connecting remotely\n               this.subscribeToTopic(`N/${remote ? portalId : \"+\"}/system/0/Serial`)\n               this.setupKeepaliveTimer()\n            })\n        })\n\n        client.on(\"message\", async (topic, message) => {\n            // Logger.log(`DEBUG: Message received: ${topic} - ${message.toString()}`)\n\n            if (topic.endsWith(\"/system/0/Serial\") && !this.portalId) {\n                const portalId = getMessageJson(message).value\n\n                if (this.portalId !== portalId && portalId !== undefined) {\n                    this.setPortalId(portalId)\n                }\n\n                runInAction(() => this.subscribeToAllTopics())\n            }\n            if (topic.endsWith(\"full_publish_completed\")) {\n                const uniqueId = getMessageJson(message)[\"full-publish-completed-echo\"] || \"\"\n                Logger.log(`Received full_publish_completed for ${this.portalId} with full-publish-completed-echo: '${uniqueId}'`)\n                if (uniqueId === this.uniqueId) {\n                  await this.addMessagesFromQueue()\n                  this.setupQueueWorker()\n                }\n            }\n\n            if (message.toString() !== \"\") {\n                await this.addMessage(topic, getMessageJson(message))\n            }\n        })\n\n        Logger.log(\"MQTT booted\")\n    }\n\n    subscribeToAllTopics = () => {\n        const topics = [\n            `N/${this.portalId}/settings/#`,\n            `N/${this.portalId}/system/#`,\n            `N/${this.portalId}/vebus/#`,\n            `N/${this.portalId}/alternator/#`,\n            `N/${this.portalId}/battery/#`,\n            `N/${this.portalId}/charger/#`,\n            `N/${this.portalId}/dcsource/#`,\n            `N/${this.portalId}/generator/#`,\n            `N/${this.portalId}/genset/#`,\n            `N/${this.portalId}/dcgenset/#`,\n            `N/${this.portalId}/inverter/#`,\n            `N/${this.portalId}/tank/#`,\n            `N/${this.portalId}/temperature/#`,\n            `N/${this.portalId}/switch/#`,\n            `N/${this.portalId}/full_publish_completed`\n        ]\n\n        this.client?.subscribe(topics, err => {\n            if (err) {\n                Logger.error(err)\n                return\n            }\n\n            // When we received all topics we send a full keepalive.\n            this.sendFullKeepalive()\n        })\n    }\n\n    sendSuppressedKeepalive = () => {\n        if (this.portalId) {\n\n            const options = JSON.stringify({\"keepalive-options\": [\"suppress-republish\"]})\n            const topic = `R/${this.portalId}/keepalive`\n\n            Logger.log(`Sending keepalive for ${this.portalId} with ${options}`)\n            this.client?.publish(topic, options)\n        }\n    }\n\n    sendFullKeepalive = () => {\n        if (this.portalId) {\n\n            const topic = `R/${this.portalId}/keepalive`\n\n            Logger.log(`Sending first keepalive for ${this.portalId} with full-publish-completed-echo: '${this.uniqueId}'`)\n            this.client && this.client?.publish(topic, `{ \"keepalive-options\" : [ {\"full-publish-completed-echo\": \"${this.uniqueId}\" } ] }`)\n        }\n    }\n\n    setupKeepaliveTimer = () => {\n        this.clearKeepaliveTimer()\n\n        this.keepAliveHandlerRef = setInterval(this.sendSuppressedKeepalive, 30000)\n\n        this.sendFullKeepalive()\n    }\n\n    clearKeepaliveTimer = () => {\n        const ref = this.keepAliveHandlerRef\n        if (ref) {\n            clearInterval(ref)\n        }\n        this.keepAliveHandlerRef = undefined\n    }\n\n    publish = (topic: string, data: string | number, options?: IClientPublishOptions) => {\n        if (this.status !== STATUS.CONNECTED || !this.client) {\n            Logger.log(\"Could not publish value, not connected to MQTT broker\")\n        }\n        const message = JSON.stringify({value: data})\n\n        Logger.log(`Publishing to ${topic}: ${message}`)\n\n        this.client?.publish(topic, message, options ?? {})\n    }\n}\n\n/**\n * Compute mean by providing existing mean, number of samples, and new sample.\n *\n * @param {number} mean current mean\n * @param {number} n number of sampled values\n * @param {number} newValue the sample\n * @returns {number} the new mean\n *\n * @example\n * addToMean(14, 5, 53); // => 20.5\n */\nfunction addToMean(mean: number, n: number, newValue: number): number {\n  return mean + (newValue - mean) / (n + 1);\n}\n\nfunction initializeStore() {\n    const _store = store ?? new MqttStore()\n    // For SSG and SSR always create a new store\n    if (typeof window === \"undefined\") return _store\n    // Create the store once in the client\n    if (!store) store = _store\n\n    return _store\n}\n\nexport function useMqtt() {\n    return useMemo(() => initializeStore(), [])\n}"]}
+{"version":3,"file":"Mqtt.store.js","sourceRoot":"/","sources":["src/Modules/Mqtt/Mqtt.store.ts"],"names":[],"mappings":"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","sourcesContent":["import {comparer, makeAutoObservable, runInAction} from \"mobx\"\nimport {computedFn} from \"mobx-utils\"\nimport * as mqtt from \"mqtt\"\nimport {IClientPublishOptions, MqttClient} from \"mqtt\"\nimport {MqttMessage, MqttMessages, PortalId, STATUS, Topics} from \"../Mqtt\"\nimport Logger from \"../../utils/logger\"\nimport {getMessageJson} from \"../../utils/util\"\nimport {useMemo} from \"react\"\nimport {assign} from \"lodash-es\"\n\nlet store: MqttStore\n\nexport class MqttStore {\n    client?: MqttClient | null\n    error?: object | null | boolean\n    status: string = STATUS.CONNECTING\n    messages: MqttMessages = {}\n    messageQueue: MqttMessages = {}\n    topicsSubscribed: Set<string> = new Set<string>()\n    portalId: PortalId\n    uniqueId: string = Math.random().toString(16).substr(2, 8)\n    keepAliveHandlerRef: any\n    queueWorker: any\n    meanQueueWorkerPassDuration: number = 0\n    urgentTopicPrefixes: string[] = []\n\n    /**\n      * Returns the current cached message for a given MQTT topic.\n      *\n      * React Components using this method will re-render when their specific\n      * topic's message changes.\n      *\n      * Using comparer.identity will trigger the re-renders any time\n      * a message arrives for the given topic. We rely on the fact\n      * that MQTT will only re-send a message when the value changes,\n      * or on a full keep alive.\n      *\n      * Note: Receiving the same message for a given topic will cause re-renders,\n      * as we do not check structural identity of the message.\n      *\n      * @param topic - The MQTT topic to retrieve the message for\n      * @returns The message object for the topic, or undefined if topic is not provided or not found\n      */\n    messageFromTopic = computedFn((topic?: string) => {\n        // Logger.log(`DEBUG: messageFromTopic: ${JSON.stringify(topic)}`)\n        // trace()\n        return topic ? this.messages[topic] : undefined\n    }, { name: \"Mqtt.store.messageFromTopic\", equals: comparer.identity })\n\n    /**\n      * Returns the current cached messages for a given set of MQTT topics.\n      *\n      * This is a memoized computed function - each set of topics has its own cached value.\n      *\n      * React Components using this method will re-render when\n      * any of the messages for specified topics change.\n      *\n      * Using comparer.identity will trigger the re-renders any time\n      * a message arrives for any of the specified topics. We rely on the fact\n      * that MQTT will only re-send a message when the value changes,\n      * or on a full keep alive.\n\n      * Note: Receiving the same message for a given topic will cause re-renders,\n      * as we do not check structural identity of the message.\n      *\n      * @param topics - The MQTT topics to retrieve the messages for\n      * @returns The messages objects for the given topics, or empty dictionary if topics not found\n      */\n    messagesByTopics = computedFn((topics?: Topics) => {\n        // Logger.log(`DEBUG: messagesByTopics: ${JSON.stringify(topics)}`)\n        // trace()\n        if (!topics) {\n            return {}\n        }\n\n        const result: { [key: string]: MqttMessage | MqttMessage[] } = {}\n\n        Object.entries(topics).forEach(([label, topic]) => {\n            if (Array.isArray(topic)) {\n                result[label] = topic.map((t) => this.messageFromTopic(t))\n            } else if (topic === undefined) {\n                result[label] = undefined\n            } else {\n                result[label] = this.messageFromTopic(topic)\n            }\n        })\n\n        return result\n    }, { name: \"Mqtt.store.messagesByTopics\", equals: comparer.identity })\n\n    /**\n      * Returns the current cached messages for MQTT topics specified via regex.\n      *\n      * React Components using this method will re-render when\n      * values of any of the matched topics change. The components also re-render\n      * when new MQTT topics are received and match needs to be checked.\n      *\n      * Using comparer.identity will trigger the re-renders any time\n      * a message arrives for any of the matched topics. We rely on the fact\n      * that MQTT will only re-send a message when the value changes,\n      * or on a full keep alive.\n      *\n      * Note: Receiving the same message for a given topic will cause re-renders,\n      * as we do not check structural identity of the message.\n      *\n      * @param wildcard - The MQTT wildcard to retrieve the message for\n      * @returns The messages objects for the given topics, or empty dictionary if topics not found\n      */\n    messagesByWildcard = computedFn((wildcard?: string) => {\n        // Logger.log(`DEBUG: messagesByWildcard: ${JSON.stringify(wildcard)}`)\n        // trace()\n        if (wildcard === undefined || wildcard === \"\" || wildcard === null) return {}\n\n        const topicRegex = new RegExp(wildcard.replace(/\\+/g, \"\\\\w*\")) // + in mqtt is anything -> .*\n\n        return Object.fromEntries(\n            Object.keys(this.messages)\n                .filter((topic) => topic.match(topicRegex))\n                .map((topic) => [topic, this.messages[topic]])\n                // Filter out empty results\n                .filter(([_, message]) =>\n                    message !== undefined && message !== null\n                    && (!Array.isArray(message) || (message.length !== 0 && !message.every((v) => v === undefined || v === null)))\n            ),\n        )\n    }, { name: \"Mqtt.store.messagesByWildcard\", equals: comparer.identity })\n\n    constructor() {\n        makeAutoObservable(this, {\n            messageQueue: false,\n            urgentTopicPrefixes: false,\n            setupKeepaliveTimer: false,\n            clearKeepaliveTimer: false,\n            sendFullKeepalive: false,\n            sendSuppressedKeepalive: false,\n            setupQueueWorker: false,\n            removeQueueWorker: false,\n            scheduleNextQueueWorkerPass: false,\n            subscribeToTopic: false,\n            subscribeToAllTopics: false,\n            clearSubscribedTopics: false,\n        })\n    }\n\n    get isConnected() {\n        return this.status === STATUS.CONNECTED\n    }\n\n    subscribeToTopic = (topic?: string) => {\n        if (!topic) return\n        if (topic.includes(\"undefined\")) return\n\n        if (!this.topicsSubscribed.has(topic)) {\n            Logger.log(`Subscribing to ${topic}`)\n            this.client?.subscribe(topic, (err, granted) => {\n                if (err) {\n                    Logger.error(err)\n                    return\n                }\n\n                (granted !== undefined && granted[0])\n                    ? Logger.log(`Subscribed to ${granted[0].topic} with Qos ${granted[0].qos}`)\n                    : Logger.log(`Subscribed to ${topic} with Qos unknown`);\n            })\n\n            this.topicsSubscribed.add(topic)\n        }\n    }\n\n    clearSubscribedTopics() {\n      this.topicsSubscribed.clear()\n      this.portalId = undefined\n      this.urgentTopicPrefixes = []\n    }\n\n    addMessage = (topic: string, message: { value: string | null }) => {\n        // Logger.log(`DEBUG: addMessage: topic: ${topic}, urgentPrefixes: ${JSON.stringify(this.urgentTopicPrefixes)}`)\n        if (this.urgentTopicPrefixes.some((prefix) => topic.startsWith(prefix))) {\n          Logger.log(`DEBUG: addMessage: topic: ${topic}`)\n          // NOTE: If topic starts with one of the urgent prefixes, deliver it immediately\n          this.messages[topic] = message.value ?? undefined\n        } else {\n          // NOTE: Otherwise store message to the queue, and move messages from the queue\n          // NOTE: to the React components that are MobX observers periodically and in batches\n          this.messageQueue[topic] = message.value ?? undefined\n        }\n    }\n\n    addMessagesFromQueue = () => {\n        if (Object.values(this.messageQueue).length > 0) {\n            // Logger.log(`DEBUG: addMessagesFromQueue: in queue: ${JSON.stringify(Object.values(this.messageQueue).length)}`)\n            assign(this.messages, this.messageQueue)\n            // Logger.log(`DEBUG: addMessagesFromQueue: to process: ${JSON.stringify(Object.values(this.messages).length)}`)\n            this.messageQueue = {}\n        }\n    }\n\n    scheduleNextQueueWorkerPass = (timeout: number) => {\n        this.queueWorker = setTimeout(() => {\n            const started = performance.now()\n            this.addMessagesFromQueue()\n            const ended = performance.now()\n            this.meanQueueWorkerPassDuration = addToMean(this.meanQueueWorkerPassDuration, 10, ended - started)\n            // Schedule next update after 1 - 3 seconds\n            // depending on how fast we were able to process the incoming messages\n            const newTimeout = Math.max(1000, Math.min(this.meanQueueWorkerPassDuration * 50, 3000))\n            this.scheduleNextQueueWorkerPass(newTimeout)\n        }, timeout)\n    }\n\n    setupQueueWorker = () => {\n        this.removeQueueWorker()\n\n        this.meanQueueWorkerPassDuration = 20 // ms\n        this.scheduleNextQueueWorkerPass(1000) // ms\n    }\n\n    removeQueueWorker = () => {\n        if (this.queueWorker) {\n            clearInterval(this.queueWorker)\n        }\n        this.queueWorker = undefined\n    }\n\n    setPortalId = (portalId: string) => {\n        this.portalId = portalId\n        this.urgentTopicPrefixes = [\n            `N/${portalId}/switch/`,\n        ]\n    }\n\n    setStatus(status: string) {\n        this.status = status\n    }\n\n    setError(error: object | null | boolean) {\n        this.error = error\n    }\n\n    boot = (\n        protocol: string,\n        host: string = \"localhost\",\n        port: number | null,\n        path: string = \"websocket-mqtt\",\n        remote: boolean = false,\n        portalId?: string,\n    ) => {\n        Logger.log(\"MQTT booting\")\n\n        let client = this.client\n\n        if (client) {\n            client.end(true)\n            this.client = undefined\n            this.portalId = undefined\n            this.topicsSubscribed = new Set<string>()\n            this.urgentTopicPrefixes = []\n        }\n\n        let url\n        if (remote) {\n            if (!host) {\n                return\n            }\n            // remote connection to VRM broker always uses MQTTS over 443\n            url = `mqtts://${host}:443`\n        } else {\n          // local connection derives websocket protocol from web app protocol\n          const wsproto = protocol === \"https:\" ? \"wss:\" : \"ws:\"\n          if (port) {\n            url = `${wsproto}//${host}:${port}/${path}`\n          } else {\n            url = `${wsproto}//${host}/${path}`\n          }\n        }\n\n        Logger.log(`MQTT connecting to ${url}`)\n        client = mqtt.connect(url, { resubscribe: false })\n\n        this.client = client\n        this.portalId = portalId\n\n        client.on(\"error\", (error) => {\n            Logger.log(\"MQTT error\")\n            runInAction(() => {\n              this.setError(error)\n              this.setStatus(STATUS.DISCONNECTED)\n            })\n            this.removeQueueWorker()\n            this.clearKeepaliveTimer()\n            this.clearSubscribedTopics()\n        })\n\n        client.on(\"offline\", () => {\n            Logger.log(\"MQTT offline\")\n            runInAction(() => {\n              this.setError(true)\n              this.setStatus(STATUS.OFFLINE)\n            })\n            this.removeQueueWorker()\n            this.clearKeepaliveTimer()\n            this.clearSubscribedTopics()\n        })\n\n        client.on(\"connect\", () => {\n            Logger.log(\"MQTT connected\")\n            runInAction(() => {\n               this.setError(null)\n               this.setStatus(STATUS.CONNECTED)\n               // Never use wildcard when connecting remotely\n               this.subscribeToTopic(`N/${remote ? portalId : \"+\"}/system/0/Serial`)\n               this.setupKeepaliveTimer()\n            })\n        })\n\n        client.on(\"message\",\n             (topic, message) => {\n            // Logger.log(`DEBUG: Message received: ${topic} - ${message.toString()}`)\n\n            if (topic.endsWith(\"/system/0/Serial\") && !this.portalId) {\n                const portalId = getMessageJson(message).value\n\n                if (this.portalId !== portalId && portalId !== undefined) {\n                    this.setPortalId(portalId)\n                }\n\n                runInAction(() => this.subscribeToAllTopics())\n            }\n            if (topic.endsWith(\"full_publish_completed\")) {\n                const uniqueId = getMessageJson(message)[\"full-publish-completed-echo\"] || \"\"\n                Logger.log(`Received full_publish_completed for ${this.portalId} with full-publish-completed-echo: '${uniqueId}'`)\n                if (uniqueId === this.uniqueId) {\n                  this.addMessagesFromQueue()\n                  this.setupQueueWorker()\n                }\n            }\n\n            if (message.toString() !== \"\") {\n                this.addMessage(topic, getMessageJson(message))\n            }\n        })\n\n        Logger.log(\"MQTT booted\")\n    }\n\n    subscribeToAllTopics = () => {\n        const topics = [\n            `N/${this.portalId}/settings/#`,\n            `N/${this.portalId}/system/#`,\n            `N/${this.portalId}/vebus/#`,\n            `N/${this.portalId}/alternator/#`,\n            `N/${this.portalId}/battery/#`,\n            `N/${this.portalId}/charger/#`,\n            `N/${this.portalId}/dcsource/#`,\n            `N/${this.portalId}/generator/#`,\n            `N/${this.portalId}/genset/#`,\n            `N/${this.portalId}/dcgenset/#`,\n            `N/${this.portalId}/inverter/#`,\n            `N/${this.portalId}/tank/#`,\n            `N/${this.portalId}/temperature/#`,\n            `N/${this.portalId}/switch/#`,\n            `N/${this.portalId}/full_publish_completed`\n        ]\n\n        this.client?.subscribe(topics, err => {\n            if (err) {\n                Logger.error(err)\n                return\n            }\n\n            // When we received all topics we send a full keepalive.\n            this.sendFullKeepalive()\n        })\n    }\n\n    sendSuppressedKeepalive = () => {\n        if (this.portalId) {\n\n            const options = JSON.stringify({\"keepalive-options\": [\"suppress-republish\"]})\n            const topic = `R/${this.portalId}/keepalive`\n\n            Logger.log(`Sending keepalive for ${this.portalId} with ${options}`)\n            this.client?.publish(topic, options)\n        }\n    }\n\n    sendFullKeepalive = () => {\n        if (this.portalId) {\n\n            const topic = `R/${this.portalId}/keepalive`\n\n            Logger.log(`Sending first keepalive for ${this.portalId} with full-publish-completed-echo: '${this.uniqueId}'`)\n            this.client && this.client?.publish(topic, `{ \"keepalive-options\" : [ {\"full-publish-completed-echo\": \"${this.uniqueId}\" } ] }`)\n        }\n    }\n\n    setupKeepaliveTimer = () => {\n        this.clearKeepaliveTimer()\n\n        this.keepAliveHandlerRef = setInterval(this.sendSuppressedKeepalive, 30000)\n\n        this.sendFullKeepalive()\n    }\n\n    clearKeepaliveTimer = () => {\n        const ref = this.keepAliveHandlerRef\n        if (ref) {\n            clearInterval(ref)\n        }\n        this.keepAliveHandlerRef = undefined\n    }\n\n    publish = (topic: string, data: string | number, options?: IClientPublishOptions) => {\n        if (this.status !== STATUS.CONNECTED || !this.client) {\n            Logger.log(\"Could not publish value, not connected to MQTT broker\")\n        }\n        const message = JSON.stringify({value: data})\n\n        Logger.log(`Publishing to ${topic}: ${message}`)\n\n        this.client?.publish(topic, message, options ?? {})\n    }\n}\n\n/**\n * Compute mean by providing existing mean, number of samples, and new sample.\n *\n * @param {number} mean current mean\n * @param {number} n number of sampled values\n * @param {number} newValue the sample\n * @returns {number} the new mean\n *\n * @example\n * addToMean(14, 5, 53); // => 20.5\n */\nfunction addToMean(mean: number, n: number, newValue: number): number {\n  return mean + (newValue - mean) / (n + 1);\n}\n\nfunction initializeStore() {\n    const _store = store ?? new MqttStore()\n    // For SSG and SSR always create a new store\n    if (typeof window === \"undefined\") return _store\n    // Create the store once in the client\n    if (!store) store = _store\n\n    return _store\n}\n\nexport function useMqtt() {\n    return useMemo(() => initializeStore(), [])\n}"]}

package/dist/src/Modules/SwitchableOutputs/SwitchableOutput.provider.d.ts

@@ -10,7 +10,7 @@ export interface SwitchableOutputState {
     name: string;
     customName: string;
     group: string;
-    isVisible: boolean;
+    showUIControl: 0 | 1;
     auto: 0 | 1;
     state: 0 | 1;
     dimming?: number;
@@ -32,7 +32,7 @@ export interface SwitchableOutputTopics extends Topics {
     name?: string;
     customName?: string;
     group?: string;
-    isVisible?: string;
+    showUIControl?: string;
     auto?: string;
     state?: string;
     dimming?: string;
@@ -49,7 +49,7 @@ export declare const getSwitchableOutputStateTopics: (portalId: PortalId, device
     name: string;
     customName: string;
     group: string;
-    isVisible: string;
+    showUIControl: string;
     auto: string;
     state: string;
     dimming: string;

package/dist/src/Modules/SwitchableOutputs/SwitchableOutput.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchableOutput.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutput.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAA2B,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAA;AACtE,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAEpF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAA;AAEvC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,yBAAyB,CAAA;IACnC,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,oBAAoB,CAAA;IAC1B,MAAM,EAAE,sBAAsB,CAAA;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,CAAC,GAAG,CAAC,CAAA;IACX,KAAK,EAAE,CAAC,GAAG,CAAC,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;IAEjC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,wBAAyB,SAAQ,qBAAqB;IACrE,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI,CAAA;IACjC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI,CAAA;IACnC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACzC;AAED,MAAM,WAAW,sBAAuB,SAAQ,MAAM;IACpD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,8BAA8B,GAAI,UAAU,QAAQ,EAAE,UAAU,yBAAyB,EAAE,UAAU,kBAAkB;;;;;;;;;;;;;;;;CAgBlI,CAAA;AAEF,eAAO,MAAM,8BAA8B,GAAI,UAAU,QAAQ,EAAE,UAAU,yBAAyB,EAAE,UAAU,kBAAkB;;;;CAIlI,CAAA;AAEF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,yBAAyB,EAAE,QAAQ,EAAE,kBAAkB,GAAG,wBAAwB,CAW/H"}
+{"version":3,"file":"SwitchableOutput.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutput.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAA2B,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAA;AACtE,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAEpF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAA;AAEvC,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,yBAAyB,CAAA;IACnC,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,oBAAoB,CAAA;IAC1B,MAAM,EAAE,sBAAsB,CAAA;IAC9B,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,CAAC,GAAG,CAAC,CAAA;IACpB,IAAI,EAAE,CAAC,GAAG,CAAC,CAAA;IACX,KAAK,EAAE,CAAC,GAAG,CAAC,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAA;IAEjC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,wBAAyB,SAAQ,qBAAqB;IACrE,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI,CAAA;IACjC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI,CAAA;IACnC,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CACzC;AAED,MAAM,WAAW,sBAAuB,SAAQ,MAAM;IACpD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,eAAO,MAAM,8BAA8B,GAAI,UAAU,QAAQ,EAAE,UAAU,yBAAyB,EAAE,UAAU,kBAAkB;;;;;;;;;;;;;;;;CAgBlI,CAAA;AAEF,eAAO,MAAM,8BAA8B,GAAI,UAAU,QAAQ,EAAE,UAAU,yBAAyB,EAAE,UAAU,kBAAkB;;;;CAIlI,CAAA;AAEF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,yBAAyB,EAAE,QAAQ,EAAE,kBAAkB,GAAG,wBAAwB,CAW/H"}

package/dist/src/Modules/SwitchableOutputs/SwitchableOutput.provider.js

@@ -17,7 +17,7 @@ export var getSwitchableOutputStateTopics = function (portalId, deviceId, output
     name: "N/".concat(portalId, "/switch/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Name"),
     customName: "N/".concat(portalId, "/switch/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/CustomName"),
     group: "N/".concat(portalId, "/switch/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/Group"),
-    isVisible: "N/".concat(portalId, "/switch/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/ShowUIControl"),
+    showUIControl: "N/".concat(portalId, "/switch/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Settings/ShowUIControl"),
     auto: "N/".concat(portalId, "/switch/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Auto"),
     state: "N/".concat(portalId, "/switch/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/State"),
     dimming: "N/".concat(portalId, "/switch/").concat(deviceId, "/SwitchableOutput/").concat(outputId, "/Dimming"),

package/dist/src/Modules/SwitchableOutputs/SwitchableOutput.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchableOutput.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutput.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { PortalId, Topics, useMqtt, useTopicsState } from \"../Mqtt\"\nimport { useMemo } from \"react\"\nimport { SwitchingDeviceInstanceId } from \"./SwitchingDevice.provider\"\nimport { SwitchableOutputStatus, SwitchableOutputType } from \"../../utils/constants\"\n\nexport type SwitchableOutputId = string\n\nexport interface SwitchableOutputState {\n  deviceId: SwitchingDeviceInstanceId\n  outputId: SwitchableOutputId\n  type: SwitchableOutputType\n  status: SwitchableOutputStatus\n  name: string\n  customName: string\n  group: string\n  isVisible: boolean\n  auto: 0 | 1\n  state: 0 | 1\n  dimming?: number\n  dimmingMin?: number\n  dimmingMax?: number\n  // NOTE: stepSize can be of any precision, respect the precision in the UI\n  stepSize?: number\n  measurement?: number\n  unit: string | \"/S\" | \"/T\" | \"/V\"\n  // NOTE: JSON encoded string array\n  labels: string\n}\n\nexport interface SwitchableOutputProvider extends SwitchableOutputState {\n  updateAuto: (auto: 0 | 1) => void\n  updateState: (state: 0 | 1) => void\n  updateDimming: (dimming: number) => void\n}\n\nexport interface SwitchableOutputTopics extends Topics {\n  type?: string\n  status?: string\n  name?: string\n  customName?: string\n  group?: string\n  isVisible?: string\n  auto?: string\n  state?: string\n  dimming?: string\n  dimmingMin?: string\n  dimmingMax?: string\n  stepSize?: string\n  measurement?: string\n  unit?: string\n  labels?: string\n}\n\nexport const getSwitchableOutputStateTopics = (portalId: PortalId, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId) => ({\n  type: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Settings/Type`,\n  status: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Status`,\n  name: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Name`,\n  customName: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Settings/CustomName`,\n  group: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Settings/Group`,\n  isVisible: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Settings/ShowUIControl`,\n  auto: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Auto`,\n  state: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/State`,\n  dimming: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Dimming`,\n  dimmingMin: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/DimmingMin`,\n  dimmingMax: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/DimmingMax`,\n  stepSize: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/StepSize`,\n  measurement: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Measurement`,\n  unit: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Unit`,\n  labels: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Labels`,\n})\n\nexport const getSwitchableOutputWriteTopics = (portalId: PortalId, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId) => ({\n  auto: `W/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Auto`,\n  state: `W/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/State`,\n  dimming: `W/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Dimming`,\n})\n\nexport function useSwitchableOutput(deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId): SwitchableOutputProvider {\n\n  const mqtt = useMqtt()\n  const topics = useMemo(() => getSwitchableOutputStateTopics(mqtt.portalId, deviceId, outputId), [mqtt.portalId, deviceId, outputId])\n  const writeTopics = useMemo(() => getSwitchableOutputWriteTopics(mqtt.portalId, deviceId, outputId), [mqtt.portalId, deviceId, outputId])\n\n  const updateAuto = (auto: 0 | 1) => mqtt.publish(writeTopics!.auto, auto)\n  const updateState = (state: 0 | 1) => mqtt.publish(writeTopics!.state, state)\n  const updateDimming = (dimming: number) => mqtt.publish(writeTopics!.dimming, dimming)\n\n  return { ...useTopicsState<SwitchableOutputState>(topics), updateAuto, updateState, updateDimming }\n}\n"]}
+{"version":3,"file":"SwitchableOutput.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutput.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { PortalId, Topics, useMqtt, useTopicsState } from \"../Mqtt\"\nimport { useMemo } from \"react\"\nimport { SwitchingDeviceInstanceId } from \"./SwitchingDevice.provider\"\nimport { SwitchableOutputStatus, SwitchableOutputType } from \"../../utils/constants\"\n\nexport type SwitchableOutputId = string\n\nexport interface SwitchableOutputState {\n  deviceId: SwitchingDeviceInstanceId\n  outputId: SwitchableOutputId\n  type: SwitchableOutputType\n  status: SwitchableOutputStatus\n  name: string\n  customName: string\n  group: string\n  showUIControl: 0 | 1\n  auto: 0 | 1\n  state: 0 | 1\n  dimming?: number\n  dimmingMin?: number\n  dimmingMax?: number\n  // NOTE: stepSize can be of any precision, respect the precision in the UI\n  stepSize?: number\n  measurement?: number\n  unit: string | \"/S\" | \"/T\" | \"/V\"\n  // NOTE: JSON encoded string array\n  labels: string\n}\n\nexport interface SwitchableOutputProvider extends SwitchableOutputState {\n  updateAuto: (auto: 0 | 1) => void\n  updateState: (state: 0 | 1) => void\n  updateDimming: (dimming: number) => void\n}\n\nexport interface SwitchableOutputTopics extends Topics {\n  type?: string\n  status?: string\n  name?: string\n  customName?: string\n  group?: string\n  showUIControl?: string\n  auto?: string\n  state?: string\n  dimming?: string\n  dimmingMin?: string\n  dimmingMax?: string\n  stepSize?: string\n  measurement?: string\n  unit?: string\n  labels?: string\n}\n\nexport const getSwitchableOutputStateTopics = (portalId: PortalId, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId) => ({\n  type: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Settings/Type`,\n  status: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Status`,\n  name: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Name`,\n  customName: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Settings/CustomName`,\n  group: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Settings/Group`,\n  showUIControl: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Settings/ShowUIControl`,\n  auto: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Auto`,\n  state: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/State`,\n  dimming: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Dimming`,\n  dimmingMin: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/DimmingMin`,\n  dimmingMax: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/DimmingMax`,\n  stepSize: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/StepSize`,\n  measurement: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Measurement`,\n  unit: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Unit`,\n  labels: `N/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Labels`,\n})\n\nexport const getSwitchableOutputWriteTopics = (portalId: PortalId, deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId) => ({\n  auto: `W/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Auto`,\n  state: `W/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/State`,\n  dimming: `W/${portalId}/switch/${deviceId}/SwitchableOutput/${outputId}/Dimming`,\n})\n\nexport function useSwitchableOutput(deviceId: SwitchingDeviceInstanceId, outputId: SwitchableOutputId): SwitchableOutputProvider {\n\n  const mqtt = useMqtt()\n  const topics = useMemo(() => getSwitchableOutputStateTopics(mqtt.portalId, deviceId, outputId), [mqtt.portalId, deviceId, outputId])\n  const writeTopics = useMemo(() => getSwitchableOutputWriteTopics(mqtt.portalId, deviceId, outputId), [mqtt.portalId, deviceId, outputId])\n\n  const updateAuto = (auto: 0 | 1) => mqtt.publish(writeTopics!.auto, auto)\n  const updateState = (state: 0 | 1) => mqtt.publish(writeTopics!.state, state)\n  const updateDimming = (dimming: number) => mqtt.publish(writeTopics!.dimming, dimming)\n\n  return { ...useTopicsState<SwitchableOutputState>(topics), updateAuto, updateState, updateDimming }\n}\n"]}

package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchableOutputs.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.provider.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB,kEAiFhC,CAAA"}
+{"version":3,"file":"SwitchableOutputs.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.provider.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,oBAAoB,kEA6DhC,CAAA"}

package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.provider.js

@@ -19,73 +19,53 @@ import { getSwitchableOutputStateTopics } from "./SwitchableOutput.provider";
 export var useSwitchableOutputs = function () {
     var switchableOutputsStore = useSwitchableOutputsStore();
     var getTopics = function (portalId) { return ({
-        devices: "N/".concat(portalId, "/switch/+/DeviceInstance"),
-        switchableOutputs: "N/".concat(portalId, "/switch/+/SwitchableOutput/+/Settings/Group"),
+        switchableOutputs: "N/".concat(portalId, "/switch/+/SwitchableOutput/+/Settings/+"),
     }); };
     var mqtt = useMqtt();
     var topics = useMemo(function () { return getTopics(mqtt.portalId); }, [mqtt.portalId]);
-    var messagesForSwitchingDevices = mqtt.messagesByWildcard(topics.devices);
     var messagesForSwitchableOutputs = mqtt.messagesByWildcard(topics.switchableOutputs);
-    // Examine MQTT to find all available switching devices
-    useEffect(function () {
-        if (!messagesForSwitchingDevices || Object.entries(messagesForSwitchingDevices).length === 0) {
-            Logger.log("Waiting for switching devices...");
-        }
-        else {
-            var deviceInstances_1 = Object.values(messagesForSwitchingDevices);
-            var dispose_1 = autorun(function () {
-                var oldDevices = switchableOutputsStore.devices;
-                var newDevices = deviceInstances_1.map(function (deviceId) { return mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, deviceId)); });
-                // TODO: check unordered structural identify of old and new state
-                // TODO: to avoid unnecessary re-rendering: O(n^2) baby
-                if (!oldDevices || oldDevices.length != newDevices.length || !newDevices.every(function (id) { return deviceInstances_1.includes(id); })) {
-                    Logger.log("New switching devices instances: ".concat(JSON.stringify(deviceInstances_1)));
-                    switchableOutputsStore.setDevices(newDevices);
-                }
-            });
-            return function () { return dispose_1(); };
-        }
-    }, [messagesForSwitchingDevices]);
     // Examine MQTT to find all available switchable outputs and their group assignments
     useEffect(function () {
         if (!messagesForSwitchableOutputs || Object.entries(messagesForSwitchableOutputs).length === 0) {
             Logger.log("Waiting for switchable outputs...");
         }
         else {
-            var availableSwitchableOutputs_1 = Object.keys(messagesForSwitchableOutputs).sort();
-            var customGroupAssigments_1 = availableSwitchableOutputs_1.map(function (topic) { return messagesForSwitchableOutputs[topic]; });
-            var dispose_2 = autorun(function () {
-                var oldAssignments = switchableOutputsStore.customGroupAssignments;
-                var newAssignments = customGroupAssigments_1;
-                // TODO: check ordered structural identify of old and new state
-                // TODO: to avoid unnecessary re-rendering and re-grouping:
-                if (!oldAssignments || oldAssignments.length != newAssignments.length || !oldAssignments.every(function (groupName, index) { return customGroupAssigments_1[index] === groupName; })) {
-                    switchableOutputsStore.setCustomGroupAssignments(newAssignments);
-                    var newGroups_1 = {};
-                    // Walk the array of all switchable outputs, determine to which group it belongs
-                    // and populate its initial state
-                    availableSwitchableOutputs_1.forEach(function (output, index) {
-                        var swo = extractSwitchableOutputInfo(output);
-                        var switchingDevice = mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, swo.deviceId));
-                        var customGroupAssignment = newAssignments[index].trim();
-                        var groupName = customGroupAssignment === "" ? switchingDevice.customName || switchingDevice.productName : customGroupAssignment;
-                        var switchableOutput = mqtt.messagesByTopics(getSwitchableOutputStateTopics(mqtt.portalId, swo.deviceId, swo.outputId));
-                        newGroups_1[groupName] || (newGroups_1[groupName] = []);
-                        newGroups_1[groupName].push(__assign(__assign({}, switchableOutput), { deviceId: swo.deviceId, outputId: swo.outputId }));
-                    });
-                    Logger.log("New switchable output groups: ".concat(JSON.stringify(Object.keys(newGroups_1))));
-                    // Sort switches in a group by name
-                    Object.values(newGroups_1).forEach(function (array) {
-                        array.sort(function (a, b) {
-                            var aName = a.customName || a.name;
-                            var bName = b.customName || b.name;
-                            return aName.localeCompare(bName);
-                        });
+            var availableSwitchableOutputs_1 = Object.keys(messagesForSwitchableOutputs)
+                .filter(function (key) { return key.endsWith('/Settings/Group'); })
+                .sort();
+            var customGroupAssigments_1 = availableSwitchableOutputs_1
+                .filter(function (topic) { return topic.endsWith('/Settings/Group'); })
+                .map(function (topic) { return messagesForSwitchableOutputs[topic]; });
+            var dispose_1 = autorun(function () {
+                switchableOutputsStore.setCustomGroupAssignments(customGroupAssigments_1);
+                var newGroups = {};
+                // Walk the array of all switchable outputs, determine to which group it belongs
+                // and populate its initial state
+                availableSwitchableOutputs_1.forEach(function (output, index) {
+                    var swo = extractSwitchableOutputInfo(output);
+                    var switchingDevice = mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, swo.deviceId));
+                    var customGroupAssignment = customGroupAssigments_1[index].trim();
+                    var groupName = customGroupAssignment === "" ? switchingDevice.customName || switchingDevice.productName : customGroupAssignment;
+                    var switchableOutput = mqtt.messagesByTopics(getSwitchableOutputStateTopics(mqtt.portalId, swo.deviceId, swo.outputId));
+                    // Ignore hidden controls
+                    if (switchableOutput.showUIControl === 0) {
+                        return;
+                    }
+                    newGroups[groupName] || (newGroups[groupName] = []);
+                    newGroups[groupName].push(__assign(__assign({}, switchableOutput), { deviceId: swo.deviceId, outputId: swo.outputId }));
+                });
+                Logger.log("New switchable output groups: ".concat(JSON.stringify(Object.keys(newGroups))));
+                // Sort switches in a group by name
+                Object.values(newGroups).forEach(function (array) {
+                    array.sort(function (a, b) {
+                        var aName = a.customName || a.name;
+                        var bName = b.customName || b.name;
+                        return aName.localeCompare(bName);
                     });
-                    switchableOutputsStore.setGroups(newGroups_1);
-                }
+                });
+                switchableOutputsStore.setGroups(newGroups);
             });
-            return function () { return dispose_2(); };
+            return function () { return dispose_1(); };
         }
     }, [messagesForSwitchableOutputs]);
     return switchableOutputsStore;

package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchableOutputs.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { autorun } from \"mobx\"\nimport Logger from \"../../utils/logger\"\nimport { PortalId, useMqtt } from \"../Mqtt\"\nimport { useMemo, useEffect } from \"react\"\nimport { useSwitchableOutputsStore } from \"./SwitchableOutputs.store\"\nimport { getSwitchingDeviceStateTopics, SwitchingDeviceInstanceId, SwitchingDeviceState } from \"./SwitchingDevice.provider\"\nimport { getSwitchableOutputStateTopics, SwitchableOutputId, SwitchableOutputState } from \"./SwitchableOutput.provider\"\n\nexport const useSwitchableOutputs = () => {\n  const switchableOutputsStore = useSwitchableOutputsStore()\n\n  const getTopics = (portalId: PortalId) => ({\n    devices: `N/${portalId}/switch/+/DeviceInstance`,\n    switchableOutputs: `N/${portalId}/switch/+/SwitchableOutput/+/Settings/Group`,\n  })\n\n  const mqtt = useMqtt()\n  const topics = useMemo(() => getTopics(mqtt.portalId), [mqtt.portalId])\n\n  const messagesForSwitchingDevices = mqtt.messagesByWildcard(topics.devices)\n  const messagesForSwitchableOutputs = mqtt.messagesByWildcard(topics.switchableOutputs)\n\n  // Examine MQTT to find all available switching devices\n  useEffect(() => {\n    if (!messagesForSwitchingDevices || Object.entries(messagesForSwitchingDevices).length === 0) {\n      Logger.log(\"Waiting for switching devices...\")\n    } else {\n      const deviceInstances = Object.values(messagesForSwitchingDevices) as SwitchingDeviceInstanceId[]\n      const dispose = autorun(() => {\n        const oldDevices = switchableOutputsStore.devices\n        const newDevices = deviceInstances.map((deviceId) => mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, deviceId))) as unknown as SwitchingDeviceInstanceId[]\n        // TODO: check unordered structural identify of old and new state\n        // TODO: to avoid unnecessary re-rendering: O(n^2) baby\n        if (!oldDevices || oldDevices.length != newDevices.length || !newDevices.every((id) => deviceInstances.includes(id))) {\n          Logger.log(`New switching devices instances: ${JSON.stringify(deviceInstances)}`);\n          switchableOutputsStore.setDevices(newDevices)\n        }\n      })\n      return () => dispose()\n    }\n  }, [messagesForSwitchingDevices])\n\n  // Examine MQTT to find all available switchable outputs and their group assignments\n  useEffect(() => {\n    if (!messagesForSwitchableOutputs || Object.entries(messagesForSwitchableOutputs).length === 0) {\n      Logger.log(\"Waiting for switchable outputs...\")\n    } else {\n      const availableSwitchableOutputs = Object.keys(messagesForSwitchableOutputs).sort() as string[]\n      const customGroupAssigments = availableSwitchableOutputs.map(topic => messagesForSwitchableOutputs[topic])\n      const dispose = autorun(() => {\n        const oldAssignments = switchableOutputsStore.customGroupAssignments\n        const newAssignments = customGroupAssigments\n        // TODO: check ordered structural identify of old and new state\n        // TODO: to avoid unnecessary re-rendering and re-grouping:\n        if (!oldAssignments || oldAssignments.length != newAssignments.length || !oldAssignments.every((groupName, index) => customGroupAssigments[index] === groupName)) {\n          switchableOutputsStore.setCustomGroupAssignments(newAssignments)\n\n          const newGroups: { [key: string] : SwitchableOutputState[]} = {}\n\n          // Walk the array of all switchable outputs, determine to which group it belongs\n          // and populate its initial state\n          availableSwitchableOutputs.forEach((output, index) => {\n            const swo = extractSwitchableOutputInfo(output)\n            const switchingDevice = mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, swo.deviceId))\n            const customGroupAssignment = newAssignments[index].trim()\n            const groupName = customGroupAssignment === \"\" ? switchingDevice.customName || switchingDevice.productName : customGroupAssignment\n            const switchableOutput = mqtt.messagesByTopics(getSwitchableOutputStateTopics(mqtt.portalId, swo.deviceId, swo.outputId)) as unknown as SwitchableOutputState\n\n            newGroups[groupName] ||= []\n            newGroups[groupName].push({ ...switchableOutput, deviceId: swo.deviceId, outputId: swo.outputId })\n          })\n\n          Logger.log(`New switchable output groups: ${JSON.stringify(Object.keys(newGroups))}`);\n          // Sort switches in a group by name\n          Object.values(newGroups).forEach(array => {\n            array.sort((a, b) => {\n              const aName = a.customName || a.name\n              const bName = b.customName || b.name\n              return aName.localeCompare(bName);\n            })\n          })\n          switchableOutputsStore.setGroups(newGroups)\n        }\n      })\n      return () => dispose()\n    }\n  }, [messagesForSwitchableOutputs])\n\n  return switchableOutputsStore\n}\n\nfunction extractSwitchableOutputInfo(topic: string) {\n  const switchStart = topic.indexOf('/switch/') + 8 // length of `/switch/`\n  const outputStart = topic.indexOf('/SwitchableOutput/') + 18 // length of `/SwitchableOutput/`\n  \n  return {\n    deviceId: topic.substring(switchStart, topic.indexOf('/', switchStart)) as unknown as SwitchingDeviceInstanceId,\n    outputId: topic.substring(outputStart, topic.indexOf('/', outputStart)) as unknown as SwitchableOutputId\n  }\n}"]}
+{"version":3,"file":"SwitchableOutputs.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { autorun } from \"mobx\"\nimport Logger from \"../../utils/logger\"\nimport { PortalId, useMqtt } from \"../Mqtt\"\nimport { useMemo, useEffect } from \"react\"\nimport { useSwitchableOutputsStore } from \"./SwitchableOutputs.store\"\nimport { getSwitchingDeviceStateTopics, SwitchingDeviceInstanceId } from \"./SwitchingDevice.provider\"\nimport { getSwitchableOutputStateTopics, SwitchableOutputId, SwitchableOutputState } from \"./SwitchableOutput.provider\"\n\nexport const useSwitchableOutputs = () => {\n  const switchableOutputsStore = useSwitchableOutputsStore()\n\n  const getTopics = (portalId: PortalId) => ({\n    switchableOutputs: `N/${portalId}/switch/+/SwitchableOutput/+/Settings/+`,\n  })\n\n  const mqtt = useMqtt()\n  const topics = useMemo(() => getTopics(mqtt.portalId), [mqtt.portalId])\n\n  const messagesForSwitchableOutputs = mqtt.messagesByWildcard(topics.switchableOutputs)\n\n  // Examine MQTT to find all available switchable outputs and their group assignments\n  useEffect(() => {\n    if (!messagesForSwitchableOutputs || Object.entries(messagesForSwitchableOutputs).length === 0) {\n      Logger.log(\"Waiting for switchable outputs...\")\n    } else {\n      const availableSwitchableOutputs = Object.keys(messagesForSwitchableOutputs)\n        .filter(key => key.endsWith('/Settings/Group'))\n        .sort() as string[]\n      const customGroupAssigments = availableSwitchableOutputs\n        .filter(topic => topic.endsWith('/Settings/Group'))\n        .map(topic => messagesForSwitchableOutputs[topic])\n      const dispose = autorun(() => {\n          switchableOutputsStore.setCustomGroupAssignments(customGroupAssigments)\n\n          const newGroups: { [key: string] : SwitchableOutputState[]} = {}\n\n          // Walk the array of all switchable outputs, determine to which group it belongs\n          // and populate its initial state\n          availableSwitchableOutputs.forEach((output, index) => {\n            const swo = extractSwitchableOutputInfo(output)\n            const switchingDevice = mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, swo.deviceId))\n            const customGroupAssignment = customGroupAssigments[index].trim()\n            const groupName = customGroupAssignment === \"\" ? switchingDevice.customName || switchingDevice.productName : customGroupAssignment\n            const switchableOutput = mqtt.messagesByTopics(getSwitchableOutputStateTopics(mqtt.portalId, swo.deviceId, swo.outputId)) as unknown as SwitchableOutputState\n\n            // Ignore hidden controls\n            if (switchableOutput.showUIControl === 0) { return }\n\n            newGroups[groupName] ||= []\n            newGroups[groupName].push({ ...switchableOutput, deviceId: swo.deviceId, outputId: swo.outputId })\n          })\n\n          Logger.log(`New switchable output groups: ${JSON.stringify(Object.keys(newGroups))}`);\n          // Sort switches in a group by name\n          Object.values(newGroups).forEach(array => {\n            array.sort((a, b) => {\n              const aName = a.customName || a.name\n              const bName = b.customName || b.name\n              return aName.localeCompare(bName);\n            })\n          })\n          switchableOutputsStore.setGroups(newGroups)\n        }\n      )\n      return () => dispose()\n    }\n  }, [messagesForSwitchableOutputs])\n\n  return switchableOutputsStore\n}\n\nfunction extractSwitchableOutputInfo(topic: string) {\n  const switchStart = topic.indexOf('/switch/') + 8 // length of `/switch/`\n  const outputStart = topic.indexOf('/SwitchableOutput/') + 18 // length of `/SwitchableOutput/`\n  \n  return {\n    deviceId: topic.substring(switchStart, topic.indexOf('/', switchStart)) as unknown as SwitchingDeviceInstanceId,\n    outputId: topic.substring(outputStart, topic.indexOf('/', outputStart)) as unknown as SwitchableOutputId\n  }\n}"]}

package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.store.d.ts

@@ -1,20 +1,16 @@
 import { SwitchableOutputState } from "./SwitchableOutput.provider";
-import { SwitchingDeviceInstanceId } from "./SwitchingDevice.provider";
 export interface SwitchableOutputsState {
-    devices: SwitchingDeviceInstanceId[];
     groups: {
         [key: string]: SwitchableOutputState[];
     };
     customGroupAssignments: string[];
 }
 export declare class SwitchableOutputsStore {
-    devices: SwitchingDeviceInstanceId[];
     groups: {
         [key: string]: SwitchableOutputState[];
     };
     customGroupAssignments: string[];
     constructor();
-    setDevices: (devices: SwitchingDeviceInstanceId[]) => number[];
     setGroups: (groups: {
         [key: string]: SwitchableOutputState[];
     }) => {

package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchableOutputs.store.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAA;AAItE,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,yBAAyB,EAAE,CAAA;IACpC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAI,qBAAqB,EAAE,CAAA;KAAE,CAAA;IAEnD,sBAAsB,EAAE,MAAM,EAAE,CAAA;CACjC;AAED,qBAAa,sBAAsB;IACjC,OAAO,EAAE,yBAAyB,EAAE,CAAK;IACzC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAI,qBAAqB,EAAE,CAAA;KAAE,CAAK;IACxD,sBAAsB,EAAE,MAAM,EAAE,CAAK;;IAMrC,UAAU,GAAI,SAAS,yBAAyB,EAAE,cAA2B;IAC7E,SAAS,GAAI,QAAQ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAI,qBAAqB,EAAE,CAAA;KAAE;;MAAyB;IACzF,yBAAyB,GAAI,aAAa,MAAM,EAAE,cAA8C;CACjG;AAYD,wBAAgB,yBAAyB,2BAExC"}
+{"version":3,"file":"SwitchableOutputs.store.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAInE,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAI,qBAAqB,EAAE,CAAA;KAAE,CAAA;IAEnD,sBAAsB,EAAE,MAAM,EAAE,CAAA;CACjC;AAED,qBAAa,sBAAsB;IACjC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAI,qBAAqB,EAAE,CAAA;KAAE,CAAK;IACxD,sBAAsB,EAAE,MAAM,EAAE,CAAK;;IAMrC,SAAS,GAAI,QAAQ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAI,qBAAqB,EAAE,CAAA;KAAE;;MAAyB;IACzF,yBAAyB,GAAI,aAAa,MAAM,EAAE,cAA8C;CACjG;AAYD,wBAAgB,yBAAyB,2BAExC"}

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

@@ -4,12 +4,6 @@ var store;
 var SwitchableOutputsStore = /** @class */ (function () {
     function SwitchableOutputsStore() {
         var _this = this;
-        Object.defineProperty(this, "devices", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: []
-        });
         Object.defineProperty(this, "groups", {
             enumerable: true,
             configurable: true,
@@ -22,12 +16,6 @@ var SwitchableOutputsStore = /** @class */ (function () {
             writable: true,
             value: []
         });
-        Object.defineProperty(this, "setDevices", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: function (devices) { return _this.devices = devices; }
-        });
         Object.defineProperty(this, "setGroups", {
             enumerable: true,
             configurable: true,
@@ -40,7 +28,7 @@ var SwitchableOutputsStore = /** @class */ (function () {
             writable: true,
             value: function (assignments) { return _this.customGroupAssignments = assignments; }
         });
-        makeAutoObservable(this, { setDevices: action, setGroups: action, setCustomGroupAssignments: action });
+        makeAutoObservable(this, { setGroups: action, setCustomGroupAssignments: action });
     }
     return SwitchableOutputsStore;
 }());

package/dist/src/Modules/SwitchableOutputs/SwitchableOutputs.store.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchableOutputs.store.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAe,MAAM,MAAM,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAI/B,IAAI,KAA6B,CAAA;AASjC;IAKE;QAAA,iBAEC;QAND;;;;mBAAuC,EAAE;WAAA;QACzC;;;;mBAAsD,EAAE;WAAA;QACxD;;;;mBAAmC,EAAE;WAAA;QAMrC;;;;mBAAa,UAAC,OAAoC,IAAK,OAAA,KAAI,CAAC,OAAO,GAAG,OAAO,EAAtB,CAAsB;WAAA;QAC7E;;;;mBAAY,UAAC,MAAmD,IAAK,OAAA,KAAI,CAAC,MAAM,GAAG,MAAM,EAApB,CAAoB;WAAA;QACzF;;;;mBAA4B,UAAC,WAAqB,IAAK,OAAA,KAAI,CAAC,sBAAsB,GAAG,WAAW,EAAzC,CAAyC;WAAA;QAL9F,kBAAkB,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,yBAAyB,EAAE,MAAM,EAAE,CAAC,CAAA;IACxG,CAAC;IAKH,6BAAC;AAAD,CAAC,AAZD,IAYC;;AAED,SAAS,eAAe;IACtB,IAAM,MAAM,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,sBAAsB,EAAE,CAAA;IACpD,4CAA4C;IAC5C,IAAI,OAAO,MAAM,KAAK,WAAW;QAAE,OAAO,MAAM,CAAA;IAChD,sCAAsC;IACtC,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,MAAM,CAAA;IAE1B,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,yBAAyB;IACvC,OAAO,OAAO,CAAC,cAAM,OAAA,eAAe,EAAE,EAAjB,CAAiB,EAAE,EAAE,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { action, makeAutoObservable, runInAction } from \"mobx\"\nimport { useMemo } from \"react\"\nimport { SwitchableOutputState } from \"./SwitchableOutput.provider\"\nimport { SwitchingDeviceInstanceId } from \"./SwitchingDevice.provider\"\n\nlet store: SwitchableOutputsStore\n\nexport interface SwitchableOutputsState {\n  devices: SwitchingDeviceInstanceId[]\n  groups: { [key: string] : SwitchableOutputState[] }\n  // custom group assignments for available switchable outputs sorted by their topic path\n  customGroupAssignments: string[]\n}\n\nexport class SwitchableOutputsStore {\n  devices: SwitchingDeviceInstanceId[] = []\n  groups: { [key: string] : SwitchableOutputState[] } = {}\n  customGroupAssignments: string[] = []\n\n  constructor() {\n    makeAutoObservable(this, { setDevices: action, setGroups: action, setCustomGroupAssignments: action })\n  }\n\n  setDevices = (devices: SwitchingDeviceInstanceId[]) => this.devices = devices\n  setGroups = (groups: { [key: string] : SwitchableOutputState[] }) => this.groups = groups\n  setCustomGroupAssignments = (assignments: string[]) => this.customGroupAssignments = assignments\n}\n\nfunction initializeStore() {\n  const _store = store ?? new SwitchableOutputsStore()\n  // For SSG and SSR always create a new store\n  if (typeof window === \"undefined\") return _store\n  // Create the store once in the client\n  if (!store) store = _store\n\n  return _store\n}\n\nexport function useSwitchableOutputsStore() {\n  return useMemo(() => initializeStore(), [])\n}"]}
+{"version":3,"file":"SwitchableOutputs.store.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchableOutputs.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAe,MAAM,MAAM,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,IAAI,KAA6B,CAAA;AAQjC;IAIE;QAAA,iBAEC;QALD;;;;mBAAsD,EAAE;WAAA;QACxD;;;;mBAAmC,EAAE;WAAA;QAMrC;;;;mBAAY,UAAC,MAAmD,IAAK,OAAA,KAAI,CAAC,MAAM,GAAG,MAAM,EAApB,CAAoB;WAAA;QACzF;;;;mBAA4B,UAAC,WAAqB,IAAK,OAAA,KAAI,CAAC,sBAAsB,GAAG,WAAW,EAAzC,CAAyC;WAAA;QAJ9F,kBAAkB,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,yBAAyB,EAAE,MAAM,EAAE,CAAC,CAAA;IACpF,CAAC;IAIH,6BAAC;AAAD,CAAC,AAVD,IAUC;;AAED,SAAS,eAAe;IACtB,IAAM,MAAM,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,sBAAsB,EAAE,CAAA;IACpD,4CAA4C;IAC5C,IAAI,OAAO,MAAM,KAAK,WAAW;QAAE,OAAO,MAAM,CAAA;IAChD,sCAAsC;IACtC,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,MAAM,CAAA;IAE1B,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,yBAAyB;IACvC,OAAO,OAAO,CAAC,cAAM,OAAA,eAAe,EAAE,EAAjB,CAAiB,EAAE,EAAE,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { action, makeAutoObservable, runInAction } from \"mobx\"\nimport { useMemo } from \"react\"\nimport { SwitchableOutputState } from \"./SwitchableOutput.provider\"\n\nlet store: SwitchableOutputsStore\n\nexport interface SwitchableOutputsState {\n  groups: { [key: string] : SwitchableOutputState[] }\n  // custom group assignments for available switchable outputs sorted by their topic path\n  customGroupAssignments: string[]\n}\n\nexport class SwitchableOutputsStore {\n  groups: { [key: string] : SwitchableOutputState[] } = {}\n  customGroupAssignments: string[] = []\n\n  constructor() {\n    makeAutoObservable(this, { setGroups: action, setCustomGroupAssignments: action })\n  }\n\n  setGroups = (groups: { [key: string] : SwitchableOutputState[] }) => this.groups = groups\n  setCustomGroupAssignments = (assignments: string[]) => this.customGroupAssignments = assignments\n}\n\nfunction initializeStore() {\n  const _store = store ?? new SwitchableOutputsStore()\n  // For SSG and SSR always create a new store\n  if (typeof window === \"undefined\") return _store\n  // Create the store once in the client\n  if (!store) store = _store\n\n  return _store\n}\n\nexport function useSwitchableOutputsStore() {\n  return useMemo(() => initializeStore(), [])\n}"]}

package/dist/src/Modules/SwitchableOutputs/SwitchingDevice.provider.d.ts

@@ -18,4 +18,5 @@ export declare const getSwitchingDeviceStateTopics: (portalId: PortalId, instanc
     instance: string;
 };
 export declare function useSwitchingDevice(instanceId: SwitchingDeviceInstanceId): SwitchingDeviceState;
+export declare function useSwitchingDevices(): import("./SwitchingDevices.store").SwitchingDevicesStore;
 //# sourceMappingURL=SwitchingDevice.provider.d.ts.map

package/dist/src/Modules/SwitchableOutputs/SwitchingDevice.provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchingDevice.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevice.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAA2B,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAEnE,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAA;AAE9C,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,qBAAqB,EAAE,CAAA;CAC3C;AAED,MAAM,WAAW,qBAAsB,SAAQ,MAAM;IACnD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,eAAO,MAAM,6BAA6B,GAAI,UAAU,QAAQ,EAAE,YAAY,yBAAyB;;;;CAIrG,CAAA;AAEF,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,yBAAyB,GAAG,oBAAoB,CAM9F"}
+{"version":3,"file":"SwitchingDevice.provider.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevice.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAA2B,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AAInE,MAAM,MAAM,yBAAyB,GAAG,MAAM,CAAA;AAE9C,MAAM,WAAW,oBAAoB;IACnC,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,qBAAqB,EAAE,CAAA;CAC3C;AAED,MAAM,WAAW,qBAAsB,SAAQ,MAAM;IACnD,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,eAAO,MAAM,6BAA6B,GAAI,UAAU,QAAQ,EAAE,YAAY,yBAAyB;;;;CAIrG,CAAA;AAEF,wBAAgB,kBAAkB,CAAC,UAAU,EAAE,yBAAyB,GAAG,oBAAoB,CAM9F;AAED,wBAAgB,mBAAmB,6DAiClC"}

package/dist/src/Modules/SwitchableOutputs/SwitchingDevice.provider.js

@@ -1,5 +1,8 @@
+import { useEffect, useMemo } from "react";
 import { useMqtt, useTopicsState } from "../Mqtt";
-import { useMemo } from "react";
+import Logger from "../../utils/logger";
+import { useSwitchingDevicesStore } from "./SwitchingDevices.store";
+import { autorun } from "mobx";
 export var getSwitchingDeviceStateTopics = function (portalId, instanceId) { return ({
     productName: "N/".concat(portalId, "/switch/").concat(instanceId, "/ProductName"),
     customName: "N/".concat(portalId, "/switch/").concat(instanceId, "/CustomName"),
@@ -10,4 +13,34 @@ export function useSwitchingDevice(instanceId) {
     var topics = useMemo(function () { return getSwitchingDeviceStateTopics(portalId, instanceId); }, [portalId, instanceId]);
     return useTopicsState(topics);
 }
+export function useSwitchingDevices() {
+    var switchingDevicesStore = useSwitchingDevicesStore();
+    var getTopics = function (portalId) { return ({
+        devices: "N/".concat(portalId, "/switch/+/DeviceInstance"),
+    }); };
+    var mqtt = useMqtt();
+    var topics = useMemo(function () { return getTopics(mqtt.portalId); }, [mqtt.portalId]);
+    var messagesForSwitchingDevices = mqtt.messagesByWildcard(topics.devices);
+    // Examine MQTT to find all available switching devices
+    useEffect(function () {
+        if (!messagesForSwitchingDevices || Object.entries(messagesForSwitchingDevices).length === 0) {
+            Logger.log("Waiting for switching devices...");
+        }
+        else {
+            var deviceInstances_1 = Object.values(messagesForSwitchingDevices);
+            var dispose_1 = autorun(function () {
+                var oldDevices = switchingDevicesStore.devices;
+                var newDevices = deviceInstances_1.map(function (deviceId) { return mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, deviceId)); });
+                // TODO: check unordered structural identify of old and new state
+                // TODO: to avoid unnecessary re-rendering: O(n^2) baby
+                if (!oldDevices || oldDevices.length != newDevices.length || !newDevices.every(function (id) { return deviceInstances_1.includes(id); })) {
+                    Logger.log("New switching devices instances: ".concat(JSON.stringify(deviceInstances_1)));
+                    switchingDevicesStore.setDevices(newDevices);
+                }
+            });
+            return function () { return dispose_1(); };
+        }
+    }, [messagesForSwitchingDevices]);
+    return switchingDevicesStore;
+}
 //# sourceMappingURL=SwitchingDevice.provider.js.map

package/dist/src/Modules/SwitchableOutputs/SwitchingDevice.provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchingDevice.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevice.provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAkB/B,MAAM,CAAC,IAAM,6BAA6B,GAAG,UAAC,QAAkB,EAAE,UAAqC,IAAK,OAAA,CAAC;IAC3G,WAAW,EAAE,YAAK,QAAQ,qBAAW,UAAU,iBAAc;IAC7D,UAAU,EAAE,YAAK,QAAQ,qBAAW,UAAU,gBAAa;IAC3D,QAAQ,EAAE,YAAK,QAAQ,mBAAS,UAAU,oBAAiB;CAC5D,CAAC,EAJ0G,CAI1G,CAAA;AAEF,MAAM,UAAU,kBAAkB,CAAC,UAAqC;IAE9D,IAAA,QAAQ,GAAK,OAAO,EAAE,SAAd,CAAc;IAC9B,IAAM,MAAM,GAAG,OAAO,CAAC,cAAM,OAAA,6BAA6B,CAAC,QAAQ,EAAE,UAAU,CAAC,EAAnD,CAAmD,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAA;IAEzG,OAAO,cAAc,CAAuB,MAAM,CAAC,CAAA;AACrD,CAAC","sourcesContent":["import { PortalId, Topics, useMqtt, useTopicsState } from \"../Mqtt\"\nimport { useMemo } from \"react\"\nimport { SwitchableOutputState } from \"./SwitchableOutput.provider\"\n\nexport type SwitchingDeviceInstanceId = number\n\nexport interface SwitchingDeviceState {\n  productName: string\n  customName: string\n  instance: number\n  switchableOutputs: SwitchableOutputState[]\n}\n\nexport interface SwitchingDeviceTopics extends Topics {\n  productName?: string\n  customName?: string\n  instance?: string\n}\n\nexport const getSwitchingDeviceStateTopics = (portalId: PortalId, instanceId: SwitchingDeviceInstanceId) => ({\n  productName: `N/${portalId}/switch/${instanceId}/ProductName`,\n  customName: `N/${portalId}/switch/${instanceId}/CustomName`,\n  instance: `N/${portalId}/tank/${instanceId}/DeviceInstance`,\n})\n\nexport function useSwitchingDevice(instanceId: SwitchingDeviceInstanceId): SwitchingDeviceState {\n\n  const { portalId } = useMqtt()\n  const topics = useMemo(() => getSwitchingDeviceStateTopics(portalId, instanceId), [portalId, instanceId])\n\n  return useTopicsState<SwitchingDeviceState>(topics)\n}\n"]}
+{"version":3,"file":"SwitchingDevice.provider.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevice.provider.ts"],"names":[],"mappings":"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","sourcesContent":["import { useEffect, useMemo } from \"react\"\nimport { PortalId, Topics, useMqtt, useTopicsState } from \"../Mqtt\"\nimport Logger from \"../../utils/logger\"\nimport { SwitchableOutputState } from \"./SwitchableOutput.provider\"\nimport { useSwitchingDevicesStore } from \"./SwitchingDevices.store\"\nimport { autorun } from \"mobx\"\n\nexport type SwitchingDeviceInstanceId = number\n\nexport interface SwitchingDeviceState {\n  productName: string\n  customName: string\n  instance: number\n  switchableOutputs: SwitchableOutputState[]\n}\n\nexport interface SwitchingDeviceTopics extends Topics {\n  productName?: string\n  customName?: string\n  instance?: string\n}\n\nexport const getSwitchingDeviceStateTopics = (portalId: PortalId, instanceId: SwitchingDeviceInstanceId) => ({\n  productName: `N/${portalId}/switch/${instanceId}/ProductName`,\n  customName: `N/${portalId}/switch/${instanceId}/CustomName`,\n  instance: `N/${portalId}/tank/${instanceId}/DeviceInstance`,\n})\n\nexport function useSwitchingDevice(instanceId: SwitchingDeviceInstanceId): SwitchingDeviceState {\n\n  const { portalId } = useMqtt()\n  const topics = useMemo(() => getSwitchingDeviceStateTopics(portalId, instanceId), [portalId, instanceId])\n\n  return useTopicsState<SwitchingDeviceState>(topics)\n}\n\nexport function useSwitchingDevices() {\n  const switchingDevicesStore = useSwitchingDevicesStore()\n\n  const getTopics = (portalId: PortalId) => ({\n    devices: `N/${portalId}/switch/+/DeviceInstance`,\n  })\n\n  const mqtt = useMqtt()\n  const topics = useMemo(() => getTopics(mqtt.portalId), [mqtt.portalId])\n\n  const messagesForSwitchingDevices = mqtt.messagesByWildcard(topics.devices)\n\n  // Examine MQTT to find all available switching devices\n  useEffect(() => {\n    if (!messagesForSwitchingDevices || Object.entries(messagesForSwitchingDevices).length === 0) {\n      Logger.log(\"Waiting for switching devices...\")\n    } else {\n      const deviceInstances = Object.values(messagesForSwitchingDevices) as SwitchingDeviceInstanceId[]\n      const dispose = autorun(() => {\n        const oldDevices = switchingDevicesStore.devices\n        const newDevices = deviceInstances.map((deviceId) => mqtt.messagesByTopics(getSwitchingDeviceStateTopics(mqtt.portalId, deviceId))) as unknown as SwitchingDeviceInstanceId[]\n        // TODO: check unordered structural identify of old and new state\n        // TODO: to avoid unnecessary re-rendering: O(n^2) baby\n        if (!oldDevices || oldDevices.length != newDevices.length || !newDevices.every((id) => deviceInstances.includes(id))) {\n          Logger.log(`New switching devices instances: ${JSON.stringify(deviceInstances)}`);\n          switchingDevicesStore.setDevices(newDevices)\n        }\n      })\n      return () => dispose()\n    }\n  }, [messagesForSwitchingDevices])\n\n  return switchingDevicesStore\n}"]}

package/dist/src/Modules/SwitchableOutputs/SwitchingDevices.store.d.ts

@@ -1,11 +1,11 @@
-import { SwitchingDeviceState } from "./SwitchingDevice.provider";
+import { SwitchingDeviceInstanceId } from "./SwitchingDevice.provider";
 export interface SwitchingDevicesState {
-    devices: SwitchingDeviceState[];
+    devices: SwitchingDeviceInstanceId[];
 }
 export declare class SwitchingDevicesStore {
-    devices: SwitchingDeviceState[];
+    devices: SwitchingDeviceInstanceId[];
     constructor();
-    setDevices: (devices: SwitchingDeviceState[]) => SwitchingDeviceState[];
+    setDevices: (devices: SwitchingDeviceInstanceId[]) => number[];
 }
 export declare function useSwitchingDevicesStore(): SwitchingDevicesStore;
 //# sourceMappingURL=SwitchingDevices.store.d.ts.map

package/dist/src/Modules/SwitchableOutputs/SwitchingDevices.store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchingDevices.store.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevices.store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;AAIjE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,oBAAoB,EAAE,CAAA;CAChC;AAED,qBAAa,qBAAqB;IAChC,OAAO,EAAE,oBAAoB,EAAE,CAAK;;IAMpC,UAAU,GAAI,SAAS,oBAAoB,EAAE,4BAA2B;CACzE;AAYD,wBAAgB,wBAAwB,0BAEvC"}
+{"version":3,"file":"SwitchingDevices.store.d.ts","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevices.store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAA;AAItE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,yBAAyB,EAAE,CAAA;CACrC;AAED,qBAAa,qBAAqB;IAChC,OAAO,EAAE,yBAAyB,EAAE,CAAK;;IAMzC,UAAU,GAAI,SAAS,yBAAyB,EAAE,cAA2B;CAC9E;AAYD,wBAAgB,wBAAwB,0BAEvC"}

package/dist/src/Modules/SwitchableOutputs/SwitchingDevices.store.js.map

@@ -1 +1 @@
-{"version":3,"file":"SwitchingDevices.store.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevices.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAe,MAAM,MAAM,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,IAAI,KAA4B,CAAA;AAMhC;IAGE;QAAA,iBAEC;QAJD;;;;mBAAkC,EAAE;WAAA;QAMpC;;;;mBAAa,UAAC,OAA+B,IAAK,OAAA,KAAI,CAAC,OAAO,GAAG,OAAO,EAAtB,CAAsB;WAAA;QAHtE,kBAAkB,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAA;IAClD,CAAC;IAGH,4BAAC;AAAD,CAAC,AARD,IAQC;;AAED,SAAS,eAAe;IACtB,IAAM,MAAM,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,qBAAqB,EAAE,CAAA;IACnD,4CAA4C;IAC5C,IAAI,OAAO,MAAM,KAAK,WAAW;QAAE,OAAO,MAAM,CAAA;IAChD,sCAAsC;IACtC,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,MAAM,CAAA;IAE1B,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,wBAAwB;IACtC,OAAO,OAAO,CAAC,cAAM,OAAA,eAAe,EAAE,EAAjB,CAAiB,EAAE,EAAE,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { action, makeAutoObservable, runInAction } from \"mobx\"\nimport { useMemo } from \"react\"\nimport { SwitchingDeviceState } from \"./SwitchingDevice.provider\"\n\nlet store: SwitchingDevicesStore\n\nexport interface SwitchingDevicesState {\n  devices: SwitchingDeviceState[]\n}\n\nexport class SwitchingDevicesStore {\n  devices: SwitchingDeviceState[] = []\n\n  constructor() {\n    makeAutoObservable(this, { setDevices: action })\n  }\n\n  setDevices = (devices: SwitchingDeviceState[]) => this.devices = devices\n}\n\nfunction initializeStore() {\n  const _store = store ?? new SwitchingDevicesStore()\n  // For SSG and SSR always create a new store\n  if (typeof window === \"undefined\") return _store\n  // Create the store once in the client\n  if (!store) store = _store\n\n  return _store\n}\n\nexport function useSwitchingDevicesStore() {\n  return useMemo(() => initializeStore(), [])\n}"]}
+{"version":3,"file":"SwitchingDevices.store.js","sourceRoot":"/","sources":["src/Modules/SwitchableOutputs/SwitchingDevices.store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,MAAM,CAAA;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAG/B,IAAI,KAA4B,CAAA;AAMhC;IAGE;QAAA,iBAEC;QAJD;;;;mBAAuC,EAAE;WAAA;QAMzC;;;;mBAAa,UAAC,OAAoC,IAAK,OAAA,KAAI,CAAC,OAAO,GAAG,OAAO,EAAtB,CAAsB;WAAA;QAH3E,kBAAkB,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAA;IAClD,CAAC;IAGH,4BAAC;AAAD,CAAC,AARD,IAQC;;AAED,SAAS,eAAe;IACtB,IAAM,MAAM,GAAG,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,qBAAqB,EAAE,CAAA;IACnD,4CAA4C;IAC5C,IAAI,OAAO,MAAM,KAAK,WAAW;QAAE,OAAO,MAAM,CAAA;IAChD,sCAAsC;IACtC,IAAI,CAAC,KAAK;QAAE,KAAK,GAAG,MAAM,CAAA;IAE1B,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,UAAU,wBAAwB;IACtC,OAAO,OAAO,CAAC,cAAM,OAAA,eAAe,EAAE,EAAjB,CAAiB,EAAE,EAAE,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["import { action, makeAutoObservable } from \"mobx\"\nimport { useMemo } from \"react\"\nimport { SwitchingDeviceInstanceId } from \"./SwitchingDevice.provider\"\n\nlet store: SwitchingDevicesStore\n\nexport interface SwitchingDevicesState {\n  devices: SwitchingDeviceInstanceId[]\n}\n\nexport class SwitchingDevicesStore {\n  devices: SwitchingDeviceInstanceId[] = []\n\n  constructor() {\n    makeAutoObservable(this, { setDevices: action })\n  }\n\n  setDevices = (devices: SwitchingDeviceInstanceId[]) => this.devices = devices\n}\n\nfunction initializeStore() {\n  const _store = store ?? new SwitchingDevicesStore()\n  // For SSG and SSR always create a new store\n  if (typeof window === \"undefined\") return _store\n  // Create the store once in the client\n  if (!store) store = _store\n\n  return _store\n}\n\nexport function useSwitchingDevicesStore() {\n  return useMemo(() => initializeStore(), [])\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@victronenergy/mfd-modules",
-  "version": "9.3.0",
+  "version": "9.5.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",