@thingwala/node-red-contrib-geyserwala-connect 0.0.7 → 0.0.8

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log - Geyserwala Connect - Node-RED Plugin
 
+## [0.0.8] - 2025-02-23
+
+Fix multiple API Connector handling
+
 ## [0.0.7] - 2024-01-08
 
 Improved error handling

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@thingwala/node-red-contrib-geyserwala-connect",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "Node-RED nodes for the Geyserwala Connect",
     "author": "Thingwala",
     "license": "MIT",

package/src/nodes/geyserwala-api-mqtt.js

@@ -8,13 +8,14 @@ class GeyserwalaConnectorMqtt {
         this.nodes = []
         this.subscriptions = {}
 
-        if (this.broker && !this.broker.client) {
-            this.broker.connect(() => {
-                this.setupBrokerEvents()
-            })
-        } else {
-            this.setupBrokerEvents();
-        }
+        this.broker._clientAwaiter.push(
+            (client) => {
+                client.on('connect', () => {
+                    this.updateSubscriptions()
+                    this.setupBrokerEvents()
+                });
+            }
+        );
     }
     setupBrokerEvents() {
         if (!this.broker || !this.broker.client) {
@@ -66,7 +67,6 @@ class GeyserwalaConnectorMqtt {
 
         this.broker.client.on("error", (error) => {
             this.status({ fill: "red", shape: "ring", text: "error" });
-            this.RED.log.error(`{Geyserwala Connect} MQTT error: ${error}`);
         });
     }
     subTopic(key) {
@@ -87,17 +87,18 @@ class GeyserwalaConnectorMqtt {
     }
     hookNode(node) {
         this.nodes.push(node)
-        this.updateSubscriptions()
+        this.broker.register(node)
     }
     unhookAllNodes() {
         for (const node in this.nodes) {
-            node.status({ fill: "grey", shape: "ring", text: "disconnected" });
-            this.nodes = []
-            for(const topic in this.subscriptions) {
-                this.unsubscribe(topic)
-            }
-            this.subscriptions = {}
+            this.broker.deregister(node, ()=>{})
+            this.status({ fill: "grey", shape: "ring", text: "disconnected" });
         }
+        for(const topic in this.subscriptions) {
+            this.unsubscribeTopic(topic)
+        }
+        this.subscriptions = {}
+        this.nodes = []
     }
     updateSubscriptions() {
         this.subscriptions = {}

package/src/nodes/geyserwala-api.js

@@ -1,4 +1,3 @@
-
 module.exports = function (RED) {
     class GeyserwalaConnectApi {
         constructor (config) {
@@ -7,8 +6,24 @@ module.exports = function (RED) {
             if (config.api == "MQTT") {
                 const GeyserwalaConnectorMqtt = require('./geyserwala-api-mqtt');
 
+                let mqttBroker = RED.nodes.getNode(config.mqttBroker)
+
+                if (mqttBroker._clientAwaiter === undefined) {
+                    mqttBroker._clientAwaiter = []
+                    let _client;
+                    Object.defineProperty(mqttBroker, 'client', {
+                        get: function () { return _client; },
+                        set: function (val) {
+                            _client = val;
+                            mqttBroker._clientAwaiter.forEach(awaiter => {
+                                awaiter(val)
+                            });
+                        }
+                    });
+                }
+
                 this.api = new GeyserwalaConnectorMqtt(RED,
-                    RED.nodes.getNode(config.mqttBroker),
+                    mqttBroker,
                     config.mqttPubQos,
                     config.mqttRetain,
                     config.mqttTopicTemplate,

package/src/nodes/geyserwala-nodes.js

@@ -12,6 +12,8 @@ module.exports = function (RED) {
                     "String": String,
                 }[config.valueType]
 
+                this.status({fill:"grey", shape:"ring", text:"initialising ..."});
+
                 var geyserwalaApi = RED.nodes.getNode(config.geyserwalaApi)
                 if (!geyserwalaApi) {
                     setTimeout(()=>{