node-red-contrib-knx-ultimate 1.3.13 → 1.3.18

package/CHANGELOG.md

@@ -4,6 +4,28 @@
 
 <br/>
 <p>
+<b>Version 1.3.18</b> - Januar 2022<br/>
+- FIX: Scene Controller: fixed an issue preventing the node to work if you haven't set the RECALL and SAVE group addresses.<br/>
+- WIKI: updated the samples in the scene controller node.<br/>
+</p>
+<p>
+<b>Version 1.3.16</b> - Januar 2022<br/>
+- KNXEngine: there are some weird KNX gateways out there, either sending malformed header or CEMI messages. Now KNX-Ultimate will simply ignore these bad messages. Prior, it was disconnecting.<br/>
+- KNXEngine: KNX-Secure packets are silently discarded for now, until KNX Secure will be ready.<br/>
+- KNXEngine: added more logs to for troubleshooting pourposes.<br/>
+</p>
+<p>
+<b>Version 1.3.15</b> - Januar 2022<br/>
+- KNXEngine: better handling of disconnection in UDP mode, allowing very old grandpa KNX/IP interfaces enough time to understand what's happening, avoiding it to go crazy.<br/>
+- KNXEngine: corrected Curve Crypto in KNX-Secure (KNX Secure is not enabled yet!).<br/>
+</p>
+<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/>

package/KNXEngine/KNXClient.js

@@ -1,3 +1,5 @@
+// Made with love by Supergiovane
+
 "use strict";
 
 
@@ -17,7 +19,7 @@ const ipAddressHelper = require("./util/ipAddressHelper");
 const KNXAddress = require("./protocol/KNXAddress").KNXAddress;
 const KNXDataBuffer = require("./protocol/KNXDataBuffer").KNXDataBuffer;
 const DPTLib = require('./dptlib');
-const secureKeyring = require("./KNXsecureKeyring.js");
+const KNXsecureKeyring = require("./KNXsecureKeyring.js");
 //const lodash = require("lodash");
 
 var STATE;
@@ -74,7 +76,8 @@ const optionsDefaults = {
     loglevel: "info",
     localEchoInTunneling: true,
     localIPAddress: "",
-    interface: ""
+    interface: "",
+    jKNXSecureKeyring: {}
 };
 
 class KNXClient extends EventEmitter {
@@ -86,13 +89,13 @@ 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;
         this._peerHost = this._options.ipAddr;
         this._peerPort = this._options.ipPort;
-        this._timer = null;
+        this._connectionTimeoutTimer = null;
         this._heartbeatFailures = 0;
         this.max_HeartbeatFailures = 3;
         this._heartbeatTimer = null;
@@ -101,6 +104,7 @@ class KNXClient extends EventEmitter {
         this._processInboundMessage = this._processInboundMessage.bind(this);
         this._clientSocket = null;
         this.sysLogger = null;
+        this.jKNXSecureKeyring = this._options.jKNXSecureKeyring; // 28/12/2021 Contains the Keyring JSON object
         try {
             this.sysLogger = require("./KnxLog.js").get({ loglevel: this._options.loglevel }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window            
         } catch (error) {
@@ -169,17 +173,17 @@ 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() {
         return this._channelID;
     }
-    // Transform the plain value "data" into a KNXDataBuffer. The datapoints without "null" are SixBits
+    // 16/12/2021 Transform the plain value "data" into a KNXDataBuffer. The datapoints without "null" are SixBits
     // dataPointsSixBits = {
     //     DPT1,
     //     DPT2,
@@ -240,6 +244,7 @@ class KNXClient extends EventEmitter {
         });
     }
     send(knxPacket) {
+
         // Logging
         if (this.sysLogger !== undefined && this.sysLogger !== null) {
             try {
@@ -279,7 +284,7 @@ class KNXClient extends EventEmitter {
             } catch (error) {
                 if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Sending KNX packet: Send UDP Catch error: " + error.message + " " + typeof (knxPacket) + " seqCounter:" + knxPacket.seqCounter);
                 try {
-                    //this.emit(KNXClientEvents.error, error);
+                    this.emit(KNXClientEvents.error, error);
                 } catch (error) {
                 }
 
@@ -292,15 +297,12 @@ class KNXClient extends EventEmitter {
                         if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Sending KNX packet: Send TCP sending error: " + err.message || "Undef error");
                         this.emit(KNXClientEvents.error, err);
                     }
-
                 });
             } catch (error) {
                 if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Sending KNX packet: Send TCP Catch error: " + error.message || "Undef error");
                 try {
-                    //this.emit(KNXClientEvents.error, error);
-                } catch (error) {
-                }
-
+                    this.emit(KNXClientEvents.error, error);
+                } catch (error) { }
             }
         }
     }
