node-red-contrib-knx-ultimate 2.5.0 → 3.0.0-beta1

package/nodes/knxUltimate-config.js

@@ -7,8 +7,9 @@ const fs = require("fs");
 const path = require("path");
 const net = require("net");
 const _ = require("lodash");
-const knx = require("../KNXEngine/src");
-const dptlib = require("../KNXEngine/src/dptlib");
+const knx = require("knxultimate");
+//const dptlib = require('knxultimate').dptlib;
+const dptlib = require('knxultimate').dptlib;
 
 // const { Server } = require('http')
 const payloadRounder = require("./utils/payloadManipulation");
@@ -128,10 +129,9 @@ module.exports = (RED) => {
     }
 
     node.setAllClientsStatus = (_status, _color, _text) => {
-      function nextStatus(_oClient) {
+      node.nodeClients.forEach((oClient) => {
         try {
-          let oClient = RED.nodes.getNode(_oClient.id);
-          oClient.setNodeStatus({
+          if (oClient.setNodeStatus !== undefined) oClient.setNodeStatus({
             fill: _color,
             shape: "dot",
             text: _status + " " + _text,
@@ -140,12 +140,10 @@ module.exports = (RED) => {
             dpt: "",
             devicename: "",
           });
-          oClient = null;
         } catch (error) {
           if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.warn("Wow setAllClientsStatus error " + error.message);
         }
-      }
-      node.nodeClients.map(nextStatus);
+      });
     };
 
     // 21/01/2022 TTL Timer for clearung the node.telegramsQueue if the connection stays down for long time
@@ -251,8 +249,7 @@ module.exports = (RED) => {
       node.nodeClients
         .filter((_oClient) => _oClient.isWatchDog !== undefined && _oClient.isWatchDog === true)
         .forEach((_oClient) => {
-          const oClient = RED.nodes.getNode(_oClient.id);
-          oClient.signalNodeErrorCalledByConfigNode(_oError);
+          _oClient.signalNodeErrorCalledByConfigNode(_oError);
         });
     };
 
@@ -281,20 +278,11 @@ module.exports = (RED) => {
             devicename: "",
           });
         }
-        // 05/04/2022 create the Json variable and add it to the list
-        const jNode = {};
-        jNode.id = _Node.id;
-        jNode.topic = _Node.topic;
-        if (_Node.hasOwnProperty("isWatchDog")) jNode.isWatchDog = _Node.isWatchDog;
-        jNode.initialread = _Node.initialread;
-        jNode.notifywrite = _Node.notifywrite;
-        jNode.notifyresponse = _Node.notifyresponse;
-        jNode.notifyreadrequest = _Node.notifyreadrequest;
-        node.nodeClients.push(jNode);
+        node.nodeClients.push(_Node);
       }
     };
 
