node-red-contrib-knx-ultimate 1.3.10 → 1.3.14

package/CHANGELOG.md

@@ -4,6 +4,22 @@
 
 <br/>
 <p>
+<b>Version 1.3.14</b> - 26 December 2021<br/>
+- KNXEngine: ACK management: the not acknowledged message will be re-transmitted once, then the connection will be dropped, as per KNX specs.<br/>
+- KNXEngine: ACK management: the telegram's queue to be sent to the KNX BUS will be paused during the ACK waiting.<br/>
+- KNXEngine: Routing: now the routing_busy and routing_lost_messages telegrams sent by the KNX/IP Router are  handled.<br/>
+</p>
+<p>
+<b>Version 1.3.13</b> - 25 December 2021<br/>
+- KNXEngine: when in tunneling and suppress ACK request is disabled, the error is raised only after 3° failed ACK reception instead of 1°.<br/>
+- KNXEngine: at disconnection, delete all pending ACK requests timer.<br/>
+- Warning: if you've suppressed the ACK requests, in some cases the node cannot detect the disconnection. In this case, please use the KNX Watchdog to detect the disconnecitons and reconnect.<br/>
+</p>
+<p>
+<b>Version 1.3.12</b> - December 2021<br/>
+- KNX-Ultimate DEVICE node: added the validation of Group Address while deploy, with support for modern addressing up to 31/7/255.<br/>
+</p>
+<p>
 <b>Version 1.3.10</b> - December 2021<br/>
 - FIX: fixed a stupid "Disconnected by Message length mismatch 8/16" error due to a dumb find/replace error in the code.<br/>
 - Added some more log to help resolving issues.<br/>

package/KNXEngine/KNXClient.js

@@ -86,7 +86,7 @@ class KNXClient extends EventEmitter {
         }
 
         super();
-        this._clientTunnelSeqNumber = 0;
+        this._clientTunnelSeqNumber = -1;
         this._options = options;//Object.assign(optionsDefaults, options);
         this._options.connectionKeepAliveTimeout = KNXConstants.KNX_CONSTANTS.CONNECTION_ALIVE_TIME,
             this._localPort = null;
@@ -169,10 +169,11 @@ class KNXClient extends EventEmitter {
             });
         }
 
-        this._clientTunnelSeqNumber = 0;
+        this._clientTunnelSeqNumber = -1;
         this._channelID = null;
         this._connectionState = STATE.DISCONNECTED;
