node-red-contrib-knx-ultimate 1.3.38 → 1.3.41

package/CHANGELOG.md

@@ -6,6 +6,27 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.3.41</b> - Mai 2022<br/>
+- Fixed an issue in the gateway config node UI, where you manually set the IP interface name.<br />
+- Fixed an issue introduced by a breaking change in Node 18.<br />
+- Added more "trace" log in the ipAddressHelper function, to better track the ethernet interface details.<br />
+</p>
+<p>
+<b>Version 1.3.40</b> - Mai 2022<br/>
+- Fixed an issue in the GlobalContext node, preventing the node from searching for the DPT, if the CSV ETS file has been imported and you don't specify the DPT in the msg input. Thanks to @Sebastien-Posca for pointing me out that.<br />
+</p>
+<p>
+<b>Version 1.3.39</b> - April 2022<br/>
+- Fixed an empty text in the KNX Alerter config node, about the Read States at start.<br/>
+- Fixed an improperly cleaned queue in the config node close function.<br/>
+- Fixed a possible issue in case of multiple disconnection from the KNX Bus in a short timeframe.<br/>
+- Fixed sending disconnection_request with a null connection_ID, in the KNX Engine.<br/>
+- Fixed re-sending per KNX Standards, of not ACKnowledged telegrams, not always working in some circumstances.<br/>
+- Protected some function with a try-catch.<br/>
+- Now the telegram handler function stops whenever the connection is lost and restart from fresh on connection.<br />
+- Optimized the retain mechanism of the queue handling, in case of shorttimed disconnections.<br />
+</p>
 <p>
 <b>Version 1.3.38</b> - April 2022<br/>
 - Memory footprint decreased.<br/>
@@ -13,7 +34,7 @@
 </p>
 <p>
 <b>Version 1.3.37</b> - April 2022<br/>
-- Changed: the KNX Gateway don't care anymore for ROUTING_LOST_MESSAGE and ROUTING_BUSY. Previously, it was disconnecting. Now it only advises in LOG.<br/>
+- Changed: the KNX Gateway Node don't care anymore for ROUTING_LOST_MESSAGE and ROUTING_BUSY. Previously, it was disconnecting. Now it only advises in LOG.<br/>
 - Updated and beautifullyfied the WIKI.<br/>
 - Totally rewrote the CIRCULAR REFERENCE PROTECTION and FLOOD PROTECTION wiki page, in all languages.<br/>
 </p>

package/KNXEngine/KNXClient.js

@@ -51,6 +51,7 @@ var KNXClientEvents;
     KNXClientEvents["ready"] = "ready";
     KNXClientEvents["response"] = "response";
     KNXClientEvents["connecting"] = "connecting";
+    KNXClientEvents["ackReceived"] = "ackReceived";
 })(KNXClientEvents || (KNXClientEvents = {}));
 
 // const KNXClientEvents = {