-    node.removeClient = (_Node) => {
+    node.removeClient = async (_Node) => {
       // Remove the client node from the clients array
       try {
         node.nodeClients = node.nodeClients.filter((x) => x.id !== _Node.id);
@@ -303,7 +291,7 @@ module.exports = (RED) => {
       // If no clien nodes, disconnect from bus.
       if (node.nodeClients.length === 0) {
         try {
-          node.Disconnect();
+          await node.Disconnect();
         } catch (error) { /* empty */ }
       }
     };
@@ -324,79 +312,78 @@ module.exports = (RED) => {
           .filter((_oClient) => _oClient.initialread === 2 || _oClient.initialread === 3)
           .filter((_oClient) => _oClient.hasOwnProperty("isWatchDog") === false)
           .forEach((_oClient) => {
-            const oClient = RED.nodes.getNode(_oClient.id); // 05/04/2022 Get the real node
 
             if (node.linkStatus !== "connected") return; // 16/08/2021 If not connected, exit
 
             // 04/04/2020 selected READ FROM FILE 2 or from file then from bus 3
-            if (oClient.listenallga === true) {
+            if (_oClient.listenallga === true) {
               // 13/12/2021 DA FARE
             } else {
               try {
                 if (node.exposedGAs.length > 0) {
-                  const oExposedGA = node.exposedGAs.find((a) => a.ga === oClient.topic);
+                  const oExposedGA = node.exposedGAs.find((a) => a.ga === _oClient.topic);
                   if (oExposedGA !== undefined) {
                     // Retrieve the value from exposedGAs
                     const msg = buildInputMessage({
                       _srcGA: "",
-                      _destGA: oClient.topic,
+                      _destGA: _oClient.topic,
                       _event: "GroupValue_Response",
                       _Rawvalue: Buffer.from(oExposedGA.rawValue.data),
-                      _inputDpt: oClient.dpt,
-                      _devicename: oClient.name ? oClient.name : "",
-                      _outputtopic: oClient.outputtopic,
-                      _oNode: oClient,
+                      _inputDpt: _oClient.dpt,
+                      _devicename: _oClient.name ? _oClient.name : "",
+                      _outputtopic: _oClient.outputtopic,
+                      _oNode: _oClient,
                     });
-                    oClient.previouspayload = ""; // 05/04/2021 Added previous payload
-                    oClient.currentPayload = msg.payload;
-                    oClient.setNodeStatus({
+                    _oClient.previouspayload = ""; // 05/04/2021 Added previous payload
+                    _oClient.currentPayload = msg.payload;
+                    _oClient.setNodeStatus({
                       fill: "grey",
                       shape: "dot",
                       text: "Update value from persist file",
-                      payload: oClient.currentPayload,
-                      GA: oClient.topic,
-                      dpt: oClient.dpt,
-                      devicename: oClient.name || "",
+                      payload: _oClient.currentPayload,
+                      GA: _oClient.topic,
+                      dpt: _oClient.dpt,
+                      devicename: _oClient.name || "",
                     });
                     // 06/05/2021 If, after the rawdata has been savad to file, the user changes the datapoint, the buildInputMessage returns payload null, because it's unable to convert the value
                     if (msg.payload === null) {
                       // Delete the exposedGA
-                      node.exposedGAs = node.exposedGAs.filter((item) => item.ga !== oClient.topic);
-                      oClient.setNodeStatus({
+                      node.exposedGAs = node.exposedGAs.filter((item) => item.ga !== _oClient.topic);
+                      _oClient.setNodeStatus({
                         fill: "yellow",
                         shape: "dot",
                         text: "Datapoint has been changed, remove the value from persist file",
-                        payload: oClient.currentPayload,
-                        GA: oClient.topic,
-                        dpt: oClient.dpt,
-                        devicename: oClient.devicename || "",
+                        payload: _oClient.currentPayload,
+                        GA: _oClient.topic,
+                        dpt: _oClient.dpt,
+                        devicename: _oClient.devicename || "",
                       });
-                      if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error("knxUltimate-config: DoInitialReadFromKNXBusOrFile: Datapoint may have been changed, remove the value from persist file of " + oClient.topic + " Devicename " + oClient.name + " Currend DPT " + oClient.dpt + " Node.id " + oClient.id);
+                      if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error("knxUltimate-config: DoInitialReadFromKNXBusOrFile: Datapoint may have been changed, remove the value from persist file of " + _oClient.topic + " Devicename " + _oClient.name + " Currend DPT " + _oClient.dpt + " Node.id " + _oClient.id);
                     } else {
-                      if (oClient.notifyresponse) oClient.handleSend(msg);
+                      if (_oClient.notifyresponse) _oClient.handleSend(msg);
                     }
                   } else {
-                    if (oClient.initialread === 3) {
+                    if (_oClient.initialread === 3) {
                       // Not found, issue a READ to the bus
-                      if (!readHistory.includes(oClient.topic)) {
-                        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("KNXUltimate-config: DoInitialReadFromKNXBusOrFile 3: sent read request to GA " + oClient.topic);
-                        oClient.setNodeStatus({
+                      if (!readHistory.includes(_oClient.topic)) {
+                        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("KNXUltimate-config: DoInitialReadFromKNXBusOrFile 3: sent read request to GA " + _oClient.topic);
+                        _oClient.setNodeStatus({
                           fill: "grey",
                           shape: "dot",
                           text: "Persist value not found, issuing READ request to BUS",
-                          payload: oClient.currentPayload,
-                          GA: oClient.topic,
-                          dpt: oClient.dpt,
-                          devicename: oClient.devicename || "",
+                          payload: _oClient.currentPayload,
+                          GA: _oClient.topic,
+                          dpt: _oClient.dpt,
+                          devicename: _oClient.devicename || "",
                         });
                         node.writeQueueAdd({
-                          grpaddr: oClient.topic,
+                          grpaddr: _oClient.topic,
                           payload: "",
                           dpt: "",
                           outputtype: "read",
-                          nodecallerid: oClient.id,
+                          nodecallerid: _oClient.id,
                         });
-                        readHistory.push(oClient.topic);
+                        readHistory.push(_oClient.topic);
                       }
                     }
                   }
@@ -411,16 +398,15 @@ module.exports = (RED) => {
           .filter((_oClient) => _oClient.initialread === 1)
           .filter((_oClient) => _oClient.hasOwnProperty("isWatchDog") === false)
           .forEach((_oClient) => {
-            const oClient = RED.nodes.getNode(_oClient.id); // 05/04/2022 Get the real node
 
             if (node.linkStatus !== "connected") return; // 16/08/2021 If not connected, exit
 
             // 04/04/2020 selected READ FROM BUS 1
-            if (oClient.hasOwnProperty("isalertnode") && oClient.isalertnode) {
-              oClient.initialReadAllDevicesInRules();
-            } else if (oClient.hasOwnProperty("isLoadControlNode") && oClient.isLoadControlNode) {
-              oClient.initialReadAllDevicesInRules();
-            } else if (oClient.listenallga === true) {
+            if (_oClient.hasOwnProperty("isalertnode") && _oClient.isalertnode) {
+              _oClient.initialReadAllDevicesInRules();
+            } else if (_oClient.hasOwnProperty("isLoadControlNode") && _oClient.isLoadControlNode) {
+              _oClient.initialReadAllDevicesInRules();
+            } else if (_oClient.listenallga === true) {
               for (let index = 0; index < node.csv.length; index++) {
                 const element = node.csv[index];
                 if (!readHistory.includes(element.ga)) {
@@ -436,16 +422,16 @@ module.exports = (RED) => {
                 }
               }
             } else {
-              if (!readHistory.includes(oClient.topic)) {
+              if (!readHistory.includes(_oClient.topic)) {
                 node.writeQueueAdd({
-                  grpaddr: oClient.topic,
+                  grpaddr: _oClient.topic,
                   payload: "",
                   dpt: "",
                   outputtype: "read",
-                  nodecallerid: oClient.id,
+                  nodecallerid: _oClient.id,
                 });
-                readHistory.push(oClient.topic);
-                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("KNXUltimate-config: DoInitialReadFromKNXBusOrFile: sent read request to GA " + oClient.topic);
+                readHistory.push(_oClient.topic);
+                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("KNXUltimate-config: DoInitialReadFromKNXBusOrFile: sent read request to GA " + _oClient.topic);
               }
             }
           });
@@ -454,7 +440,7 @@ module.exports = (RED) => {
 
     // 01/02/2020 Dinamic change of the KNX Gateway IP, Port and Physical Address
     // This new thing has been requested by proServ RealKNX staff.
-    node.setGatewayConfig = (
+    node.setGatewayConfig = async (
       /** @type {string} */ _sIP,
       /** @type {number} */ _iPort,
       /** @type {string} */ _sPhysicalAddress,
@@ -489,7 +475,7 @@ module.exports = (RED) => {
       );
 
       try {
-        node.Disconnect();
+        await node.Disconnect();
         // node.setKnxConnectionProperties(); // 28/12/2021 Commented
         node.setAllClientsStatus("CONFIG", "yellow", "KNXUltimage-config:setGatewayConfig: disconnected by new setting...");
         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("KNXUltimage-config:setGatewayConfig: disconnected by setGatewayConfig.");
@@ -498,7 +484,7 @@ module.exports = (RED) => {
 
     // 05/05/2021 force connection or disconnection from the KNX BUS and disable the autoreconenctions attempts.
     // This new thing has been requested by proServ RealKNX staff.
-    node.connectGateway = (_bConnection) => {
+    node.connectGateway = async (_bConnection) => {
       if (_bConnection === undefined) return;
       if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info(
         (_bConnection === true ? "Forced connection from watchdog" : "Forced disconnection from watchdog") +
@@ -513,7 +499,7 @@ module.exports = (RED) => {
       if (_bConnection === true) {
         // CONNECT AND ENABLE RECONNECTION ATTEMPTS
         try {
-          node.Disconnect();
+          await node.Disconnect();
           node.setAllClientsStatus("CONFIG", "yellow", "Forced GW connection from watchdog.");
           node.autoReconnect = true;
         } catch (error) { }
@@ -521,7 +507,7 @@ module.exports = (RED) => {
         // DISCONNECT AND DISABLE RECONNECTION ATTEMPTS
         try {
           node.autoReconnect = false;
-          node.Disconnect();
+          await node.Disconnect();
           const t = setTimeout(() => {
             // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
             node.setAllClientsStatus("CONFIG", "yellow", "Forced GW disconnection and stop reconnection attempts, from watchdog.");
@@ -618,12 +604,12 @@ module.exports = (RED) => {
     };
     // node.setKnxConnectionProperties(); 28/12/2021 Commented
 
-    node.initKNXConnection = () => {
+    node.initKNXConnection = async () => {
       try {
         node.setKnxConnectionProperties(); // 28/12/2021 Added
       } catch (error) {
         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error("knxUltimate-config: setKnxConnectionProperties: " + error.message);
-        if (node.linkStatus !== "disconnected") node.Disconnect();
+        if (node.linkStatus !== "disconnected") await node.Disconnect();
         return;
       }
 
@@ -633,7 +619,7 @@ module.exports = (RED) => {
         try {
           if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info("knxUltimate-config: No nodes linked to this gateway " + node.name);
           try {
-            if (node.linkStatus !== "disconnected") node.Disconnect();
+            if (node.linkStatus !== "disconnected") await node.Disconnect();
           } catch (error) { }
           return;
         } catch (error) { }
@@ -641,7 +627,7 @@ module.exports = (RED) => {
 
       try {
         // 02/01/2022 This is important to free the tunnel in case of hard disconnection.
-        node.Disconnect();
+        await node.Disconnect();
       } catch (error) {
         // if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info(error)
       }
@@ -662,8 +648,8 @@ module.exports = (RED) => {
 
         // Setting handlers
         // ######################################
-        node.knxConnection.on(knx.KNXClient.KNXClientEvents.indication, handleBusEvents);
-        node.knxConnection.on(knx.KNXClient.KNXClientEvents.error, (err) => {
+        node.knxConnection.on(knx.KNXClientEvents.indication, handleBusEvents);
+        node.knxConnection.on(knx.KNXClientEvents.error, (err) => {
           try {
             if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error("knxUltimate-config: received KNXClientEvents.error: " + (err.message === undefined ? err : err.message));
           } catch (error) {
@@ -681,11 +667,11 @@ module.exports = (RED) => {
           if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error("knxUltimate-config: Disconnected by: " + (err.message === undefined ? err : err.message));
         });
         // Call discoverCB when a knx gateway has been discovered.
-        // node.knxConnection.on(knx.KNXClient.KNXClientEvents.discover, info => {
+        // node.knxConnection.on(knx.KNXClientEvents.discover, info => {
         //     const [ip, port] = info.split(":");
         //     discoverCB(ip, port);
         // });
-        node.knxConnection.on(knx.KNXClient.KNXClientEvents.disconnected, (info) => {
+        node.knxConnection.on(knx.KNXClientEvents.disconnected, (info) => {
           node.startTimerClearTelegramQueue(); // 21/01/2022 Clear the telegram queue after a while
           if (node.linkStatus !== "disconnected") {
             node.linkStatus = "disconnected";
@@ -693,10 +679,10 @@ module.exports = (RED) => {
             node.Disconnect("Disconnected by event: " + info || "", "red"); // 11/03/2022
           }
         });
-        node.knxConnection.on(knx.KNXClient.KNXClientEvents.close, (info) => {
+        node.knxConnection.on(knx.KNXClientEvents.close, (info) => {
           if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: KNXClient socket closed.");
         });
-        node.knxConnection.on(knx.KNXClient.KNXClientEvents.connected, (info) => {
+        node.knxConnection.on(knx.KNXClientEvents.connected, (info) => {
           if (node.timerClearTelegramQueue !== null) {
             clearTimeout(node.timerClearTelegramQueue); // Connected. Stop the timer that clears the telegrams queue.
             node.timerClearTelegramQueue = null;
@@ -721,7 +707,7 @@ module.exports = (RED) => {
           }, 500);
           if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info("knxUltimate-config: Connected to %o", info);
         });
-        node.knxConnection.on(knx.KNXClient.KNXClientEvents.connecting, (info) => {
+        node.knxConnection.on(knx.KNXClientEvents.connecting, (info) => {
           node.linkStatus = "connecting";
           if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Connecting to" + info.ipAddr || "");
           node.setAllClientsStatus(info.ipAddr || "", "grey", "Connecting...");
@@ -740,7 +726,7 @@ module.exports = (RED) => {
         }
       } catch (error) {
         if (node.sysLogger !== undefined && node.sysLogger !== null) {
-          node.sysLogger.error("KNXUltimate-config: Error in instantiating knxConnection " + error.message + " Node " + node.name);
+          node.sysLogger.error("KNXUltimate-config: Error in instantiating knxConnection " + error.stack + " Node " + node.name);
           node.error("KNXUltimate-config: Error in instantiating knxConnection " + error.message + " Node " + node.name);
         }
         node.linkStatus = "disconnected";
@@ -817,42 +803,41 @@ module.exports = (RED) => {
           node.nodeClients
             .filter((_input) => _input.notifywrite === true)
             .forEach((_input) => {
-              const input = RED.nodes.getNode(_input.id); // 05/04/2022 Get the real node
 
               // 19/03/2020 in the middle of coronavirus. Whole italy is red zone, closed down. Scene Controller implementation
-              if (input.hasOwnProperty("isSceneController")) {
+              if (_input.hasOwnProperty("isSceneController")) {
                 // 12/08/2020 Check wether is a learn (save) command or a activate (play) command.
-                if (_dest === input.topic || _dest === input.topicSave) {
+                if (_dest === _input.topic || _dest === _input.topicSave) {
                   // Prepare the two messages to be evaluated directly into the Scene Controller node.
                   new Promise((resolve) => {
-                    if (_dest === input.topic) {
+                    if (_dest === _input.topic) {
                       try {
                         const msgRecall = buildInputMessage({
                           _srcGA: _src,
                           _destGA: _dest,
                           _event: _evt,
                           _Rawvalue: _rawValue,
-                          _inputDpt: input.dpt,
-                          _devicename: input.name ? input.name : "",
-                          _outputtopic: input.outputtopic,
+                          _inputDpt: _input.dpt,
+                          _devicename: _input.name ? _input.name : "",
+                          _outputtopic: _input.outputtopic,
                           _oNode: null,
                         });
-                        input.RecallScene(msgRecall.payload, false);
+                        _input.RecallScene(msgRecall.payload, false);
                       } catch (error) { }
                     } // 12/08/2020 Do NOT use "else", because both topics must be evaluated in case both recall and save have same group address.
-                    if (_dest === input.topicSave) {
+                    if (_dest === _input.topicSave) {
                       try {
                         const msgSave = buildInputMessage({
                           _srcGA: _src,
                           _destGA: _dest,
                           _event: _evt,
                           _Rawvalue: _rawValue,
-                          _inputDpt: input.dptSave,
-                          _devicename: input.name ? input.name : "",
+                          _inputDpt: _input.dptSave,
+                          _devicename: _input.name || "",
                           _outputtopic: _dest,
                           _oNode: null,
                         });
-                        input.SaveScene(msgSave.payload, false);
+                        _input.SaveScene(msgSave.payload, false);
                       } catch (error) { }
                     }
                     resolve(true); // fulfilled
@@ -864,9 +849,9 @@ module.exports = (RED) => {
                   // 19/03/2020 Check and Update value if the input is part of a scene controller
                   new Promise((resolve) => {
                     // Check and update the values of each device in the scene and update the rule array accordingly.
-                    for (let i = 0; i < input.rules.length; i++) {
+                    for (let i = 0; i < _input.rules.length; i++) {
                       // rule is { topic: rowRuleTopic, devicename: rowRuleDeviceName, dpt:rowRuleDPT, send: rowRuleSend}
-                      const oDevice = input.rules[i];
+                      const oDevice = _input.rules[i];
                       if (typeof oDevice !== "undefined" && oDevice.topic == _dest) {
                         const msg = buildInputMessage({
                           _srcGA: _src,
@@ -874,12 +859,12 @@ module.exports = (RED) => {
                           _event: _evt,
                           _Rawvalue: _rawValue,
                           _inputDpt: oDevice.dpt,
-                          _devicename: oDevice.name ? input.name : "",
+                          _devicename: oDevice.name || "",
                           _outputtopic: oDevice.outputtopic,
                           _oNode: null,
                         });
                         oDevice.currentPayload = msg.payload;
-                        input.setNodeStatus({
+                        _input.setNodeStatus({
                           fill: "grey",
                           shape: "dot",
                           text: "Update dev in scene",
@@ -897,24 +882,17 @@ module.exports = (RED) => {
                     .then(function () { })
                     .catch(function () { });
                 }
-              } else if (input.hasOwnProperty("isLogger")) {
+              } else if (_input.hasOwnProperty("isLogger")) {
                 // 26/03/2020 Coronavirus is slightly decreasing the affected numer of people. Logger Node
                 // 24/03/2021 Logger Node, i'll pass cemiETS
                 if (_cemiETS !== undefined) {
                   // new Promise((resolve, reject) => {
-                  input.handleSend(_cemiETS);
+                  _input.handleSend(_cemiETS);
                   //    resolve(true); // fulfilled
                   // reject("error"); // rejected
                   // }).then(function () { }).catch(function () { });
                 }
-              } else if (input.listenallga === true) {
-                // Get the GA from CVS
-                let oGA;
-                if (node.csv !== undefined) {
-                  try {
-                    oGA = node.csv.filter((sga) => sga.ga == _dest)[0];
-                  } catch (error) { }
-                }
+              } else if (_input.listenallga === true) {
 
                 // 25/10/2019 TRY TO AUTO DECODE IF Group address not found in the CSV
                 const msg = buildInputMessage({
@@ -922,23 +900,21 @@ module.exports = (RED) => {
                   _destGA: _dest,
                   _event: _evt,
                   _Rawvalue: _rawValue,
-                  _inputDpt: typeof oGA === "undefined" ? null : oGA.dpt,
-                  _devicename: typeof oGA === "undefined" ? input.name || "" : oGA.devicename,
                   _outputtopic: _dest,
-                  _oNode: input,
+                  _oNode: _input
                 });
-                input.setNodeStatus({
+                _input.setNodeStatus({
                   fill: "green",
                   shape: "dot",
-                  text: typeof oGA === "undefined" ? "Try to decode" : "",
+                  text: "",
                   payload: msg.payload,
                   GA: msg.knx.destination,
                   dpt: msg.knx.dpt,
                   devicename: msg.devicename,
                 });
-                input.handleSend(msg);
-              } else if (input.topic == _dest) {
-                if (input.hasOwnProperty("isWatchDog")) {
+                _input.handleSend(msg);
+              } else if (_input.topic == _dest) {
+                if (_input.hasOwnProperty("isWatchDog")) {
                   // 04/02/2020 Watchdog implementation
                   // Is a watchdog node
                 } else {
@@ -947,14 +923,14 @@ module.exports = (RED) => {
                     _destGA: _dest,
                     _event: _evt,
                     _Rawvalue: _rawValue,
-                    _inputDpt: input.dpt,
-                    _devicename: input.name ? input.name : "",
-                    _outputtopic: input.outputtopic,
-                    _oNode: input,
+                    _inputDpt: _input.dpt,
+                    _devicename: _input.name ? _input.name : "",
+                    _outputtopic: _input.outputtopic,
+                    _oNode: _input,
                   });
                   // Check RBE INPUT from KNX Bus, to avoid send the payload to the flow, if it's equal to the current payload
-                  if (!checkRBEInputFromKNXBusAllowSend(input, msg.payload)) {
-                    input.setNodeStatus({
+                  if (!checkRBEInputFromKNXBusAllowSend(_input, msg.payload)) {
+                    _input.setNodeStatus({
                       fill: "grey",
                       shape: "ring",
                       text: "rbe block (" + msg.payload + ") from KNX",
@@ -965,18 +941,18 @@ module.exports = (RED) => {
                     });
                     return;
                   }
-                  msg.previouspayload = typeof input.currentPayload !== "undefined" ? input.currentPayload : ""; // 24/01/2020 Added previous payload
-                  input.currentPayload = msg.payload; // Set the current value for the RBE input
-                  input.setNodeStatus({
+                  msg.previouspayload = typeof _input.currentPayload !== "undefined" ? _input.currentPayload : ""; // 24/01/2020 Added previous payload
+                  _input.currentPayload = msg.payload; // Set the current value for the RBE input
+                  _input.setNodeStatus({
                     fill: "green",
                     shape: "dot",
                     text: "",
                     payload: msg.payload,
-                    GA: input.topic,
-                    dpt: input.dpt,
+                    GA: _input.topic,
+                    dpt: _input.dpt,
                     devicename: "",
                   });
-                  input.handleSend(msg);
+                  _input.handleSend(msg);
                 }
               }
             });
@@ -987,64 +963,56 @@ module.exports = (RED) => {
           node.nodeClients
             .filter((_input) => _input.notifyresponse === true)
             .forEach((_input) => {
-              const input = RED.nodes.getNode(_input.id); // 05/04/2022 Get the real node
 
-              if (input.hasOwnProperty("isLogger")) {
+              if (_input.hasOwnProperty("isLogger")) {
                 // 26/03/2020 Coronavirus is slightly decreasing the affected numer of people. Logger Node
                 // 24/03/2021 Logger Node, i'll pass cemiETS
                 if (_cemiETS !== undefined) {
                   // new Promise((resolve, reject) => {
-                  input.handleSend(_cemiETS);
+                  _input.handleSend(_cemiETS);
                   //    resolve(true); // fulfilled
                   // reject("error"); // rejected
                   // }).then(function () { }).catch(function () { });
                 }
-              } else if (input.listenallga === true) {
-                // Get the DPT
-                let oGA;
-                try {
-                  oGA = node.csv.filter((sga) => sga.ga == _dest)[0];
-                } catch (error) { }
+              } else if (_input.listenallga === true) {
 
                 const msg = buildInputMessage({
                   _srcGA: _src,
                   _destGA: _dest,
                   _event: _evt,
                   _Rawvalue: _rawValue,
-                  _inputDpt: typeof oGA === "undefined" ? null : oGA.dpt,
-                  _devicename: typeof oGA === "undefined" ? input.name || "" : oGA.devicename,
                   _outputtopic: _dest,
-                  _oNode: input,
+                  _oNode: _input
                 });
-                input.setNodeStatus({
+                _input.setNodeStatus({
                   fill: "blue",
                   shape: "dot",
-                  text: typeof oGA === "undefined" ? "Try to decode" : "",
+                  text: "",
                   payload: msg.payload,
                   GA: msg.knx.destination,
                   dpt: msg.knx.dpt,
                   devicename: msg.devicename,
                 });
-                input.handleSend(msg);
-              } else if (input.topic === _dest) {
+                _input.handleSend(msg);
+              } else if (_input.topic === _dest) {
                 // 04/02/2020 Watchdog implementation
-                if (input.hasOwnProperty("isWatchDog")) {
+                if (_input.hasOwnProperty("isWatchDog")) {
                   // Is a watchdog node
-                  input.watchDogTimerReset();
+                  _input.watchDogTimerReset();
                 } else {
                   const msg = buildInputMessage({
                     _srcGA: _src,
                     _destGA: _dest,
                     _event: _evt,
                     _Rawvalue: _rawValue,
-                    _inputDpt: input.dpt,
-                    _devicename: input.name ? input.name : "",
-                    _outputtopic: input.outputtopic,
-                    _oNode: input,
+                    _inputDpt: _input.dpt,
+                    _devicename: _input.name ? _input.name : "",
+                    _outputtopic: _input.outputtopic,
+                    _oNode: _input,
                   });
                   // Check RBE INPUT from KNX Bus, to avoid send the payload to the flow, if it's equal to the current payload
-                  if (!checkRBEInputFromKNXBusAllowSend(input, msg.payload)) {
-                    input.setNodeStatus({
+                  if (!checkRBEInputFromKNXBusAllowSend(_input, msg.payload)) {
+                    _input.setNodeStatus({
                       fill: "grey",
                       shape: "ring",
                       text: "rbe INPUT filter applied on " + msg.payload,
@@ -1053,18 +1021,18 @@ module.exports = (RED) => {
                     });
                     return;
                   }
-                  msg.previouspayload = typeof input.currentPayload !== "undefined" ? input.currentPayload : ""; // 24/01/2020 Added previous payload
-                  input.currentPayload = msg.payload; // Set the current value for the RBE input
-                  input.setNodeStatus({
+                  msg.previouspayload = typeof _input.currentPayload !== "undefined" ? _input.currentPayload : ""; // 24/01/2020 Added previous payload
+                  _input.currentPayload = msg.payload; // Set the current value for the RBE input
+                  _input.setNodeStatus({
                     fill: "blue",
                     shape: "dot",
                     text: "",
                     payload: msg.payload,
-                    GA: input.topic,
+                    GA: _input.topic,
                     dpt: msg.knx.dpt,
                     devicename: msg.devicename,
                   });
-                  input.handleSend(msg);
+                  _input.handleSend(msg);
                 }
               }
             });
@@ -1074,25 +1042,19 @@ module.exports = (RED) => {
           node.nodeClients
             .filter((_input) => _input.notifyreadrequest === true)
             .forEach((_input) => {
-              const input = RED.nodes.getNode(_input.id); // 05/04/2022 Get the real node
 
-              if (input.hasOwnProperty("isLogger")) {
+              if (_input.hasOwnProperty("isLogger")) {
                 // 26/03/2020 Coronavirus is slightly decreasing the affected numer of people. Logger Node
                 // if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info("BANANA isLogger", _evt, _src, _dest, _rawValue, _cemiETS);
                 // 24/03/2021 Logger Node, i'll pass cemiETS
                 if (_cemiETS !== undefined) {
                   // new Promise((resolve, reject) => {
-                  input.handleSend(_cemiETS);
+                  _input.handleSend(_cemiETS);
                   //    resolve(true); // fulfilled
                   // reject("error"); // rejected
                   // }).then(function () { }).catch(function () { });
                 }
-              } else if (input.listenallga === true) {
-                // Get the DPT
-                let oGA;
-                try {
-                  oGA = node.csv.filter((sga) => sga.ga == _dest)[0];
-                } catch (error) { }
+              } else if (_input.listenallga === true) {
 
                 // Read Request
                 const msg = buildInputMessage({
@@ -1100,12 +1062,10 @@ module.exports = (RED) => {
                   _destGA: _dest,
                   _event: _evt,
                   _Rawvalue: null,
-                  _inputDpt: typeof oGA === "undefined" ? null : oGA.dpt,
-                  _devicename: typeof oGA === "undefined" ? input.name || "" : oGA.devicename,
                   _outputtopic: _dest,
-                  _oNode: input,
+                  _oNode: _input
                 });
-                input.setNodeStatus({
+                _input.setNodeStatus({
                   fill: "grey",
                   shape: "dot",
                   text: "Read",
@@ -1114,10 +1074,10 @@ module.exports = (RED) => {
                   dpt: msg.knx.dpt,
                   devicename: msg.devicename,
                 });
-                input.handleSend(msg);
-              } else if (input.topic === _dest) {
+                _input.handleSend(msg);
+              } else if (_input.topic === _dest) {
                 // 04/02/2020 Watchdog implementation
-                if (input.hasOwnProperty("isWatchDog")) {
+                if (_input.hasOwnProperty("isWatchDog")) {
                   // Is a watchdog node
                 } else {
                   // Read Request
@@ -1126,62 +1086,62 @@ module.exports = (RED) => {
                     _destGA: _dest,
                     _event: _evt,
                     _Rawvalue: null,
-                    _inputDpt: input.dpt,
-                    _devicename: input.name ? input.name : "",
-                    _outputtopic: input.outputtopic,
-                    _oNode: input,
+                    _inputDpt: _input.dpt,
+                    _devicename: _input.name || "",
+                    _outputtopic: _input.outputtopic,
+                    _oNode: _input,
                   });
-                  msg.previouspayload = typeof input.currentPayload !== "undefined" ? input.currentPayload : ""; // 24/01/2020 Reset previous payload
+                  msg.previouspayload = typeof _input.currentPayload !== "undefined" ? _input.currentPayload : ""; // 24/01/2020 Reset previous payload
                   // 24/09/2019 Autorespond to BUS
-                  if (input.hasOwnProperty("notifyreadrequestalsorespondtobus") && input.notifyreadrequestalsorespondtobus === true) {
-                    if (typeof input.currentPayload === "undefined" || input.currentPayload === "" || input.currentPayload === null) {
+                  if (_input.hasOwnProperty("notifyreadrequestalsorespondtobus") && _input.notifyreadrequestalsorespondtobus === true) {
+                    if (typeof _input.currentPayload === "undefined" || _input.currentPayload === "" || _input.currentPayload === null) {
                       // 14/08/2021 Added || input.currentPayload === null
                       node.writeQueueAdd({
                         grpaddr: _dest,
-                        payload: input.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized,
-                        dpt: input.dpt,
+                        payload: _input.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized,
+                        dpt: _input.dpt,
                         outputtype: "response",
-                        nodecallerid: input.id,
+                        nodecallerid: _input.id,
                       });
-                      input.setNodeStatus({
+                      _input.setNodeStatus({
                         fill: "blue",
                         shape: "ring",
                         text: "Read & Autorespond with default",
-                        payload: input.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized,
-                        GA: input.topic,
+                        payload: _input.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized,
+                        GA: _input.topic,
                         dpt: msg.knx.dpt,
                         devicename: "",
                       });
                     } else {
                       node.writeQueueAdd({
                         grpaddr: _dest,
-                        payload: input.currentPayload,
-                        dpt: input.dpt,
+                        payload: _input.currentPayload,
+                        dpt: _input.dpt,
                         outputtype: "response",
-                        nodecallerid: input.id,
+                        nodecallerid: _input.id,
                       });
-                      input.setNodeStatus({
+                      _input.setNodeStatus({
                         fill: "blue",
                         shape: "ring",
                         text: "Read & Autorespond with default",
-                        payload: input.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized,
-                        GA: input.topic,
+                        payload: _input.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized,
+                        GA: _input.topic,
                         dpt: msg.knx.dpt,
                         devicename: "",
                       });
                     }
                   } else {
-                    input.setNodeStatus({
+                    _input.setNodeStatus({
                       fill: "grey",
                       shape: "dot",
                       text: "Read",
                       payload: msg.payload,
-                      GA: input.topic,
+                      GA: _input.topic,
                       dpt: msg.knx.dpt,
                       devicename: "",
                     });
                   }
-                  input.handleSend(msg);
+                  _input.handleSend(msg);
                 }
               }
             });
@@ -1221,12 +1181,12 @@ module.exports = (RED) => {
         }
 
         // 26/12/2021 If the KNXEngine is busy waiting for telegram's ACK, exit
-        if (!node.knxConnection._getClearToSend()) {
+        if (!node.knxConnection.clearToSend) {
           node.lockHandleTelegramQueue = false; // Unlock the function
           if (node.telegramsQueue.length > 0) {
             if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.warn(
               "knxUltimate-config: handleTelegramQueue: the KNXEngine is busy or is waiting for a telegram ACK with seqNumner " +
-              node.knxConnection._getSeqNumber() +
+              node.knxConnection.getSeqNumber() +
               ". Delay handling queue.",
             );
           }
@@ -1291,7 +1251,6 @@ module.exports = (RED) => {
           //   }
           try {
             node.nodeClients.forEach((_input) => {
-              const input = RED.nodes.getNode(_input.id); // 05/04/2022 Get the real node
 
               // 16/08/2021 If not connected, exit
               if (node.linkStatus !== "connected") {
@@ -1300,25 +1259,25 @@ module.exports = (RED) => {
               }
 
               // 19/03/2020 in the middle of coronavirus. Whole italy is red zone, closed down. Scene Controller implementation
-              if (input.hasOwnProperty("isSceneController")) {
-              } else if (input.hasOwnProperty("isLogger")) {
+              if (_input.hasOwnProperty("isSceneController")) {
+              } else if (_input.hasOwnProperty("isLogger")) {
                 // 26/03/2020 Coronavirus is slightly decreasing the affected numer of people. Logger Node
-              } else if (input.listenallga === true) {
-              } else if (input.topic == oKNXMessage.grpaddr) {
-                if (input.hasOwnProperty("isWatchDog")) {
+              } else if (_input.listenallga === true) {
+              } else if (_input.topic == oKNXMessage.grpaddr) {
+                if (_input.hasOwnProperty("isWatchDog")) {
                   // 04/02/2020 Watchdog implementation
                   // Is a watchdog node
                 } else {
                   const msg = {
-                    topic: input.outputtopic,
+                    topic: _input.outputtopic,
                     payload: oKNXMessage.payload,
-                    devicename: input.name ? input.name : "",
+                    devicename: _input.name ? _input.name : "",
                     event: "Update_NoWrite",
                     eventdesc: "The value has been updated from another node and hasn't been received from KNX BUS",
                   };
                   // Check RBE INPUT from KNX Bus, to avoid send the payload to the flow, if it's equal to the current payload
-                  if (!checkRBEInputFromKNXBusAllowSend(input, msg.payload)) {
-                    input.setNodeStatus({
+                  if (!checkRBEInputFromKNXBusAllowSend(_input, msg.payload)) {
+                    _input.setNodeStatus({
                       fill: "grey",
                       shape: "ring",
                       text: "rbe block (" + msg.payload + ") from KNX",
@@ -1330,18 +1289,18 @@ module.exports = (RED) => {
                     node.lockHandleTelegramQueue = false; // Unlock the function
                     return;
                   }
-                  msg.previouspayload = typeof input.currentPayload !== "undefined" ? input.currentPayload : ""; // 24/01/2020 Added previous payload
-                  input.currentPayload = msg.payload; // Set the current value for the RBE input
-                  input.setNodeStatus({
+                  msg.previouspayload = typeof _input.currentPayload !== "undefined" ? _input.currentPayload : ""; // 24/01/2020 Added previous payload
+                  _input.currentPayload = msg.payload; // Set the current value for the RBE input
+                  _input.setNodeStatus({
                     fill: "green",
                     shape: "dot",
                     text: "",
                     payload: msg.payload,
-                    GA: input.topic,
-                    dpt: input.dpt,
+                    GA: _input.topic,
+                    dpt: _input.dpt,
                     devicename: "",
                   });
-                  input.handleSend(msg);
+                  _input.handleSend(msg);
                 }
               }
             });
@@ -1353,6 +1312,9 @@ module.exports = (RED) => {
           } catch (error) {
             try {
               const oNode = RED.nodes.getNode(oKNXMessage.nodecallerid); // 05/04/2022 Get the real node
+              if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error(
+                "knxUltimate-config: node.knxConnection.write: Payload: " + oKNXMessage.payload + " GA:" + oKNXMessage.grpaddr + " DPT:" + oKNXMessage.dpt + " " + error.stack
+              );
               oNode.setNodeStatus({
                 fill: "red",
                 shape: "dot",
@@ -1424,12 +1386,53 @@ module.exports = (RED) => {
       }
     }
 
+
     function buildInputMessage({ _srcGA, _destGA, _event, _Rawvalue, _inputDpt, _devicename, _outputtopic, _oNode }) {
       let sPayloadmeasureunit = "unknown";
       let sDptdesc = "unknown";
       let sPayloadsubtypevalue = "unknown";
       let jsValue = null;
       let sInputDpt = "unknown";
+      let gainfo = "unknown";
+      let oGA;
+
+      // Construct the gainfo from _devicename ("(Ingressi logici->Sensori) Camera armadi lux")
+      if (node.csv !== undefined) {
+        try {
+          oGA = node.csv.filter((sga) => sga.ga == _destGA)[0];
+          const regexGA = /^(.*)\/(.*)\/(.*)$/;
+          const regexName = /^\((.*)->(.*)\) (.*)$/;
+          const matchGA = oGA.ga.match(regexGA);
+          const matchName = oGA.devicename.match(regexName);
+          gainfo = {
+            maingroupname: matchName[1],
+            middlegroupname: matchName[2],
+            ganame: matchName[3],
+            maingroupnumber: matchGA[1],
+            middlegroupnumber: matchGA[2],
+            ganumber: matchGA[3]
+          }
+        } catch (error) {
+          // Dont' care
+        }
+      }
+
+      // 20/06/2024 set both if undefined
+      if (_inputDpt === undefined) {
+        try {
+          _inputDpt = oGA === undefined ? null : oGA.dpt;
+        } catch (error) {
+          _inputDpt = null;
+        }
+
+      }
+      if (_devicename === undefined) {
+        try {
+          _devicename = oGA === undefined ? _oNode.name || "" : oGA.devicename;
+        } catch (error) {
+          _devicename = undefined;
+        }
+      }
 
       const errorMessage = {
         topic: _outputtopic,
@@ -1440,7 +1443,6 @@ module.exports = (RED) => {
         knx: {
           event: _event,
           dpt: "unknown",
-          //, details: dpt
           dptdesc: "",
           source: _srcGA,
           destination: _destGA,
@@ -1567,6 +1569,7 @@ module.exports = (RED) => {
             }
           }
         }
+
       } else {
         // Don't care, it's a READ REQUEST
       }
@@ -1579,15 +1582,15 @@ module.exports = (RED) => {
           payload: jsValue,
           payloadmeasureunit: sPayloadmeasureunit,
           payloadsubtypevalue: sPayloadsubtypevalue,
+          gainfo: gainfo,
           knx: {
             event: _event,
             dpt: sInputDpt,
-            //, details: dpt
             dptdesc: sDptdesc,
             source: _srcGA,
             destination: _destGA,
-            rawValue: _Rawvalue,
-          },
+            rawValue: _Rawvalue
+          }
         };
         // 11/11/2021 jsValue is null, as well as _Rawvalue, in case of READ REQUEST message.
         // if (jsValue !== null) finalMessage.payload = jsValue;
@@ -1884,7 +1887,7 @@ module.exports = (RED) => {
       }
     }, 4000);
 
-    node.Disconnect = (_sNodeStatus = "", _sColor = "grey") => {
+    node.Disconnect = async (_sNodeStatus = "", _sColor = "grey") => {
       if (node.linkStatus === "disconnected") {
         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Disconnect: already not connected:" + node.linkStatus + ", node.autoReconnect:" + node.autoReconnect);
         return;
@@ -1894,7 +1897,7 @@ module.exports = (RED) => {
       node.lockHandleTelegramQueue = false; // Unlock the telegram handling function
       if (node.timerDoInitialRead !== null) clearTimeout(node.timerDoInitialRead); // 17/02/2020 Stop the initial read timer
       try {
-        if (node.knxConnection !== null) node.knxConnection.Disconnect();
+        if (node.knxConnection !== null) await node.knxConnection.Disconnect();
       } catch (error) {
         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug(
           "knxUltimate-config: Disconnected: node.knxConnection.Disconnect() " + (error.message || "") + " , node.autoReconnect:" + node.autoReconnect,
@@ -1906,9 +1909,9 @@ module.exports = (RED) => {
       if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Disconnected, node.autoReconnect:" + node.autoReconnect);
     };
 
-    node.on("close", function (done) {
+    node.on("close", async function (done) {
       try {
-        node.Disconnect();
+        await node.Disconnect();
       } catch (error) { /* empty */ }
       if (node.timerClearTelegramQueue !== null) clearTimeout(node.timerClearTelegramQueue);
       node.telegramsQueue = [];