@machhub-dev/node-red-nodes 1.0.7 → 1.0.9-test

package/dist/lib/services/mqtt.service.js

@@ -15,9 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MQTTService = void 0;
 const mqtt_1 = __importDefault(require("mqtt"));
 class MQTTService {
-    constructor() {
-        this.subscribedTopics = [];
-    }
     static getInstance(settings, statusCallback) {
         return __awaiter(this, void 0, void 0, function* () {
             // If we already have an instance, return it
@@ -109,8 +106,17 @@ class MQTTService {
                         clientId: settings.clientId,
                         username: settings.clientId,
                         password: settings.clientSecret,
+                        reconnectPeriod: 0, // disable MQTT.js auto-reconnect; we manage reconnection via getInstance()
                     });
                     instance.attachMessageListener();
+                    // Re-subscribe any topics registered before this connection was established
+                    for (const sub of MQTTService.subscribedTopics) {
+                        instance.client.subscribe(sub.topic, { qos: 2 }, (err) => {
+                            if (err) {
+                                console.error(`Failed to re-subscribe to topic ${sub.topic}:`, err);
+                            }
+                        });
+                    }
                     // console.log("MQTT connection established successfully");
                     if (statusCallback) {
                         statusCallback({ fill: "green", shape: "dot", text: "MQTT Connected" });
@@ -128,19 +134,22 @@ class MQTTService {
             return instance;
         });
     }
-    // Method to reset the instance
+    // Method to reset the instance and all state (full shutdown / redeploy)
     static resetInstance() {
-        if (this.instance && this.instance.client) {
-            this.instance.client.end();
-        }
+        const inst = this.instance;
+        // Clear references first so the 'close' event handler guard doesn't re-null unnecessarily
         this.instance = null;
         this.instancePromise = null;
         this.stopConnecting = true;
+        this.subscribedTopics = [];
+        if (inst && inst.client) {
+            inst.client.end();
+        }
     }
     // Adds a topic and handler to the subscribed list
     addTopicHandler(topic, handler) {
         try {
-            this.subscribedTopics.push({ topic, handler });
+            MQTTService.subscribedTopics.push({ topic, handler });
             // console.log("New Subscription Handler : ", topic)
             this.client.subscribe(topic, { qos: 2 }, (err) => {
                 if (err) {
@@ -152,6 +161,23 @@ class MQTTService {
             console.error(`Failed to subscribe to topic ${topic}:`, e);
         }
     }
+    // Removes a topic handler and unsubscribes from the broker if no other handler covers the same topic
+    removeTopicHandler(topic, handler) {
+        MQTTService.subscribedTopics = MQTTService.subscribedTopics.filter(st => !(st.topic === topic && st.handler === handler));
+        const stillSubscribed = MQTTService.subscribedTopics.some(st => st.topic === topic);
+        if (!stillSubscribed) {
+            try {
+                this.client.unsubscribe(topic, (err) => {
+                    if (err) {
+                        console.error(`Failed to unsubscribe from topic ${topic}:`, err);
+                    }
+                });
+            }
+            catch (e) {
+                console.error(`Failed to unsubscribe from topic ${topic}:`, e);
+            }
+        }
+    }
     // Publishes a message to a specific topic
     publish(topic, message) {
         try {
@@ -176,7 +202,7 @@ class MQTTService {
     }
     attachMessageListener() {
         this.client.on('message', (topic, message, packet) => {
-            for (const subscribedTopic of this.subscribedTopics) {
+            for (const subscribedTopic of MQTTService.subscribedTopics) {
                 if (this.matchesTopic(subscribedTopic.topic, topic)) {
                     const parsedMessage = this.parseMessage(message, topic);
                     subscribedTopic.handler(parsedMessage, packet.retain);
@@ -184,6 +210,14 @@ class MQTTService {
                 }
             }
         });
+        // When the broker closes the connection (e.g. session expired), self-reset so the
+        // next getInstance() call creates a fresh client with an empty in-flight store.
+        this.client.on('close', () => {
+            if (MQTTService.instance === this) {
+                MQTTService.instance = null;
+                MQTTService.instancePromise = null;
+            }
+        });
     }
     // Matches MQTT topic patterns with wildcards (+ for single level, # for multi-level)
     matchesTopic(pattern, topic) {
@@ -232,3 +266,4 @@ class MQTTService {
 exports.MQTTService = MQTTService;
 MQTTService.instancePromise = null;
 MQTTService.stopConnecting = false;
+MQTTService.subscribedTopics = [];

package/dist/nodes/bulk-tag-write.html

@@ -5,7 +5,13 @@
     defaults: {
       name: { value: "" },
       useConfigNode: { value: false }, // Toggle between JSON file and config node
-      machhub: { value: "", type: "machhub-config" }
+      machhub: { 
+        value: "", 
+        type: "machhub-config",
+        validate: function(v) {
+          return !this.useConfigNode || (this.useConfigNode && v !== "");
+        }
+      }
     },
     paletteLabel: "Bulk Tag Write",
     inputs: 1,

package/dist/nodes/bulk-tag-write.js

@@ -56,7 +56,6 @@ function default_1(RED) {
             }
         }
         node.on('close', () => {
-            mqtt_service_1.MQTTService.resetInstance();
             mqttService = null;
             initializationPromise = null;
         });
@@ -64,18 +63,13 @@ function default_1(RED) {
             return __awaiter(this, void 0, void 0, function* () {
                 try {
                     node.status({ fill: "orange", shape: "dot", text: "Sending Payload" });
-                    // Wait for initialization if still in progress
-                    if (isInitializing && initializationPromise) {
-                        yield initializationPromise;
-                    }
-                    // Check if mqttService is initialized
-                    if (!mqttService) {
-                        node.status({ fill: "red", shape: "dot", text: "MQTT service not initialized" });
-                        return;
-                    }
+                    // Always fetch the current instance so we recover transparently after reconnects
+                    const service = yield mqtt_service_1.MQTTService.getInstance(machhubConfig, (status) => {
+                        node.status(status);
+                    });
                     Object.keys(msg.payload).forEach(function (key) {
                         try {
-                            mqttService.publish(key, msg.payload[key]);
+                            service.publish(key, msg.payload[key]);
                         }
                         catch (error) {
                             node.status({ fill: "red", shape: "dot", text: "Failed to publish to '" + key + "':  " + error.toString() });

package/dist/nodes/collections.html

@@ -5,7 +5,13 @@
     defaults: {
       name: { value: "" },
       useConfigNode: { value: false },
-      machhub: { value: "", type: "machhub-config" },
+      machhub: { 
+        value: "", 
+        type: "machhub-config",
+        validate: function(v) {
+          return !this.useConfigNode || (this.useConfigNode && v !== "");
+        }
+      },
       collectionID: { value: "" },
       action: { value: "select" },
       selectFields: { value: [] },

package/dist/nodes/dbquery.html

@@ -5,7 +5,13 @@
     defaults: {
       name: { value: "" },
       useConfigNode: { value: false },
-      machhub: { value: "", type: "machhub-config" },
+      machhub: { 
+        value: "", 
+        type: "machhub-config",
+        validate: function(v) {
+          return !this.useConfigNode || (this.useConfigNode && v !== "");
+        }
+      },
       query: { value: "" }
     },
     paletteLabel: "DB Query",

package/dist/nodes/tag-read.html

@@ -6,7 +6,13 @@
       name: { value: "" },
       selectedTag: { value: "", required: true },
       useConfigNode: { value: false }, // Toggle between JSON file and config node
-      machhub: { value: "", type: "machhub-config" } // Will fill in below if empty
+      machhub: { 
+        value: "", 
+        type: "machhub-config",
+        validate: function(v) {
+          return !this.useConfigNode || (this.useConfigNode && v !== "");
+        }
+      } // Will fill in below if empty
     },
     paletteLabel: "Tag Read",
     outputs: 1,

package/dist/nodes/tag-read.js

@@ -61,14 +61,19 @@ function default_1(RED) {
             isRetained: false,
             payload: undefined
         };
+        let mqttService = null;
+        let topicHandler = null;
         node.on('close', function () {
-            mqtt_service_1.MQTTService.resetInstance();
+            if (topicHandler && mqttService) {
+                mqttService.removeTopicHandler(node.selectedTag, topicHandler);
+            }
+            mqttService = null;
+            topicHandler = null;
         });
         (() => __awaiter(this, void 0, void 0, function* () {
             try {
                 node.status({ fill: "yellow", shape: "dot", text: "Connecting..." });
                 // Use MACHHUB config from machhub.env.json to get MQTT service with status callback
-                let mqttService;
                 while (true) {
                     // console.log("Getting MQTT instance");
                     mqttService = yield mqtt_service_1.MQTTService.getInstance(machhubConfig, (status) => {
@@ -79,12 +84,13 @@ function default_1(RED) {
                         break;
                     }
                 }
-                mqttService.addTopicHandler(node.selectedTag, (message, isRetained) => {
+                topicHandler = (message, isRetained) => {
                     msg.payload = message;
                     msg.isRetained = isRetained;
                     node.send(msg);
                     node.status({ fill: "green", shape: "dot", text: "Payload Received" });
-                });
+                };
+                mqttService.addTopicHandler(node.selectedTag, topicHandler);
                 node.status({ fill: "green", shape: "dot", text: "MQTT Listening" });
             }
             catch (error) {

package/dist/nodes/tag-write.js

@@ -58,23 +58,17 @@ function default_1(RED) {
             }
         }
         node.on('close', () => {
-            mqtt_service_1.MQTTService.resetInstance();
             mqttService = null;
             initializationPromise = null;
         });
         node.on('input', (msg) => __awaiter(this, void 0, void 0, function* () {
             try {
                 node.status({ fill: "orange", shape: "dot", text: "Sending Payload" });
-                // Wait for initialization if still in progress
-                if (isInitializing && initializationPromise) {
-                    yield initializationPromise;
-                }
-                // Check if mqttService is initialized
-                if (!mqttService) {
-                    node.status({ fill: "red", shape: "dot", text: "MQTT service not initialized" });
-                    return;
-                }
-                yield mqttService.publish(node.selectedTag, msg.payload);
+                // Always fetch the current instance so we recover transparently after reconnects
+                const service = yield mqtt_service_1.MQTTService.getInstance(machhubConfig, (status) => {
+                    node.status(status);
+                });
+                yield service.publish(node.selectedTag, msg.payload);
                 node.status({ fill: "green", shape: "dot", text: "Payload Sent" });
             }
             catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@machhub-dev/node-red-nodes",
-  "version": "1.0.7",
+  "version": "1.0.9-test",
   "description": "Node-RED API for MACHHUB EDGE",
   "scripts": {
     "build": "yarn clean && npx tsc && yarn copy-files",