@@ -349,7 +350,8 @@ class KNXClient extends EventEmitter {
         } else {
             // Tunneling
             const cEMIMessage = CEMIFactory.CEMIFactory.newLDataRequestMessage("write", srcAddress, dstAddress, data);
-            cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+            //cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1; // No ack like telegram sent from ETS (0 means don't care)
+            cEMIMessage.control.ack = 0;// No ack like telegram sent from ETS (0 means don't care)
             cEMIMessage.control.broadcast = 1;
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
@@ -382,7 +384,7 @@ class KNXClient extends EventEmitter {
         if (this._options.hostProtocol === "Multicast") {
             // Multicast
             const cEMIMessage = CEMIFactory.CEMIFactory.newLDataIndicationMessage("response", srcAddress, dstAddress, data);
-            cEMIMessage.control.ack = 0;
+            cEMIMessage.control.ack = 0; // No ack like telegram sent from ETS (0 means don't care)
             cEMIMessage.control.broadcast = 1;
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
@@ -394,7 +396,8 @@ class KNXClient extends EventEmitter {
         } else {
             // Tunneling
             const cEMIMessage = CEMIFactory.CEMIFactory.newLDataRequestMessage("response", srcAddress, dstAddress, data);
-            cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+            //cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+            cEMIMessage.control.ack = 0;// No ack like telegram sent from ETS (0 means don't care)
             cEMIMessage.control.broadcast = 1;
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
@@ -435,7 +438,8 @@ class KNXClient extends EventEmitter {
         } else {
             // Tunneling
             const cEMIMessage = CEMIFactory.CEMIFactory.newLDataRequestMessage("read", srcAddress, dstAddress, null);
-            cEMIMessage.control.ack = 0;// No ack like telegram sent from ETS
+             //cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+            cEMIMessage.control.ack = 0;// No ack like telegram sent from ETS (0 means don't care)
             cEMIMessage.control.broadcast = 1;
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
@@ -594,7 +598,10 @@ class KNXClient extends EventEmitter {
             }, 1000 * KNXConstants.KNX_CONSTANTS.CONNECT_REQUEST_TIMEOUT);
             this._awaitingResponseType = KNXConstants.KNX_CONSTANTS.CONNECT_RESPONSE;
             this._clientTunnelSeqNumber = -1;
-            this._sendConnectRequestMessage(new TunnelCRI.TunnelCRI(knxLayer));
+            try {
+                this._sendConnectRequestMessage(new TunnelCRI.TunnelCRI(knxLayer));
+            } catch (error) { }
+
 
         } else if (this._options.hostProtocol === "TunnelTCP") {
 
@@ -655,16 +662,26 @@ class KNXClient extends EventEmitter {
             }
         }, 1000 * KNXConstants.KNX_CONSTANTS.CONNECTIONSTATE_REQUEST_TIMEOUT);
         this._awaitingResponseType = KNXConstants.KNX_CONSTANTS.CONNECTIONSTATE_RESPONSE;
-        this._sendConnectionStateRequestMessage(this._channelID);
+        try {
+            this._sendConnectionStateRequestMessage(this._channelID);
+        } catch (error) { }
     }
     Disconnect() {
-        if (this._clientSocket == null) {
+        if (this._clientSocket === null) {
             throw new Error('No client socket defined');
         }
+        // 20/04/2022 this._channelID === null can happen when the KNX Gateway is already disconnected
+        if (this._channelID === null) {
+            throw new Error('KNX Socket is already disconnected');
+        }
         this.stopHeartBeat();
         this._connectionState = STATE.DISCONNECTING;
         this._awaitingResponseType = KNXConstants.KNX_CONSTANTS.DISCONNECT_RESPONSE;
-        this._sendDisconnectRequestMessage(this._channelID);
+        try {
+            this._sendDisconnectRequestMessage(this._channelID);
+        } catch (error) {
+        }
+
         // 12/03/2021 Set disconnected if not already set by DISCONNECT_RESPONSE sent from the IP Interface
         let t = setTimeout(() => { // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
             if (this._connectionState !== STATE.DISCONNECTED) this._setDisconnected("Forced call from KNXClient Disconnect() function, because the KNX Interface hasn't sent the DISCONNECT_RESPONSE in time.");
@@ -732,20 +749,27 @@ class KNXClient extends EventEmitter {
                 this._numFailedTelegramACK += 1;
                 if (this._numFailedTelegramACK > 2) {
                     this._numFailedTelegramACK = 0;
+                    // 08/04/2022 Emits the event informing that the last ACK has not been acknowledge.
+                    try {
+                        this.emit(KNXClientEvents.ackReceived, knxTunnelingRequest, false);
+                    } catch (error) {
+                    }
                     this._clearToSend = true;
                     this.emit(KNXClientEvents.error, timeoutErr);
+                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: _setTimerWaitingForACK: " + (timeoutErr.message || "Undef error") + " no ACK received. ABORT sending datagram with seqNumber " + this._getSeqNumber() + " from " + knxTunnelingRequest.cEMIMessage.srcAddress.toString() + " to " + knxTunnelingRequest.cEMIMessage.dstAddress.toString());
                 } else {
                     // 26/12/2021 // If no ACK received, resend the datagram once with the same sequence number
                     this._setTimerWaitingForACK(knxTunnelingRequest);
                     this.send(knxTunnelingRequest);
-                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: _setTimerWaitingForACK: " + (timeoutErr.message || "Undef error") + " no ACK received. Retransmit datagram with seqNumber " + this._getSeqNumber());
+                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: _setTimerWaitingForACK: " + (timeoutErr.message || "Undef error") + " no ACK received. Retransmit datagram with seqNumber " + this._getSeqNumber() + " from " + knxTunnelingRequest.cEMIMessage.srcAddress.toString() + " to " + knxTunnelingRequest.cEMIMessage.dstAddress.toString());
                 }
             } catch (error) { }
         }, KNXConstants.KNX_CONSTANTS.TUNNELING_REQUEST_TIMEOUT * 1000);
 
     }
+
     _processInboundMessage(msg, rinfo) {
-        
+
         try {
             // Composing debug string
             try {
@@ -769,14 +793,14 @@ class KNXClient extends EventEmitter {
                 try {
                     this.emit(KNXClientEvents.error, new Error('ROUTING_LOST_MESSAGE'));
                     //this._setDisconnected("Routing Lost Message"); // 31/03/2022 Commented, because it doesn't matter. Non need to disconnect.
-                    return;
                 } catch (error) { }
+                return;
             } else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.ROUTING_BUSY) {
                 try {
                     this.emit(KNXClientEvents.error, new Error('ROUTING_BUSY'));
                     //this._setDisconnected("Routing Busy"); // 31/03/2022 Commented, because it doesn't matter. Non need to disconnect.
-                    return;
                 } catch (error) { }
+                return;
             }
 
             if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.SEARCH_RESPONSE) {
@@ -846,7 +870,10 @@ class KNXClient extends EventEmitter {
                 } catch (error) { }
 
                 this._connectionState = STATE.DISCONNECTING;
-                this._sendDisconnectResponseMessage(knxDisconnectRequest.channelID);
+                try {
+                    this._sendDisconnectResponseMessage(knxDisconnectRequest.channelID);
+                } catch (error) { }
+
                 // 12/03/2021 Added 1 sec delay.
                 let t = setTimeout(() => { // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
                     this._setDisconnected("Received KNX packet: DISCONNECT_REQUEST, ChannelID:" + this._channelID + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
@@ -856,8 +883,25 @@ class KNXClient extends EventEmitter {
 
                 const knxTunnelingRequest = knxMessage;
                 if (knxTunnelingRequest.channelID !== this._channelID) {
+                    try {
+                        this.sysLogger.debug("Received KNX packet: TUNNELING: L_DATA_IND, NOT FOR ME: MyChannelID:" + this._channelID + " ReceivedPacketChannelID: " + knxTunnelingRequest.channelID + " ReceivedPacketseqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                    } catch (error) { }
                     return;
                 }
+                // 26/12/2021 send the ACK if the server requestet that
+                // Then REMOVED, because some interfaces sets the "ack request" always to 0 even if it needs ack.
+                //if (knxMessage.cEMIMessage.control.ack){
+                //setTimeout(() => {
+                try {
+                    let knxTunnelAck = KNXProtocol.KNXProtocol.newKNXTunnelingACK(knxTunnelingRequest.channelID, knxTunnelingRequest.seqCounter, KNXConstants.KNX_CONSTANTS.E_NO_ERROR);
+                    this.send(knxTunnelAck);
+                } catch (error) {
+                    this.sysLogger.error("Received KNX packet: TUNNELING: L_DATA_IND, ERROR BUOLDING THE TUNNELINK ACK: " + error.message + " MyChannelID:" + this._channelID + " ReceivedPacketChannelID: " + knxTunnelingRequest.channelID + " ReceivedPacketseqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                }
+
+                //}, 20);
+
+                //}      
 
                 if (knxTunnelingRequest.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_IND) {
 
@@ -886,15 +930,8 @@ class KNXClient extends EventEmitter {
 
                 }
 
-                // 26/12/2021 send the ACK if the server requestet that
-                // Then REMOVED, because some interfaces sets the "ack request" always to 0 even if it needs ack.
-                //if (knxMessage.cEMIMessage.control.ack){
-                const knxTunnelAck = KNXProtocol.KNXProtocol.newKNXTunnelingACK(knxTunnelingRequest.channelID, knxTunnelingRequest.seqCounter, KNXConstants.KNX_CONSTANTS.E_NO_ERROR);
-                this.send(knxTunnelAck);
-                //}               
-
             } else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.TUNNELING_ACK) {
-                //const knxTunnelingAck =  lodash.cloneDeep(knxMessage);
+
                 const knxTunnelingAck = knxMessage;
                 if (knxTunnelingAck.channelID !== this._channelID) {
                     return;
@@ -906,10 +943,16 @@ class KNXClient extends EventEmitter {
 
                 // Check the received ACK sequence number
                 if (!this._options.suppress_ack_ldatareq) {
+
                     if (knxTunnelingAck.seqCounter === this._getSeqNumber()) {
                         if (this._timerWaitingForACK !== null) clearTimeout(this._timerWaitingForACK);
                         this._numFailedTelegramACK = 0; // 25/12/2021 clear the current ACK failed telegram number
                         this._clearToSend = true; // I'm ready to send a new datagram now
+                        // 08/04/2022 Emits the event informing that the last ACK has been acknowledge.
+                        try {
+                            this.emit(KNXClientEvents.ackReceived, knxMessage, true);
+                        } catch (error) {
+                        }
                         try {
                             if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING: DELETED_TUNNELING_ACK FROM PENDING ACK's, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingAck.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
                         } catch (error) { }
@@ -945,6 +988,8 @@ class KNXClient extends EventEmitter {
                         this.emit(KNXClientEvents.indication, knxRoutingInd, false);
                     } catch (error) {
                     }
+
+
                 }
                 else if (knxRoutingInd.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_CON) {
 
@@ -954,9 +999,6 @@ class KNXClient extends EventEmitter {
 
                 }
 
-            } else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.ROUTING_LOST_MESSAGE) {
-                // Multicast, ho perso il mondo dei messaggi
-
             } else {
                 if (knxHeader.service_type === this._awaitingResponseType) {
                     if (this._awaitingResponseType === KNXConstants.KNX_CONSTANTS.CONNECTIONSTATE_RESPONSE) {

package/KNXEngine/util/ipAddressHelper.js

@@ -3,16 +3,20 @@ const knxLog = require('../KnxLog');
 const os = require('os');
 
 //#region  "GET LOCAL INTERFACE PROPERTIES"
-const getIPv4Interfaces = function () {
+function getIPv4Interfaces () {
     // get the local address of the IPv4 interface we're going to use
     let candidateInterfaces = {}
     let interfaces = os.networkInterfaces()
     for (let iface in interfaces) {
         for (let key in interfaces[iface]) {
             let intf = interfaces[iface][key]
-            if (intf.family === 'IPv4' && !intf.internal) {
-                knxLog.get().trace('candidate interface: %s (%j)', iface, intf);
+            // 11/05/2022 Fixed a breaking change introduced by node 18 (https://nodejs.org/api/os.html#osnetworkinterfaces)
+            // In Node < 18, intf.family is a string "IPv4" or "IPv6", from node 18, is an integer, for example 4.
+            if (intf.family.toString().includes("4") && !intf.internal) { 
+                knxLog.get().trace('ipAddressHelper.js: Found suitable interface: %s (%j)', iface, intf);
                 candidateInterfaces[iface] = intf
+            } else {
+                knxLog.get().trace('ipAddressHelper.js: Found NOT suitable interface: %s (%j)', iface, intf);
             }
         }
     }
@@ -21,7 +25,8 @@ const getIPv4Interfaces = function () {
 }
 
 exports.getLocalAddress = function (_interface = "") {
-    let candidateInterfaces = getIPv4Interfaces()
+    knxLog.get().trace("ipAddressHelper.js: getLocalAddress: getting interfaces");
+    let candidateInterfaces = getIPv4Interfaces();
     // if user has declared a desired interface then use it
     if (_interface !== "") {
         if (!candidateInterfaces.hasOwnProperty(_interface)) {

package/nodes/knxUltimate-config.html

@@ -278,6 +278,10 @@
         </label>
         <select id="node-config-input-KNXEthInterface"></select>
     </div>
+    <div class="form-row" id="divKNXEthInterfaceManuallyInput" style="display: none;">
+        <label for="node-config-input-KNXEthInterfaceManuallyInput">Interface name:</label>
+        <input type="text" id="node-config-input-KNXEthInterfaceManuallyInput" placeholder="Interface name, ex: eth0 or ens1 or Ethernet 1 and so on..."></input>
+    </div>
     <div class="form-row">
         <label for="node-config-input-autoReconnect" style="width: 200px">
             <i class="fa fa-plug"></i>
@@ -288,10 +292,7 @@
             <option value="no" data-i18n="knxUltimate-config.properties.autoReconnect_no"></option>
         </select>
     </div>
-    <div class="form-row" id="divKNXEthInterfaceManuallyInput" style="display: none;">
-        <label for="node-config-input-KNXEthInterfaceManuallyInput"></label>
-        <input type="text" id="node-config-input-KNXEthInterfaceManuallyInput" placeholder="Interface name, ex: eth0 or ens1 or Ethernet 1 and so on..."></input>
-    </div>
+    
     <div id="advancedOptionsAccordion">
         <h3><span data-i18n="knxUltimate-config.properties.adv_options"></span></h3>
         <div>
@@ -392,16 +393,10 @@
                 <span data-i18n="knxUltimate-config.ets.description"></span>
             </div>
             <div class="form-row">
-                <i class="fa fa-link"></i>
-                <a href="https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/1.-Gateway-configuration" target="_blank">
-                    <span data-i18n="knxUltimate-config.ets.instruction"></span>
-                </a>
+                <span style="color:red" data-i18n="[html]knxUltimate-config.ets.instruction"></span>
             </div>
             <div class="form-row">
-                <i class="fa fa-youtube"></i>
-                <a href="https://youtu.be/egRbR_KwP9I" target="_blank">
-                    <span data-i18n="knxUltimate-config.ets.youtube"></span>
-                </a>
+                <span style="color:red" data-i18n="[html]knxUltimate-config.ets.youtube"></span>                
             </div>
             <div class="form-row">
                 <label style="width:auto" for="node-config-input-stopETSImportIfNoDatapoint">

package/nodes/knxUltimate-config.js

@@ -130,8 +130,8 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
         node.statusDisplayDeviceNameWhenALL = typeof config.statusDisplayDeviceNameWhenALL === "undefined" ? false : config.statusDisplayDeviceNameWhenALL;
         node.statusDisplayDataPoint = typeof config.statusDisplayDataPoint === "undefined" ? false : config.statusDisplayDataPoint;
         node.telegramsQueue = [];  // 02/01/2020 Queue containing telegrams 
-        node.timerSendTelegramFromQueue;
-        node.delaybetweentelegramsfurtherdelayREAD = (typeof config.delaybetweentelegramsfurtherdelayREAD === "undefined" || config.delaybetweentelegramsfurtherdelayREAD < 1) ? 1 : config.delaybetweentelegramsfurtherdelayREAD; // 18/05/2020 delay multiplicator only for "read" telegrams.
+        node.timerSendTelegramFromQueue = null;
+        node.delaybetweentelegramsfurtherdelayREAD = (typeof config.delaybetweentelegramsfurtherdelayREAD === "undefined" || Number(config.delaybetweentelegramsfurtherdelayREAD < 1)) ? 1 : Number(config.delaybetweentelegramsfurtherdelayREAD); // 18/05/2020 delay multiplicator only for "read" telegrams.
         node.delaybetweentelegramsREADCount = 0;// 18/05/2020 delay multiplicator only for "read" telegrams.
         node.timerDoInitialRead = null; // 17/02/2020 Timer (timeout) to do initial read of all nodes requesting initial read, after all nodes have been registered to the sercer
         node.stopETSImportIfNoDatapoint = typeof config.stopETSImportIfNoDatapoint === "undefined" ? "stop" : config.stopETSImportIfNoDatapoint; // 09/01/2020 Stop, Import Fake or Skip the import if a group address has unset datapoint
@@ -431,6 +431,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
 
         // 16/02/2020 KNX-Ultimate nodes calls this function, then this funcion calls the same function on the Watchdog
         node.reportToWatchdogCalledByKNXUltimateNode = (_oError) => {
+            // _oError is = { nodeid: node.id, topic: node.outputtopic, devicename: devicename, GA: GA, text: text };
             var readHistory = [];
             let delay = 0;
             node.nodeClients
@@ -441,18 +442,6 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                 })
         }
 
-        node.Disconnect = () => {
-            if (node.timerDoInitialRead !== null) clearTimeout(node.timerDoInitialRead); // 17/02/2020 Stop the initial read timer
-            try {
-                if (node.knxConnection !== null) node.knxConnection.Disconnect();
-            } catch (error) { }
-
-            node.startTimerClearTelegramQueue(); // 21/01/2022 Clear the telegram queue after a while
-            node.setAllClientsStatus("Disconnected", "grey", "")
-            node.linkStatus = "disconnected"; // 29/08/2019 signal disconnection
-
-            saveExposedGAs(); // 04/04/2021 save the current values of GA payload
-        }
 
         // node.addClient = (_Node) => {
         //     // Check if node already exists
@@ -790,14 +779,11 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error("knxUltimate-config: received KNXClientEvents.error: " + (err.message === undefined ? err : err.message));
                     } catch (error) { }
                     // 31/03/2022 Don't care about some errors
-                    if (err.message !== undefined && err.message === "ROUTING_LOST_MESSAGE") {
-                        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Don't care about KNXClientEvents.error: " + (err.message === undefined ? err : err.message));
+                    if (err.message !== undefined && (err.message === "ROUTING_LOST_MESSAGE" || err.message === "ROUTING_BUSY")) {
+                        if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error("knxUltimate-config: KNXClientEvents.error: " + (err.message === undefined ? err : err.message) + " consider DECREASING the transmission speed, by increasing the telegram's DELAY in the gateway configuration node!");
                         return;
                     }
-                    saveExposedGAs(); // 13/12/2021 save the current values of GA payload
-                    node.startTimerClearTelegramQueue(); // 21/01/2022 Clear the telegram queue after a while
-                    node.linkStatus = "disconnected";
-                    node.setAllClientsStatus("Disconnected by error " + (err.message === undefined ? err : err.message), "red", "");
+                    node.Disconnect("Disconnected by error " + (err.message === undefined ? err : err.message), "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.
@@ -806,13 +792,11 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                 //     discoverCB(ip, port);
                 // });
                 node.knxConnection.on(knx.KNXClient.KNXClientEvents.disconnected, info => {
-                    saveExposedGAs(); // 13/12/2021 save the current values of GA payload
                     node.startTimerClearTelegramQueue(); // 21/01/2022 Clear the telegram queue after a while
                     if (node.linkStatus !== "disconnected") {
                         node.linkStatus = "disconnected";
-                        node.setAllClientsStatus("Disconnected by event: " + info || "", "red", "");
                         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.warn("knxUltimate-config: Disconnected event %s", info);
-                        node.Disconnect(); // 11/03/2022
+                        node.Disconnect("Disconnected by event: " + info || "", "red"); // 11/03/2022
                     }
                 });
                 node.knxConnection.on(knx.KNXClient.KNXClientEvents.close, info => {
@@ -823,7 +807,11 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                         clearTimeout(node.timerClearTelegramQueue); // Connected. Stop the timer that clears the telegrams queue.
                         node.timerClearTelegramQueue = null;
                     }
+                    // 12/11/2021 Starts the telegram out queue handler
+                    if (node.timerSendTelegramFromQueue !== null) clearInterval(node.timerSendTelegramFromQueue);
+                    node.timerSendTelegramFromQueue = setInterval(handleTelegramQueue, (config.delaybetweentelegrams === undefined || Number(config.delaybetweentelegrams) < 20) ? 20 : Number(config.delaybetweentelegrams)); // 02/01/2020 Start the timer that handles the queue of telegrams
                     node.linkStatus = "connected";
+
                     // Start the timer to do initial read.
                     if (node.timerDoInitialRead !== null) clearTimeout(node.timerDoInitialRead);
                     node.timerDoInitialRead = setTimeout(DoInitialReadFromKNXBusOrFile, 6000); // 17/02/2020 Do initial read of all nodes requesting initial read
@@ -834,8 +822,6 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                 });
                 node.knxConnection.on(knx.KNXClient.KNXClientEvents.connecting, info => {
                     node.linkStatus = "connecting";
-                    // Start the timer to do initial read.
-                    if (node.timerDoInitialRead !== null) clearTimeout(node.timerDoInitialRead);
                     if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Connecting to" + info.ipAddr || "");
                     node.setAllClientsStatus(info.ipAddr || "", "grey", "Connecting...")
                 });
@@ -1489,21 +1475,6 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
         };
 
 
-        node.on("close", function (done) {
-            if (node.timerSendTelegramFromQueue !== undefined) clearInterval(node.timerSendTelegramFromQueue); // 02/01/2020 Stop queue timer
-            node.lockHandleTelegramQueue = false; // Unlock the telegram handling function
-
-            saveExposedGAs(); // 04/04/2021 save the current values of GA payload
-            node.nodeClients = []; // 05/04/2023 Nullify
-            try {
-                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.destroy();
-            } catch (error) { }
-            try {
-                node.Disconnect();
-            } catch (error) { }
-            done();
-        })
-
         function readCSV(_csvText) {
             // 24/02/2020, in the middle of Coronavirus emergency in Italy. Check if it a CSV ETS Export of group addresses, or if it's an EFS
             if (_csvText.split("\n")[0].toUpperCase().indexOf("\"") == -1) return readESF(_csvText);
@@ -1821,9 +1792,6 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
             } catch (error) { }
         }
 
-        // 12/11/2021 Starts the telegram out queue handler
-        if (node.timerSendTelegramFromQueue !== null) clearInterval(node.timerSendTelegramFromQueue);
-        node.timerSendTelegramFromQueue = setInterval(handleTelegramQueue, (config.delaybetweentelegrams === undefined || config.delaybetweentelegrams < 30) ? 30 : config.delaybetweentelegrams); // 02/01/2020 Start the timer that handles the queue of telegrams
 
         // 08/10/2021 Every xx seconds, i check if the connection is up and running
         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.info("KNXUltimate-config: Autoconnection: " + (node.autoReconnect === false ? "no." : "yes") + " Node " + node.name);
@@ -1835,7 +1803,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                 let t = setTimeout(() => { // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
                     node.setAllClientsStatus("Auto reconnect in progress...", "grey", "");
                 }, 100);
-                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Auto Reconect by timerKNXUltimateCheckState in progress. node.LinkStatus:" + node.linkStatus + ", node.autoReconnect:" + node.autoReconnect);
+                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Auto Reconect by timerKNXUltimateCheckState in progress. node.LinkStatus: " + node.linkStatus + ", node.autoReconnect:" + node.autoReconnect);
                 node.initKNXConnection();
                 return;
             }
@@ -1844,12 +1812,44 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                 let t = setTimeout(() => { // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
                     node.setAllClientsStatus("Next cycle will reconnect...", "grey", "");
                 }, 1000);
-                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Waiting next cycle to reconect. node.LinkStatus:" + node.linkStatus + ", node.autoReconnect:" + node.autoReconnect);
+                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Waiting next cycle to reconect. node.LinkStatus: " + node.linkStatus + ", node.autoReconnect:" + node.autoReconnect);
                 //node.initKNXConnection();
             }
         }, 10000);
 
+        node.Disconnect = (_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;
+            }
+            if (node.timerSendTelegramFromQueue !== null) clearInterval(node.timerSendTelegramFromQueue); // 02/01/2020 Stop queue timer
+            node.linkStatus = "disconnected"; // 29/08/2019 signal disconnection
+            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();
+            } catch (error) {
+                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Disconnected: node.knxConnection.Disconnect() " + (error.message || "") + " , node.autoReconnect:" + node.autoReconnect);
+            }
+            node.startTimerClearTelegramQueue(); // 21/01/2022 Clear the telegram queue after a while
+            node.setAllClientsStatus("Disconnected", _sColor, _sNodeStatus);
+            saveExposedGAs(); // 04/04/2021 save the current values of GA payload
+            if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.debug("knxUltimate-config: Disconnected, node.autoReconnect:" + node.autoReconnect);
+
+        }
 
+        node.on("close", function (done) {
+            try {
+                node.Disconnect();
+            } catch (error) { }
+            if (node.timerClearTelegramQueue !== null) clearTimeout(node.timerClearTelegramQueue);
+            node.telegramsQueue = [];
+            node.nodeClients = []; // 05/04/2023 Nullify
+            try {
+                if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.destroy();
+            } catch (error) { }
+            done();
+        })
 
     }
 

package/nodes/knxUltimate.js

@@ -51,7 +51,7 @@ module.exports = function (RED) {
             // 16/02/2020 signal errors to the server
             if (fill.toUpperCase() === "RED") {
                 if (node.server) {
-                    var oError = { nodeid: node.id, topic: node.outputtopic, devicename: devicename, GA: GA, text: text };
+                    let oError = { nodeid: node.id, topic: node.outputtopic, devicename: devicename, GA: GA, text: text };
                     node.server.reportToWatchdogCalledByKNXUltimateNode(oError);
                 };
             };

package/nodes/knxUltimateAlerter.html

@@ -210,12 +210,13 @@
 <br/>
 <br/>
 <dt><i class="fa fa-code-fork"></i>&nbsp; <span data-i18n="knxUltimateAlerter.other.sceneConfig"></dt>
+    <br/>
     <div class="form-row" id="divNode-input-initialreadGAInRules">
-        &nbsp;&nbsp;<label style="width:70%" for="node-input-initialreadGAInRules">
+        &nbsp;&nbsp;<label style="width:60%" for="node-input-initialreadGAInRules">
             <i class="fa fa-question-circle-o"></i>
             <span data-i18n="knxUltimateAlerter.properties.node-input-initialreadGAInRules"></span>
         </label>
-        <select style="width:100px" id="node-input-initialreadGAInRules">
+        <select style="width:30%" id="node-input-initialreadGAInRules">
             <option value="0" data-i18n="knxUltimateAlerter.properties.node-input-initialread0"></option>
             <option value="1" data-i18n="knxUltimateAlerter.properties.node-input-initialread1"></option>
         </select>

package/nodes/knxUltimateGlobalContext.js

@@ -92,7 +92,7 @@ module.exports = function (RED) {
                     }
 
                     // 13/09/2021 retrieve the datapoint if not specified
-                    if (!element.hasOwnProperty("dpt") || element.dpt !== undefined) {
+                    if (!element.hasOwnProperty("dpt") || element.dpt === undefined || element.dpt === "") {
                         try {
                             let sDPT = node.server.csv.find(item => item.ga === element.address).dpt;
                             element.dpt = sDPT;

package/nodes/knxUltimateSceneController.js

@@ -106,7 +106,7 @@ module.exports = function (RED) {
             // 16/02/2020 signal errors to the server
             if (fill.toUpperCase() == "RED") {
                 if (node.server) {
-                    var oError = { nodeid: node.id, topic: node.outputtopic, devicename: devicename, GA: GA, text: text };
+                    let oError = { nodeid: node.id, topic: node.outputtopic, devicename: devicename, GA: GA, text: text };
                     node.server.reportToWatchdogCalledByKNXUltimateNode(oError);
                 };
             };

package/nodes/knxUltimateWatchDog.js

@@ -48,7 +48,7 @@ module.exports = function (RED) {
             if (node.beatNumber > node.maxRetry) {
                 // Confirmed connection error    
                 node.beatNumber = 0; // Reset Counter
-               let msg = {
+                let msg = {
                     type: "BUSError",
                     checkPerformed: node.checkLevel,
                     nodeid: node.id,
@@ -102,7 +102,7 @@ module.exports = function (RED) {
         // 16/02/2020 This function is called by the knx-ultimate config node.
         node.signalNodeErrorCalledByConfigNode = _oError => {
             // Report an error from knx-ultimate node.
-            // var oError = {nodeid:node.id,topic:node.outputtopic,devicename:devicename,GA:GA,text:text};
+            // let oError = {nodeid:node.id,topic:node.outputtopic,devicename:devicename,GA:GA,text:text};
             let msg = {
                 type: "NodeError",
                 checkPerformed: "Self KNX-Ultimate node reporting a red color status",

package/nodes/locales/de/knxUltimate-config.json

@@ -46,8 +46,8 @@
         },
         "ets": {
             "description": "Sie können entweder eine ETS CSV-Gruppenadressliste oder eine ESF-Gruppenadressliste importieren. Bitte bevorzugen Sie die Adressliste der ETS CSV-Gruppe, da die Datenpunkte vollständiger sind.",
-            "instruction": "Klicken Sie hier, um Anweisungen zum Exportieren der Adressliste der ETS Gruppenadressen als CSV zu erhalten.",
-            "youtube": "Anleitung des ETS CSV Exports auf Youtube",
+            "instruction" : "&nbsp<i class=\"fa fa-question-circle\"></i>&nbsp<a target=\"_blank\" href=\"https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/de-1.-Gateway-configuration\"><u>Erlauterung ETS import.</u></a>",
+            "youtube" : "&nbsp<i class=\"fa fa-youtube-play\"></i>&nbsp<a target=\"_blank\" href=\"https://youtu.be/egRbR_KwP9I\"><u>Anleitung des ETS CSV Exports auf Youtube.</u></a>",
             "help_ga": "Wenn die Gruppenadresse keinen Datenpunkt hat...",
             "import_select_stop": "Beenden und abbruch des Imports",
             "import_select_fake": "Import mit einem gefälschten 1.001-Datenpunkt (nicht empfohlen)",

package/nodes/locales/de/knxUltimateAlerter.json

@@ -10,7 +10,8 @@
             "node-input-whentostart": "Starttyp des Alarmierungszyklus",
             "node-input-initialread": "Bei Verbindung/Wiederverbindung je Gerat-Wert lesen",
             "node-input-initialread0": "Nein",
-            "node-input-initialread1": "Lesen vom KNX-BUS"
+            "node-input-initialread1": "Lesen vom KNX-BUS",
+            "node-input-initialreadGAInRules": "Bei Verbindung/Wiederverbindung je Gerat-Wert lesen"
         },
         "selectlists": {
             "manualstart": "Starten den Alarmzyklus manuell über eine eingehende MSG",

package/nodes/locales/en-US/knxUltimate-config.json

@@ -43,8 +43,8 @@
         },
         "ets": {
             "description": "You can import either an ETS CSV group address list, or an ESF group address list. Please prefer the ETS CSV group address list, as the datapoints are more complete.",
-            "instruction": "Click for instruction on how to export ETS CSV group address list.",
-            "youtube": "See how to export the CSV on Youtube",
+            "instruction" : "&nbsp<i class=\"fa fa-question-circle\"></i>&nbsp<a target=\"_blank\" href=\"https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/1.-Gateway-configuration\"><u>Click for instruction on how to export ETS CSV group address list.</u></a>",
+            "youtube" : "&nbsp<i class=\"fa fa-youtube-play\"></i>&nbsp<a target=\"_blank\" href=\"https://youtu.be/egRbR_KwP9I\"><u>See how to export the CSV on Youtube.</u></a>",
             "help_ga": "If Group Address has no Datapoint",
             "import_select_stop": "Stop and abort import",
             "import_select_skip": "Skip the affected group address",

package/nodes/locales/en-US/knxUltimateAlerter.json

@@ -10,7 +10,8 @@
             "node-input-whentostart": "Alerting cycle start type",
             "node-input-initialread": "Read value of each device on connection/reconnect",
             "node-input-initialread0": "No",
-            "node-input-initialread1": "Read from KNX BUS"
+            "node-input-initialread1": "Read from KNX BUS",
+            "node-input-initialreadGAInRules": "Read states at start/reconnection"
         },
         "selectlists": {
             "manualstart": "Start alert cycle manually via incoming message",

package/nodes/locales/it/knxUltimate-config.json

@@ -46,8 +46,8 @@
         },
         "ets": {
             "description": "Puoi importare sia il file ETS in CSV, che ESF. Usa il CSV se possibile, perchè i datapoints sono più precisi.",
-            "instruction": "Clicca per vedere come si importa un file ETS CSV.",
-            "youtube": "Guarda come si esporta un file CSV su YouTube",
+            "instruction" : "&nbsp<i class=\"fa fa-question-circle\"></i>&nbsp<a target=\"_blank\" href=\"https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/it-1.-Gateway-configuration\"><u>Clicca per vedere come si importa un file ETS CSV.</u></a>",
+            "youtube" : "&nbsp<i class=\"fa fa-youtube-play\"></i>&nbsp<a target=\"_blank\" href=\"https://youtu.be/egRbR_KwP9I\"><u>Guarda come si esporta un file CSV su YouTube.</u></a>",
             "help_ga": "Se l'indirizzo di gruppo non ha datapoint",
             "import_select_stop": "Blocca ed annulla l'importazione",
             "import_select_skip": "Salta l'importazione dell'indirizzo di gruppo",

package/nodes/locales/it/knxUltimateAlerter.json

@@ -10,7 +10,8 @@
             "node-input-whentostart": "Modalità avvio allerta",
             "node-input-initialread": "Leggi il valore di ogni device alla connessione/riconnessione",
             "node-input-initialread0": "No",
-            "node-input-initialread1": "Leggi dal BUS KNX"
+            "node-input-initialread1": "Leggi dal BUS KNX",
+            "node-input-initialreadGAInRules": "Leggi stati alla connessione/riconnessione"
         },
         "selectlists": {
             "manualstart": "Avvia ciclo allerta manualmente tramite messaggio in ingresso",

package/nodes/locales/zh-CN/knxUltimate-config.json

@@ -42,8 +42,8 @@
         },
         "ets": {
             "description": "您可以导入 ETS CSV 组地址列表或 ESF 组地址列表。 请优先选择 ETS CSV 组地址列表，因为数据类型更完整.",
-            "instruction": "单击以获取有关如何导出 ETS CSV 组地址列表的说明.",
-            "youtube": "在Youtube上看怎么导入CSV文件",
+            "instruction" : "&nbsp<i class=\"fa fa-question-circle\"></i>&nbsp<a target=\"_blank\" href=\"https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/cn-1.-Gateway-configuration\"><u>单击以获取有关如何导出 ETS CSV 组地址列表的说明.</u></a>",
+            "youtube" : "&nbsp<i class=\"fa fa-youtube-play\"></i>&nbsp<a target=\"_blank\" href=\"https://youtu.be/egRbR_KwP9I\"><u>在Youtube上看怎么导入CSV文件.</u></a>",
             "help_ga": "如果组地址没有数据类型",
             "import_select_stop": "停止并且中断导入",
             "import_select_skip": "跳过受影响的组地址",

package/nodes/locales/zh-CN/knxUltimateAlerter.json

@@ -10,7 +10,8 @@
             "node-input-whentostart": "警报周期启动类型",
             "node-input-initialread": "在连接/重新连接时读取每个设备的值",
             "node-input-initialread0": "不使用",
-            "node-input-initialread1": "从KNX总线读取"
+            "node-input-initialread1": "从KNX总线读取",
+            "node-input-initialreadGAInRules": "Read states at start/reconnection"
         },
         "selectlists": {
             "manualstart": "通过传入消息手动启动警报周期",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "version": "1.3.38",
+  "version": "1.3.41",
   "description": "Control your KNX intallation via Node-Red! Single Node KNX IN/OUT with optional ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "mkdirp": "1.0.4",