@@ -342,9 +344,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 {
@@ -386,9 +390,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 {
@@ -427,9 +432,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 {
@@ -475,9 +481,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 {
@@ -523,8 +530,8 @@ class KNXClient extends EventEmitter {
         if (this._clientSocket == null) {
             throw new Error('No client socket defined');
         }
-        this._timer = setTimeout(() => {
-            this._timer = null;
+        this._connectionTimeoutTimer = setTimeout(() => {
+            this._connectionTimeoutTimer = null;
         }, 1000 * KNXConstants.KNX_CONSTANTS.DEVICE_CONFIGURATION_REQUEST_TIMEOUT);
         this._awaitingResponseType = KNXConstants.KNX_CONSTANTS.DESCRIPTION_RESPONSE;
         this._sendDescriptionRequestMessage(host, port);
@@ -546,8 +553,9 @@ 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);
+        if (this._connectionTimeoutTimer !== null) clearTimeout(this._connectionTimeoutTimer);
 
         // Emit connecting
         this.emit(KNXClientEvents.connecting, this._options);
@@ -557,8 +565,8 @@ class KNXClient extends EventEmitter {
 
             // Unicast, need to explicitly create the connection
             const timeoutError = new Error(`Connection timeout to ${this._peerHost}:${this._peerPort}`);
-            this._timer = setTimeout(() => {
-                this._timer = null;
+            this._connectionTimeoutTimer = setTimeout(() => {
+                this._connectionTimeoutTimer = null;
                 try {
                     this.emit(KNXClientEvents.error, timeoutError);
                 } catch (error) {
@@ -566,7 +574,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") {
@@ -581,15 +589,14 @@ class KNXClient extends EventEmitter {
                 // }, 1000 * KNXConstants.KNX_CONSTANTS.CONNECT_REQUEST_TIMEOUT);
                 conn._awaitingResponseType = KNXConstants.KNX_CONSTANTS.CONNECT_RESPONSE;
                 conn._clientTunnelSeqNumber = 0;
-                if (conn._options.isSecureKNXEnabled) conn._sendSecureSessionRequestMessage(new TunnelCRI.TunnelCRI(knxLayer));
+                if (conn._options.isSecureKNXEnabled) conn._sendSecureSessionRequestMessage(new TunnelCRI.TunnelCRI(knxLayer), conn.jKNXSecureKeyring);
             });
 
-
         } else {
 
             // Multicast
             this._connectionState = STATE.CONNECTED;
-            this._clientTunnelSeqNumber = 0;
+            this._clientTunnelSeqNumber = -1;
             try {
                 this.emit(KNXClientEvents.connected, this._options);
             } catch (error) {
@@ -607,7 +614,7 @@ class KNXClient extends EventEmitter {
         this._heartbeatTimer = setTimeout(() => {
             this._heartbeatTimer = null;
             try {
-                console.log("BANANA OH! getConnectionStatus Timeout", this._heartbeatFailures, "su", this.max_HeartbeatFailures);
+                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: getConnectionStatus Timeout " + this._heartbeatFailures + " out of " + this.max_HeartbeatFailures);
                 //this.emit(KNXClientEvents.error, timeoutError);
             } catch (error) {
             }
@@ -631,14 +638,11 @@ class KNXClient extends EventEmitter {
         }
         this.stopHeartBeat();
         this._connectionState = STATE.DISCONNECTING;
-        this._timer = setTimeout(() => {
-            this._timer = null;
-        }, 1000 * KNXConstants.KNX_CONSTANTS.CONNECT_REQUEST_TIMEOUT);
         this._awaitingResponseType = KNXConstants.KNX_CONSTANTS.DISCONNECT_RESPONSE;
         this._sendDisconnectRequestMessage(this._channelID);
-        this._timerTimeoutSendDisconnectRequestMessage = setTimeout(() => {
-            this._setDisconnected();
-        }, 1000 * KNXConstants.KNX_CONSTANTS.CONNECT_REQUEST_TIMEOUT);
+        //this._timerTimeoutSendDisconnectRequestMessage = setTimeout(() => {
+        this._setDisconnected();
+        //}, 1000 * KNXConstants.KNX_CONSTANTS.CONNECT_REQUEST_TIMEOUT);
     }
     isConnected() {
         return this._connectionState === STATE.CONNECTED;
@@ -646,7 +650,8 @@ class KNXClient extends EventEmitter {
     _setDisconnected() {
         if (this._timerTimeoutSendDisconnectRequestMessagetimer !== null) clearTimeout(this._timerTimeoutSendDisconnectRequestMessagetimer);
         this._timerTimeoutSendDisconnectRequestMessage = null;
-        if (this._timer !== null) clearTimeout(this._timer);
+        if (this._connectionTimeoutTimer !== null) clearTimeout(this._connectionTimeoutTimer);
+        if (this._tunnelReqTimer !== null) clearTimeout(this._tunnelReqTimer);
         this.stopHeartBeat();
         this._connectionState = STATE.DISCONNECTED;
         try {
@@ -654,16 +659,9 @@ class KNXClient extends EventEmitter {
         } catch (error) {
         }
 
-        // 25/12/2021 Stops all awaiting ACK timers
-        for (const [key, oTimer] of this._tunnelReqTimer.entries()) {
-            try {
-                clearTimeout(oTimer);
-            } catch (error) { }
-        }
-        this._tunnelReqTimer.clear();
-        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 {
@@ -682,50 +680,79 @@ 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) {
+    // _keyFromCEMIMessage(cEMIMessage) {
+    //     return cEMIMessage.dstAddress.toString();
+    // }
+    _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"}`);
-        this._tunnelReqTimer.set(knxTunnelingRequest.seqCounter, setTimeout(() => {
-            this._tunnelReqTimer.delete(knxTunnelingRequest.seqCounter);
+        if (this._tunnelReqTimer !== null) clearTimeout(this._tunnelReqTimer);
+        this._clearToSend = false; // 26/12/2021 stop sending until ACK received
+        this._tunnelReqTimer = setTimeout(() => {
             try {
                 this._numFailedTelegramACK += 1;
-                if (this._numFailedTelegramACK > 3) {
+                if (this._numFailedTelegramACK > 2) {
                     this._numFailedTelegramACK = 0;
+                    this._clearToSend = true;
                     this.emit(KNXClientEvents.error, timeoutErr);
                 } else {
-                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("KNXClient: _setTimerAndCallback: " + (timeoutErr.message || "Undef error") + " " + this._numFailedTelegramACK + " of 3 times before emitting error.");
+                    // 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));
+            } 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) { }
 
+            // BUGFIXING https://github.com/Supergiovane/node-red-contrib-knx-ultimate/issues/162
+            //msg = Buffer.from("0610053000102900b06011fe11150080","hex");
+
             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;
                 }
@@ -737,14 +764,13 @@ class KNXClient extends EventEmitter {
             }
             else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.CONNECT_RESPONSE) {
                 if (this._connectionState === STATE.CONNECTING) {
-                    if (this._timer !== null) clearTimeout(this._timer);
-                    this._timer = null;
+                    if (this._connectionTimeoutTimer !== null) clearTimeout(this._connectionTimeoutTimer);
+                    this._connectionTimeoutTimer = null;
                     const knxConnectResponse = knxMessage;
                     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;
                     }
@@ -799,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) {
@@ -837,22 +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);
-                    }
-                    this._numFailedTelegramACK = 0; // 25/12/2021 clear the current ACK failed telegram number
-                    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) { }
@@ -867,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 {
@@ -916,7 +942,7 @@ class KNXClient extends EventEmitter {
                         }
                     }
                     else {
-                        if (this._timer !== null) clearTimeout(this._timer);
+                        if (this._connectionTimeoutTimer !== null) clearTimeout(this._connectionTimeoutTimer);
                     }
                 }
                 try {
@@ -928,10 +954,12 @@ class KNXClient extends EventEmitter {
         }
         catch (e) {
             try {
-                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Received KNX packet: Error processing inbound message: " + e.message + " " + sProcessInboundLog + " ChannelID:" + this._channelID + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Received KNX packet: Error processing inbound message: " + e.message + " " + sProcessInboundLog + " ChannelID:" + this._channelID + " Host:" + this._options.ipAddr + ":" + this._options.ipPort + ". This means that KNX-Ultimate received a malformed Header or CEMI message from your KNX Gateway.");
             } catch (error) { }
             try {
-                this.emit(KNXClientEvents.error, e);
+                // 05/01/2022 Avoid disconnecting, because there are many bugged knx gateways out there!
+                //this.emit(KNXClientEvents.error, e);
+                //this._setDisconnected();
             } catch (error) { }
 
         }
@@ -942,7 +970,6 @@ class KNXClient extends EventEmitter {
         this.send(KNXProtocol.KNXProtocol.newKNXDescriptionRequest(new HPAI.HPAI(this._options.localIPAddress)));
     }
     _sendSearchRequestMessage() {
-        console.log('_sendSearchRequestMessage', this._options.localIPAddress, this._localPort);
         this.send(KNXProtocol.KNXProtocol.newKNXSearchRequest(new HPAI.HPAI(this._options.localIPAddress, this._localPort)), KNXConstants.KNX_CONSTANTS.KNX_PORT, KNXConstants.KNX_CONSTANTS.KNX_IP);
     }
     _sendConnectRequestMessage(cri) {
@@ -957,9 +984,9 @@ class KNXClient extends EventEmitter {
     _sendDisconnectResponseMessage(channelID, status = KNXConstants.ConnectionStatus.E_NO_ERROR) {
         this.send(KNXProtocol.KNXProtocol.newKNXDisconnectResponse(channelID, status));
     }
-    _sendSecureSessionRequestMessage(cri) {
+    _sendSecureSessionRequestMessage(cri, jKNXSecureKeyring) {
         let oHPAI = new HPAI.HPAI("0.0.0.0", 0, this._options.hostProtocol === "TunnelTCP" ? KNXConstants.KNX_CONSTANTS.IPV4_TCP : KNXConstants.KNX_CONSTANTS.IPV4_UDP);
-        this.send(KNXProtocol.KNXProtocol.newKNXSecureSessionRequest(cri, oHPAI));
+        this.send(KNXProtocol.KNXProtocol.newKNXSecureSessionRequest(cri, oHPAI, jKNXSecureKeyring));
     }
 }
 

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}`;