-        this._tunnelReqTimer = new Map();
+        this._tunnelReqTimer = null;
+        this._numFailedTelegramACK = 0; // 25/12/2021 Keep count of the failed tunnelig ACK telegrams
 
     }
     get channelID() {
@@ -239,6 +240,7 @@ class KNXClient extends EventEmitter {
         });
     }
     send(knxPacket) {
+
         // Logging
         if (this.sysLogger !== undefined && this.sysLogger !== null) {
             try {
@@ -341,9 +343,11 @@ class KNXClient extends EventEmitter {
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
             cEMIMessage.control.hopCount = 6;
+            this._incSeqNumber(); // 26/12/2021
             const seqNum = this._getSeqNumber();
             const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
-            if (!this._options.suppress_ack_ldatareq) this._setTimerAndCallback(knxPacketRequest);
+            if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
+            //if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("this._tunnelReqTimer "+ this._tunnelReqTimer.size);
             this.send(knxPacketRequest);
             // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
             try {
@@ -385,9 +389,10 @@ class KNXClient extends EventEmitter {
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
             cEMIMessage.control.hopCount = 6;
+            this._incSeqNumber(); // 26/12/2021
             const seqNum = this._getSeqNumber();
             const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
-            if (!this._options.suppress_ack_ldatareq) this._setTimerAndCallback(knxPacketRequest);
+            if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
             this.send(knxPacketRequest);
             // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
             try {
@@ -426,9 +431,10 @@ class KNXClient extends EventEmitter {
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
             cEMIMessage.control.hopCount = 6;
+            this._incSeqNumber(); // 26/12/2021
             const seqNum = this._getSeqNumber();
             const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
-            if (!this._options.suppress_ack_ldatareq) this._setTimerAndCallback(knxPacketRequest);
+            if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
             this.send(knxPacketRequest);
             // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
             try {
@@ -474,9 +480,10 @@ class KNXClient extends EventEmitter {
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
             cEMIMessage.control.hopCount = 6;
+            this._incSeqNumber(); // 26/12/2021
             const seqNum = this._getSeqNumber();
             const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
-            if (!this._options.suppress_ack_ldatareq) this._setTimerAndCallback(knxPacketRequest);
+            if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
             this.send(knxPacketRequest);
             // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
             try {
@@ -544,6 +551,8 @@ class KNXClient extends EventEmitter {
         }
 
         this._connectionState = STATE.CONNECTING;
+        this._numFailedTelegramACK = 0; // 25/12/2021 Reset the failed ACK counter
+        this._clearToSend = true; // 26/12/2021 allow to send
 
         if (this._timer !== null) clearTimeout(this._timer);
 
@@ -564,7 +573,7 @@ class KNXClient extends EventEmitter {
 
             }, 1000 * KNXConstants.KNX_CONSTANTS.CONNECT_REQUEST_TIMEOUT);
             this._awaitingResponseType = KNXConstants.KNX_CONSTANTS.CONNECT_RESPONSE;
-            this._clientTunnelSeqNumber = 0;
+            this._clientTunnelSeqNumber = -1;
             this._sendConnectRequestMessage(new TunnelCRI.TunnelCRI(knxLayer));
 
         } else if (this._options.hostProtocol === "TunnelTCP") {
@@ -582,12 +591,11 @@ class KNXClient extends EventEmitter {
                 if (conn._options.isSecureKNXEnabled) conn._sendSecureSessionRequestMessage(new TunnelCRI.TunnelCRI(knxLayer));
             });
 
-
         } else {
 
             // Multicast
             this._connectionState = STATE.CONNECTED;
-            this._clientTunnelSeqNumber = 0;
+            this._clientTunnelSeqNumber = -1;
             try {
                 this.emit(KNXClientEvents.connected, this._options);
             } catch (error) {
@@ -645,6 +653,7 @@ class KNXClient extends EventEmitter {
         if (this._timerTimeoutSendDisconnectRequestMessagetimer !== null) clearTimeout(this._timerTimeoutSendDisconnectRequestMessagetimer);
         this._timerTimeoutSendDisconnectRequestMessage = null;
         if (this._timer !== null) clearTimeout(this._timer);
+        if (this._tunnelReqTimer !== null) clearTimeout(this._tunnelReqTimer);
         this.stopHeartBeat();
         this._connectionState = STATE.DISCONNECTED;
         try {
@@ -652,9 +661,10 @@ class KNXClient extends EventEmitter {
         } catch (error) {
         }
 
-        this._clientTunnelSeqNumber = 0;
+        this._clientTunnelSeqNumber = -1;
+        this._clearToSend = true; // 26/12/2021 allow to send
         this._channelID = null;
-        this._tunnelReqTimer = new Map();
+
         // 08/12/2021
         try {
             this._clientSocket.close();
@@ -672,46 +682,77 @@ class KNXClient extends EventEmitter {
     _getSeqNumber() {
         return this._clientTunnelSeqNumber;
     }
+    // 26/12/2021 Handle the busy state, for example while waiting for ACK
+    _getClearToSend() {
+        return (this._clearToSend !== undefined ? this._clearToSend : true);
+    }
+
     _incSeqNumber(seq) {
-        this._clientTunnelSeqNumber = seq ? seq + 1 : this._clientTunnelSeqNumber + 1;
+        this._clientTunnelSeqNumber++;
         if (this._clientTunnelSeqNumber > 255) {
             this._clientTunnelSeqNumber = 0;
         }
         return this._clientTunnelSeqNumber;
     }
-
     _keyFromCEMIMessage(cEMIMessage) {
         return cEMIMessage.dstAddress.toString();
     }
-    _setTimerAndCallback(knxTunnelingRequest) {
+    _setTimerWaitingForACK(knxTunnelingRequest) {
         const timeoutErr = new errors.RequestTimeoutError(`RequestTimeoutError seqCounter:${knxTunnelingRequest.seqCounter}, DestAddr:${knxTunnelingRequest.cEMIMessage.dstAddress.toString() || "Non definito"},  AckRequested:${knxTunnelingRequest.cEMIMessage.control.ack}, timed out waiting telegram acknowledge by ${this._options.ipAddr || "No Peer host detected"}`);
-        //const key = this._keyFromCEMIMessage(knxTunnelingRequest.cEMIMessage);
-        this._tunnelReqTimer.set(knxTunnelingRequest.seqCounter, setTimeout(() => {
-            this._tunnelReqTimer.delete(knxTunnelingRequest.seqCounter);
-            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: _setTimerAndCallback: " + (timeoutErr.message || "Undef error"));
+        if (this._tunnelReqTimer !== null) clearTimeout(this._tunnelReqTimer);
+        this._clearToSend = false; // 26/12/2021 stop sending until ACK received
+        this._tunnelReqTimer = setTimeout(() => {
             try {
-                this.emit(KNXClientEvents.error, timeoutErr);
-            } catch (error) {
-            }
-        }, KNXConstants.KNX_CONSTANTS.TUNNELING_REQUEST_TIMEOUT * 1000));
+                this._numFailedTelegramACK += 1;
+                if (this._numFailedTelegramACK > 2) {
+                    this._numFailedTelegramACK = 0;
+                    this._clearToSend = true;
+                    this.emit(KNXClientEvents.error, timeoutErr);
+                } 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());
+                }
+            } catch (error) { }
+        }, KNXConstants.KNX_CONSTANTS.TUNNELING_REQUEST_TIMEOUT * 1000);
+
     }
     _processInboundMessage(msg, rinfo) {
 
         try {
 
             // Composing debug string
-            var sProcessInboundLog = "???";
-            try {
-                sProcessInboundLog = "Data received: " + msg.toString("hex");
-                sProcessInboundLog += " srcAddress: " + JSON.stringify(rinfo);
-            } catch (error) { }
             try {
-                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.trace("Received KNX packet: _processInboundMessage, " + sProcessInboundLog + " ChannelID:" + this._channelID || "??" + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                if (this.sysLogger !== undefined && this.sysLogger !== null) {
+                    var sProcessInboundLog = "???";
+                    try {
+                        sProcessInboundLog = "Data received: " + msg.toString("hex");
+                        sProcessInboundLog += " srcAddress: " + JSON.stringify(rinfo);
+                    } catch (error) { }
+                    this.sysLogger.trace("Received KNX packet: _processInboundMessage, " + sProcessInboundLog + " ChannelID:" + this._channelID || "??" + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                }
             } catch (error) { }
 
             const { knxHeader, knxMessage } = KNXProtocol.KNXProtocol.parseMessage(msg);
 
+            // 26/12/2021 ROUTING LOST MESSAGE OR BUSY
+            if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.ROUTING_LOST_MESSAGE) {
+                try {
+                    this.emit(KNXClientEvents.error, new Error('ROUTING_LOST_MESSAGE'));
+                    this._setDisconnected();
+                    return;
+                } catch (error) { }
+            } else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.ROUTING_BUSY) {
+                try {
+                    this.emit(KNXClientEvents.error, new Error('ROUTING_BUSY'));
+                    this._setDisconnected();
+                    return;
+                } catch (error) { }
+            }
+
             if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.SEARCH_RESPONSE) {
+
                 if (this._discovery_timer == null) {
                     return;
                 }
@@ -729,8 +770,7 @@ class KNXClient extends EventEmitter {
                     if (knxConnectResponse.status !== KNXConstants.ConnectionStatus.E_NO_ERROR) {
                         try {
                             this.emit(KNXClientEvents.error, KNXConnectResponse.KNXConnectResponse.statusToString(knxConnectResponse.status));
-                        } catch (error) {
-                        }
+                        } catch (error) { }
                         this._setDisconnected();
                         return;
                     }
@@ -785,34 +825,38 @@ class KNXClient extends EventEmitter {
                 if (knxTunnelingRequest.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_IND) {
 
                     // Composing debug string
-                    let sDebugString = "???";
                     try {
-                        sDebugString = "Data: " + JSON.stringify(knxTunnelingRequest.cEMIMessage.npdu);
-                        sDebugString += " srcAddress: " + knxTunnelingRequest.cEMIMessage.srcAddress.toString();
-                        sDebugString += " dstAddress: " + knxTunnelingRequest.cEMIMessage.dstAddress.toString();
-                    } catch (error) { }
-
-                    try {
-                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING: L_DATA_IND, " + sDebugString + " ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) {
+                            let sDebugString = "???";
+                            try {
+                                sDebugString = "Data: " + JSON.stringify(knxTunnelingRequest.cEMIMessage.npdu);
+                                sDebugString += " srcAddress: " + knxTunnelingRequest.cEMIMessage.srcAddress.toString();
+                                sDebugString += " dstAddress: " + knxTunnelingRequest.cEMIMessage.dstAddress.toString();
+                            } catch (error) { }
+                            this.sysLogger.debug("Received KNX packet: TUNNELING: L_DATA_IND, " + sDebugString + " ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                        }
                     } catch (error) { }
 
                     try {
                         this.emit(KNXClientEvents.indication, knxTunnelingRequest, false, msg.toString("hex"));
-                    } catch (error) {
-                    }
+                    } catch (error) { }
 
-                }
-                else if (knxTunnelingRequest.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_CON) {
+                } else if (knxTunnelingRequest.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_CON) {
 
                     try {
                         if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING: L_DATA_CON, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
                     } catch (error) { }
 
                 }
+
+                // 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) {
+                //}               
+
+            } else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.TUNNELING_ACK) {
                 //const knxTunnelingAck =  lodash.cloneDeep(knxMessage);
                 const knxTunnelingAck = knxMessage;
                 if (knxTunnelingAck.channelID !== this._channelID) {
@@ -823,19 +867,17 @@ class KNXClient extends EventEmitter {
                     if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: TUNNELING: TUNNELING_ACK, ChannelID:" + this._channelID + " seqCounter:" + knxTunnelingAck.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
                 } catch (error) { }
 
-                this._incSeqNumber(knxTunnelingAck.seqCounter);
-
-                if (this._tunnelReqTimer.has(knxTunnelingAck.seqCounter)) {
-                    if (this._tunnelReqTimer.get(knxTunnelingAck.seqCounter) !== null) clearTimeout(this._tunnelReqTimer.get(knxTunnelingAck.seqCounter));
-                    this._tunnelReqTimer.delete(knxTunnelingAck.seqCounter);
-                    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) { }
-                }
-                else {
-
-                    // Avoid warning if the KNXEngine is set to ignore ACK's telegrams
-                    if (!this._options.suppress_ack_ldatareq) {
+                // Check the received ACK sequence number
+                if (!this._options.suppress_ack_ldatareq) {
+                    if (knxTunnelingAck.seqCounter === this._getSeqNumber()) {
+                        if (this._tunnelReqTimer !== null) clearTimeout(this._tunnelReqTimer);
+                        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
+                        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) { }
+                    } else {
+                        // Inform that i received an ACK with an unexpected sequence number
                         try {
                             if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Received KNX packet: TUNNELING: Unexpected Tunnel Ack with seqCounter = " + knxTunnelingAck.seqCounter);
                         } catch (error) { }
@@ -850,15 +892,16 @@ class KNXClient extends EventEmitter {
                 if (knxRoutingInd.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_IND) {
 
                     // Composing debug string
-                    let sDebugString = "???";
-                    try {
-                        sDebugString = "Data: " + JSON.stringify(knxRoutingInd.cEMIMessage.npdu);
-                        sDebugString += " srcAddress: " + knxRoutingInd.cEMIMessage.srcAddress.toString();
-                        sDebugString += " dstAddress: " + knxRoutingInd.cEMIMessage.dstAddress.toString();
-                    } catch (error) { }
-
                     try {
-                        if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("Received KNX packet: ROUTING: L_DATA_IND, " + sDebugString + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                        if (this.sysLogger !== undefined && this.sysLogger !== null) {
+                            let sDebugString = "???";
+                            try {
+                                sDebugString = "Data: " + JSON.stringify(knxRoutingInd.cEMIMessage.npdu);
+                                sDebugString += " srcAddress: " + knxRoutingInd.cEMIMessage.srcAddress.toString();
+                                sDebugString += " dstAddress: " + knxRoutingInd.cEMIMessage.dstAddress.toString();
+                            } catch (error) { }
+                            this.sysLogger.debug("Received KNX packet: ROUTING: L_DATA_IND, " + sDebugString + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                        }
                     } catch (error) { }
 
                     try {
@@ -915,6 +958,7 @@ class KNXClient extends EventEmitter {
             } catch (error) { }
             try {
                 this.emit(KNXClientEvents.error, e);
+                this._setDisconnected();
             } catch (error) { }
 
         }

package/KNXEngine/protocol/KNXConnectResponse.js

@@ -1,13 +1,13 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KNXConnectResponse = void 0;
-const KNXConstants_1 = require("./KNXConstants");
-const KNXPacket_1 = require("./KNXPacket");
-const HPAI_1 = require("./HPAI");
-const CRD_1 = require("./CRD");
-class KNXConnectResponse extends KNXPacket_1.KNXPacket {
+const KNXConstants = require("./KNXConstants");
+const KNXPacket = require("./KNXPacket");
+const HPAI = require("./HPAI");
+const CRD = require("./CRD");
+class KNXConnectResponse extends KNXPacket.KNXPacket {
     constructor(channelID, status, hpai, crd) {
-        super(KNXConstants_1.KNX_CONSTANTS.CONNECT_RESPONSE, hpai == null ? 2 : 2 + hpai.length + crd.length);
+        super(KNXConstants.KNX_CONSTANTS.CONNECT_RESPONSE, hpai == null ? 2 : 2 + hpai.length + crd.length);
         this.channelID = channelID;
         this.status = status;
         this.hpai = hpai;
@@ -21,27 +21,27 @@ class KNXConnectResponse extends KNXPacket_1.KNXPacket {
         const status = buffer.readUInt8(offset++);
         let hpai, crd;
         if (offset < buffer.length) {
-            hpai = HPAI_1.HPAI.createFromBuffer(buffer, offset);
+            hpai = HPAI.HPAI.createFromBuffer(buffer, offset);
             offset += hpai.length;
-            crd = CRD_1.CRD.createFromBuffer(buffer, offset);
+            crd = CRD.CRD.createFromBuffer(buffer, offset);
         }
         return new KNXConnectResponse(channelID, status, hpai, crd);
     }
     static statusToString(status) {
         switch (status) {
-            case KNXConstants_1.KNX_CONSTANTS.E_SEQUENCE_NUMBER:
+            case KNXConstants.KNX_CONSTANTS.E_SEQUENCE_NUMBER:
                 return 'Invalid Sequence Number';
-            case KNXConstants_1.KNX_CONSTANTS.E_CONNECTION_TYPE:
+            case KNXConstants.KNX_CONSTANTS.E_CONNECTION_TYPE:
                 return 'Invalid Connection Type';
-            case KNXConstants_1.KNX_CONSTANTS.E_CONNECTION_OPTION:
+            case KNXConstants.KNX_CONSTANTS.E_CONNECTION_OPTION:
                 return 'Invalid Connection Option';
-            case KNXConstants_1.KNX_CONSTANTS.E_NO_MORE_CONNECTIONS:
+            case KNXConstants.KNX_CONSTANTS.E_NO_MORE_CONNECTIONS:
                 return 'No More Connections';
-            case KNXConstants_1.KNX_CONSTANTS.E_DATA_CONNECTION:
+            case KNXConstants.KNX_CONSTANTS.E_DATA_CONNECTION:
                 return 'Invalid Data Connection';
-            case KNXConstants_1.KNX_CONSTANTS.E_KNX_CONNECTION:
+            case KNXConstants.KNX_CONSTANTS.E_KNX_CONNECTION:
                 return 'Invalid KNX Connection';
-            case KNXConstants_1.KNX_CONSTANTS.E_TUNNELING_LAYER:
+            case KNXConstants.KNX_CONSTANTS.E_TUNNELING_LAYER:
                 return 'Invalid Tunneling Layer';
             default:
                 return `Unknown error ${status}`;

package/KNXEngine/protocol/KNXConstants.js

@@ -18,6 +18,7 @@ exports.KNX_CONSTANTS = {
     DEVICE_CONFIGURATION_ACK: 0x0311,
     TUNNELING_REQUEST: 0x0420,
     TUNNELING_ACK: 0x0421,
+    ROUTING_BUSY: 0x0532,
     ROUTING_INDICATION: 0x0530,
     ROUTING_LOST_MESSAGE: 0x0531,
     DEVICE_MGMT_CONNECTION: 0x03,
@@ -61,15 +62,15 @@ exports.KNX_CONSTANTS = {
     KNX_IP: '224.0.23.12',
     IPV4_ADDRESS_LENGTH: 4,
     // Search for KNX IP Secure Unicasts Setups
-    SECURE_SEARCH_REQUEST : 0x20b,
-    SECURE_SEARCH_RESPONSE : 0x20c,
+    SECURE_SEARCH_REQUEST: 0x20b,
+    SECURE_SEARCH_RESPONSE: 0x20c,
     // KNX IP Secure
-    SECURE_WRAPPER : 0x0950,
-    SECURE_SESSION_REQUEST : 0x0951,
-    SECURE_SESSION_RESPONSE : 0x0952,
-    SECURE_SESSION_AUTH : 0x0953,
-    SECURE_SESSION_STATUS : 0x0954,
-    SECURE_GROUP_SYNC : 0x0955
+    SECURE_WRAPPER: 0x0950,
+    SECURE_SESSION_REQUEST: 0x0951,
+    SECURE_SESSION_RESPONSE: 0x0952,
+    SECURE_SESSION_AUTH: 0x0953,
+    SECURE_SESSION_STATUS: 0x0954,
+    SECURE_GROUP_SYNC: 0x0955
 };
 
 var ConnectionStatus;

package/KNXEngine/protocol/KNXUtils.js

@@ -13,17 +13,36 @@ const splitIP = (ip, name = 'ip') => {
 };
 exports.splitIP = splitIP;
 const validateKNXAddress = (address, isGroup = false) => {
+    // 22/12/2021 Supergiovane: https://support.knx.org/hc/en-us/articles/115003188109-Group-Addresses
     if (typeof (address) === 'string') {
         const digits = address.split(/[./]/);
         if (digits.length < 2 || digits.length > 3) {
-            throw new Error(`Invalid address format: ${address}`);
+            throw new Error(`Invalid address format: ${address} Only 3 level addresses are allowed`);
         }
+        if ((digits.length === 3 && address === "0/0/0") || (digits.length === 1 && address === "0/0")) throw new Error(`Invalid address: ${address}`);
+
         let count = 0;
         let newAddress = 0;
         for (let i = digits.length - 1; i >= 0; i--, count++) {
             const digit = Number(digits[i]);
-            if (isNaN(digit) || (count > 1 && digit > 15) || (count === 0 && digit > 255)) {
-                throw new Error(`Invalid digit at pos ${i} inside address: ${address}`);
+            if (isGroup && digits.length === 3) {
+                // Validating Group Address
+                if (isNaN(digit) || (count === 2 && digit > 31) || (count === 1 && digit > 7) || (count === 0 && digit > 255)) {
+                    // 22/12/2021 Supergiovane disabled digits validation
+                    throw new Error(`Invalid 3 levels GA digit ${digit} inside address: ${address}`);
+                }
+            } else if (isGroup && digits.length === 2) {
+                // Validating Group Address
+                if (isNaN(digit) || (count === 1 && digit > 31) || (count === 0 && digit > 2047)) {
+                    // 22/12/2021 Supergiovane disabled digits validation
+                    throw new Error(`Invalid 2 levels GA digit ${digit} inside address: ${address}`);
+                }
+            } else {
+                // Validating KNX Device Address
+                if (isNaN(digit) || (count > 1 && digit > 15) || (count === 0 && digit > 255)) {
+                    // 22/12/2021 Supergiovane disabled digits validation
+                    throw new Error(`Invalid Individual Address digit ${digit} inside address: ${address}`);
+                }
             }
             if (count === 0) {
                 newAddress = digit;

package/KNXEngine/protocol/cEMI/ControlField.js

@@ -82,7 +82,7 @@ class ControlField {
         }
         this.control2 = (this.control2 & 0xF0) | Number(format);
     }
-    get framrFormat() {
+    get frameFormat() {
         return this.control2 & 0xF;
     }
     static get DEFAULT_CONTROL1() {

package/nodes/knxUltimate-config.html

@@ -8,7 +8,7 @@
             physAddr: { value: "15.15.22", required: true },
             hostProtocol: { value: "Multicast", required: false }, // TunnelUDP/TunnelTCP/Multicast
             // enable this option to suppress the acknowledge flag with outgoing L_Data.req requests. LoxOne needs this
-            suppressACKRequest: { value: true },
+            suppressACKRequest: { value: false },
             csv: { value: "", required: false },
             KNXEthInterface: { value: "Auto" },
             KNXEthInterfaceManuallyInput: { value: "" },

package/nodes/knxUltimate-config.js

@@ -425,19 +425,6 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
         node.addClient = (_Node) => {
             // Check if node already exists
             if (node.nodeClients.filter(x => x.id === _Node.id).length === 0) {
-                // Check if the node has a valid topic and dpt
-                if (_Node.listenallga === false) {
-                    if (_Node.topic === undefined || _Node.dpt === undefined) {
-                        _Node.setNodeStatus({ fill: "red", shape: "dot", text: "Empty Group Addr. or datapoint.", payload: "", GA: "", dpt: "", devicename: "" })
-                        return;
-                    } else {
-                        // topic must be in format x/x/x
-                        if (_Node.topic.split("\/").length < 3) {
-                            _Node.setNodeStatus({ fill: "red", shape: "dot", text: "Wrong group address (topic: " + _Node.topic + ") format.", payload: "", GA: "", dpt: "", devicename: "" })
-                            return;
-                        }
-                    }
-                }
                 // Add _Node to the clients array
                 if (node.autoReconnect) {
                     _Node.setNodeStatus({ fill: "grey", shape: "ring", text: "Node initialized.", payload: "", GA: "", dpt: "", devicename: "" });
@@ -814,7 +801,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
         //function handleBusEvents(_evt, _src, _dest, _rawValue, _datagram, _isRepeated) {
         function handleBusEvents(_datagram, _echoed, _CEMI) {
 
-          
+
             // _rawValue
             try {
                 _rawValue = _datagram.cEMIMessage.npdu.dataValue;
@@ -848,7 +835,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                 // I'm receiving a telegram from the BUS
                 try {
                     var iStart = _datagram._header._headerLength; //+ 4;
-                    _cemiETS = _CEMI.substring(iStart*2 );
+                    _cemiETS = _CEMI.substring(iStart * 2);
                     //_cemiETS = datagram.cEMIMessage.srcAddress.toBuffer().toString("hex") + _datagram.cEMIMessage.dstAddress.toBuffer().toString("hex") + "01" + _datagram.cEMIMessage.npdu._tpci.toString(16)
                 } catch (error) { }
 
@@ -1100,7 +1087,6 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
 
         function handleTelegramQueue() {
             if (node.knxConnection !== null || node.host.toUpperCase() === "EMULATE") {
-                //console.log("BANANA handleTelegramQueueSONO BLOCCATO ? ",node.lockHandleTelegramQueue, "CONNECTED ? ", node.linkStatus )
                 if (node.lockHandleTelegramQueue === true) return; // Exits if the funtion is busy
                 node.lockHandleTelegramQueue = true; // Lock the function. It cannot be called again until finished.
 
@@ -1111,6 +1097,15 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
                     return;
                 }
 
+                // 26/12/2021 If the KNXEngine is busy waiting for telegram's ACK, exit
+                if (!node.knxConnection._getClearToSend()) {
+                    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() + ". Delay handling queue.");
+                    }                   
+                    return;
+                }
+
                 // Retrieving oKNXMessage  { grpaddr, payload,dpt,outputtype (write or response),nodecallerid (node caller)}. 06/03/2020 "Read" request does have the lower priority in the queue, so firstly, i search for "read" telegrams and i move it on the top of the queue pile.
                 var aTelegramsFiltered = [];
                 aTelegramsFiltered = node.telegramsQueue.filter(a => a.outputtype !== "read");

package/nodes/knxUltimate.js

@@ -1,5 +1,6 @@
 module.exports = function (RED) {
     const _ = require("lodash");
+    const KNXUtils = require("./../KNXEngine/protocol/KNXUtils");
 
     function knxUltimate(config) {
         RED.nodes.createNode(this, config)
@@ -57,15 +58,16 @@ module.exports = function (RED) {
         }
 
         // Check if the node has a valid topic and dpt
-        if (node.listenallga == false) {
-            if (typeof node.topic == "undefined" || typeof node.dpt == "undefined") {
+        if (node.listenallga === false) {
+            if (node.topic === undefined || node.dpt === undefined) {
                 node.setNodeStatus({ fill: "red", shape: "dot", text: "Empty Group Addr. or datapoint.", payload: "", GA: "", dpt: "", devicename: "" })
                 return;
             } else {
-
-                // topic must be in formar x/x/x
-                if (node.topic.split("\/").length < 3) {
-                    node.setNodeStatus({ fill: "red", shape: "dot", text: "Wrong group address format.", payload: "", GA: node.topic, dpt: "", devicename: "" })
+                // Validate the Address
+                try {
+                    KNXUtils.validateKNXAddress(node.topic, true)
+                } catch (error) {
+                    node.setNodeStatus({ fill: "red", shape: "dot", text: error.message, payload: "", GA: node.topic, dpt: "", devicename: "" })
                     return;
                 }
             }

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

@@ -23,8 +23,8 @@
             "show_date_status": "Tag und Uhrzeit des letzten Updates im Status anzeigen",
             "show_device_status": "Gerätenamen im Status anzeigen (\"Alle Gruppenadressen abhören\" erforderlich)",
             "show_datapoint_status": "Datenpunkt im Status anzeigen",
-            "suppress_ack": "ACK-Anfrage unterdrücken",
-            "suppress_ack_help": "Diese Option unterstützt die Kompatibilität mit der alten Firmware des IP-Interface SWG1 148-1AB22 von Siemens",
+            "suppress_ack": "ACK-Anfrage unterdrücken in Tunnel Modus",
+            "suppress_ack_help": "Diese Option unterstützt die Kompatibilität mit der alten Firmware des alten IP-Interfaces.Achtung: Der Knoten kann die Trennung vom Gateway möglicherweise nicht bemerken. Verwenden Sie in diesem Fall den Watchdog im Ethernet+KNX-Twisted-Pair Modus.",
             "ignoreTelegramsWithRepeatedFlag": "Wiederholt (R-Flag) telegramme vom BUS unterdrücken",
             "log_level": "Loglevel",
             "nodes_list_title": "Liste aller KNX-Ultimate Nodes in allen Flows",

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

@@ -23,8 +23,8 @@
             "show_date_status": "Show last update day and time in status",
             "show_device_status": "Show device name in status (require \"Listen all Group Address\" )",
             "show_datapoint_status": "Show datapoint in status",
-            "suppress_ack": "Suppress ACK request",
-            "suppress_ack_help": "The option above helps old KNX/IP Interfaces compatibility",
+            "suppress_ack": "Suppress ACK request in tunneling mode",
+            "suppress_ack_help": "The option above helps old KNX/IP Interfaces compatibility. Warning: the node may not notice the disconnection from the gateway. In this case, use the watchdog in Ethernet+KNX twisted pair mode.",
             "ignoreTelegramsWithRepeatedFlag": "Suppress repeated (R-Flag) telegrams fom BUS",
             "log_level": "Loglevel",
             "nodes_list_title": "List of your nodes in all flows",

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

@@ -23,8 +23,8 @@
             "show_date_status": "Visualizza data e ora ultimo aggiornamento, nello stato",
             "show_device_status": "Visualizza il nome del dispositivo nello stato (richiede \"Modalità universale\" )",
             "show_datapoint_status": "Visualizza il DPT nello stato",
-            "suppress_ack": "Sopprimi richieste ACK",
-            "suppress_ack_help": "L'opzione ACK sopra aiuta la compatibilità con vecchie interfacce",
+            "suppress_ack": "Sopprimi richieste ACK in modalità tunnel",
+            "suppress_ack_help": "L'opzione ACK sopra aiuta la compatibilità con vecchie interfacce. Attenzione: il nodo potrebbe non accorgersi della disconnessione al gateway. In questo caso, usare il watchdog in modalità Ethernet+KNX twisted pair.",
             "ignoreTelegramsWithRepeatedFlag": "Sopprimi telegrammi dal BUS ripetuti (Flag R)",
             "log_level": "Livello log",
             "nodes_list_title": "Elenco nodi in tutti i flows",

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

@@ -23,8 +23,8 @@
             "show_date_status": "在状态中显示上次更新日期和时间",
             "show_device_status": "在状态中显示设备的名称 (需要 \"监听所有组地址\" )",
             "show_datapoint_status": "在状态中显示数据类型",
-            "suppress_ack": "抑制 ACK 请求",
-            "suppress_ack_help": "上面的选项有助于旧的 KNX/IP 接口兼容性",
+            "suppress_ack": "抑制 ACK 请求 in tunneling mode",
+            "suppress_ack_help": "上面的选项有助于旧的 KNX/IP 接口兼容性 Warning: the node may not notice the disconnection from the gateway. In this case, use the watchdog in Ethernet+KNX twisted pair mode.",
             "ignoreTelegramsWithRepeatedFlag": "抑制重复的 (R-Flag) 来自总线的电报",
             "log_level": "日志等级",
             "nodes_list_title": "所有流中的节点列表",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-knx-ultimate",
-  "version": "1.3.10",
+  "version": "1.3.14",
   "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": {
     "fs": "0.0.1-security",