node-red-contrib-knx-ultimate 1.3.31 → 1.3.34

package/CHANGELOG.md

@@ -6,6 +6,25 @@
 
 # CHANGELOG
 
+<p>
+<b>Version 1.3.34</b> - March 2022<br/>
+- Reset handlers by removing/adding every time the connection is set by "new" directive.<br/>
+- Fixed an issue causing glitches, when the disconnection is requested by the KNX interface instead of KNX-Ultimate.<br/>
+- Fixed an issue occurring when the disconnection is started from KNX-Ultimate by the DISCONNECT_REQUEST, but the KNX Interface fails to send the DISCONNECT_RESPONSE to confirm the disconnection.<br/>
+- Updated knxUltimate-config.js to actively disconnect and close the socket when the disconnection is requested by the KNX Interface. All other cases (disconnection by ethernet cable, disconnection by unreachable KNX Interface, disconnection by temporary out of access, disconnection by means of user intervention, disconnection by Watchdog node etc...) are not affected by this issue.<br/>
+- Optimized memory allocation to allow the garbage collector to get rid of unref variables.<br/>
+- Scene controller: fixed node status issues.<br/>
+- Load control: code revision.<br/>
+- Logger: code revision.<br/>
+- Watchdog: code revision.<br/>
+- Device node: code revision.<br/>
+- Global Context: code revision.<br/>
+- Wiki: merged Global Context node sample, into one single page for better readability.<br/>
+</p>
+<p>
+<b>Version 1.3.32</b> - February 2022<br/>
+- FIX Datapoint 16.001: fixed an issue with the ISO8859-1 encoding.<br/>
+</p>
 <p>
 <b>Version 1.3.31</b> - February 2022<br/>
 - KNX Viewer node: now the payload is formatted depending on value type.<br/>

package/KNXEngine/KNXClient.js

@@ -19,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 KNXsecureKeyring = require("./KNXsecureKeyring.js");
+//const KNXsecureKeyring = require("./KNXsecureKeyring.js");
 //const lodash = require("lodash");
 
 var STATE;
@@ -64,6 +64,9 @@ var KNXClientEvents;
 //     connecting: "connecting"
 // };
 
+// Contains the decrypted keyring file
+var jKNXSecureKeyring = "";
+
 // options:
 const optionsDefaults = {
     physAddr: '15.15.200',
@@ -91,8 +94,8 @@ class KNXClient extends EventEmitter {
         super();
         this._clientTunnelSeqNumber = -1;
         this._options = options;//Object.assign(optionsDefaults, options);
-        this._options.connectionKeepAliveTimeout = KNXConstants.KNX_CONSTANTS.CONNECTION_ALIVE_TIME,
-            this._localPort = null;
+        this._options.connectionKeepAliveTimeout = KNXConstants.KNX_CONSTANTS.CONNECTION_ALIVE_TIME;
+        //this._localPort = null;
         this._peerHost = this._options.ipAddr;
         this._peerPort = this._options.ipPort;
         this._connectionTimeoutTimer = null;
@@ -104,7 +107,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
+        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) {
@@ -120,24 +123,28 @@ class KNXClient extends EventEmitter {
             throw (error);
         }
 
-        let conn = this;
+        // 12/03/2022 Remove all listeners
+        this.removeAllListeners();
         // 07/12/2021 Based on protocol instantiate the right socket
         if (this._options.hostProtocol === "TunnelUDP") {
             this._clientSocket = dgram.createSocket({ type: 'udp4', reuseAddr: false });
+            this._clientSocket.removeAllListeners();  // 12/03/2022 Remove all listeners
             this._clientSocket.on(SocketEvents.message, this._processInboundMessage);
             this._clientSocket.on(SocketEvents.error, error => this.emit(KNXClientEvents.error, error));
             this._clientSocket.on(SocketEvents.close, info => this.emit(KNXClientEvents.close, info));
-            this._clientSocket.bind({ address: this._options.localIPAddress, port: this._options._peerPort }, () => {
+            let conn = this;
+            this._clientSocket.bind({ address: this._options.localIPAddress, port: this._options._peerPort }, function () {
                 try {
                     conn._clientSocket.setTTL(128);
                 } catch (error) {
-                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("UDP:  Error setting SetTTL " + error.message || "");
+                    if (conn.sysLogger !== undefined && conn.sysLogger !== null) conn.sysLogger.error("UDP:  Error setting SetTTL " + error.message || "");
                 }
             });
 
         } else if (this._options.hostProtocol === "TunnelTCP") {
             // TCP
             this._clientSocket = new net.Socket();
+            this._clientSocket.removeAllListeners();  // 12/03/2022 Remove all listeners
             //this._clientSocket.on(SocketEvents.data, this._processInboundMessage);
             this._clientSocket.on(SocketEvents.data, function (msg, rinfo, callback) {
                 console.log(msg, rinfo, callback);
@@ -146,37 +153,39 @@ class KNXClient extends EventEmitter {
             this._clientSocket.on(SocketEvents.close, info => this.emit(KNXClientEvents.close, info));
 
         } else if (this._options.hostProtocol === "Multicast") {
-            let conn = this;
             this._clientSocket = dgram.createSocket({ type: 'udp4', reuseAddr: true });
+            this._clientSocket.removeAllListeners();  // 12/03/2022 Remove all listeners
             this._clientSocket.on(SocketEvents.listening, function () {
-                try {
-                    conn._clientSocket.addMembership(conn._peerHost, conn._options.localIPAddress);
-                } catch (err) {
-                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Multicast: cannot add membership (%s)", err);
-                    try {
-                        this.emit(KNXClientEvents.error, err);
-                    } catch (error) { }
-                    return;
-                }
+               
             });
+            let conn = this;
             this._clientSocket.on(SocketEvents.message, this._processInboundMessage);
             this._clientSocket.on(SocketEvents.error, error => this.emit(KNXClientEvents.error, error));
             this._clientSocket.on(SocketEvents.close, info => this.emit(KNXClientEvents.close, info));
-            this._clientSocket.bind(this._peerPort, () => {
+            this._clientSocket.bind(this._peerPort, function () {
                 try {
                     conn._clientSocket.setMulticastTTL(128);
-                    conn._clientSocket.setMulticastInterface(this._options.localIPAddress);
+                    conn._clientSocket.setMulticastInterface(conn._options.localIPAddress);
                 } catch (error) {
-                    if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("Multicast: Error setting SetTTL " + error.message || "");
+                    if (conn.sysLogger !== undefined && conn.sysLogger !== null) conn.sysLogger.error("Multicast: Error setting SetTTL " + error.message || "");
+                }
+                try {
+                    conn._clientSocket.addMembership(conn._peerHost, conn._options.localIPAddress);
+                } catch (err) {
+                    if (conn.sysLogger !== undefined && conn.sysLogger !== null) conn.sysLogger.error("Multicast: cannot add membership (%s)", err);
+                    try {
+                        conn.emit(KNXClientEvents.error, err);
+                    } catch (error) { }
+                    return;
                 }
-                this._localPort = this._clientSocket.address().port;// 07/12/2021 Get the local port used bu the socket
+                //this._localPort = this._clientSocket.address().port;// 07/12/2021 Get the local port used bu the socket
             });
         }
 
         this._clientTunnelSeqNumber = -1;
         this._channelID = null;
         this._connectionState = STATE.DISCONNECTED;
-        this._tunnelReqTimer = null;
+        this._timerWaitingForACK = null;
         this._numFailedTelegramACK = 0; // 25/12/2021 Keep count of the failed tunnelig ACK telegrams
 
     }
@@ -228,21 +237,21 @@ class KNXClient extends EventEmitter {
         }
         return new KNXDataBuffer(adpu.data, IDataPoint);
     }
-    bindSocketPortAsync(port = KNXConstants.KNX_CONSTANTS.KNX_PORT, host = '0.0.0.0') {
-        return new Promise((resolve, reject) => {
-            try {
-                this._clientSocket.bind(port, host, () => {
-                    this._clientSocket.setMulticastInterface(host);
-                    this._clientSocket.setMulticastTTL(128);
-                    this._options.localIPAddress = host;
-                    resolve();
-                });
-            }
-            catch (err) {
-                reject(err);
-            }
-        });
-    }
+    // bindSocketPortAsync(port = KNXConstants.KNX_CONSTANTS.KNX_PORT, host = '0.0.0.0') {
+    //     return new Promise((resolve, reject) => {
+    //         try {
+    //             this._clientSocket.bind(port, host, () => {
+    //                 this._clientSocket.setMulticastInterface(host);
+    //                 this._clientSocket.setMulticastTTL(128);
+    //                 this._options.localIPAddress = host;
+    //                 resolve();
+    //             });
+    //         }
+    //         catch (err) {
+    //             reject(err);
+    //         }
+    //     });
+    // }
     send(knxPacket) {
 
         // Logging
@@ -309,10 +318,8 @@ class KNXClient extends EventEmitter {
 
     /**
     *
-    * @param {KNXAddress} srcAddress
     * @param {KNXAddress} dstAddress
     * @param {KNXDataBuffer} data
-    * @param {function} cb
     */
     // sendWriteRequest(dstAddress, data) {
     write(dstAddress, data, dptid) {
@@ -344,8 +351,7 @@ 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 seqNum = this._incSeqNumber(); // 26/12/2021
             const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
             if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
             //if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error("this._tunnelReqTimer "+ this._tunnelReqTimer.size);
@@ -390,8 +396,7 @@ 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 seqNum = this._incSeqNumber(); // 26/12/2021
             const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
             if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
             this.send(knxPacketRequest);
@@ -432,8 +437,7 @@ 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 seqNum = this._incSeqNumber(); // 26/12/2021
             const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
             if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
             this.send(knxPacketRequest);
@@ -446,55 +450,6 @@ class KNXClient extends EventEmitter {
         }
 
     }
-    // writeRaw(dstAddress, _rawDataBuffer, bitlength) {
-    //     // bitlength is unused and only for backward compatibility
-
-    //     if (this._connectionState !== STATE.CONNECTED) throw new Error("The socket is not connected. Unable to access the KNX BUS");
-
-    //     if (!Buffer.isBuffer(_rawDataBuffer)) {
-    //         if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error('KNXClient: writeRaw: Value must be a buffer! ');
-    //         return
-    //     }
-
-    //     // Transform the  "data" into a KNDDataBuffer
-    //     let data = new KNXDataBuffer(_rawDataBuffer);
-
-    //     if (typeof dstAddress === "string") dstAddress = KNXAddress.createFromString(dstAddress, KNXAddress.TYPE_GROUP);
-    //     let srcAddress = this._options.physAddr;
-    //     if (this._options.hostProtocol === "Multicast") {
-    //         // Multicast
-    //         const cEMIMessage = CEMIFactory.CEMIFactory.newLDataIndicationMessage("write", srcAddress, dstAddress, data);
-    //         cEMIMessage.control.ack = 0;
-    //         cEMIMessage.control.broadcast = 1;
-    //         cEMIMessage.control.priority = 3;
-    //         cEMIMessage.control.addressType = 1;
-    //         cEMIMessage.control.hopCount = 6;
-    //         const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXRoutingIndication(cEMIMessage);
-    //         this.send(knxPacketRequest);
-    //         // 06/12/2021 Multivast automaticalli echoes telegrams
-
-    //     } else {
-    //         // Tunneling
-    //         const cEMIMessage = CEMIFactory.CEMIFactory.newLDataRequestMessage("write", srcAddress, dstAddress, data);
-    //         cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
-    //         cEMIMessage.control.broadcast = 1;
-    //         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._setTimerWaitingForACK(knxPacketRequest);
-    //         this.send(knxPacketRequest);
-    //         // 06/12/2021 Echo the sent telegram. Last parameter is the echo true/false
-    //         try {
-    //             if (this._options.localEchoInTunneling) this.emit(KNXClientEvents.indication, knxPacketRequest, true);
-    //         } catch (error) {
-    //         }
-
-    //     }
-
-    // }
 
     writeRaw(dstAddress, _rawDataBuffer, bitlength) {
         // bitlength is unused and only for backward compatibility
@@ -543,8 +498,7 @@ 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 seqNum = this._incSeqNumber(); // 26/12/2021
             const knxPacketRequest = KNXProtocol.KNXProtocol.newKNXTunnelingRequest(this._channelID, seqNum, cEMIMessage);
             if (!this._options.suppress_ack_ldatareq) this._setTimerWaitingForACK(knxPacketRequest);
             this.send(knxPacketRequest);
@@ -569,35 +523,35 @@ class KNXClient extends EventEmitter {
             clearTimeout(this._heartbeatTimer);
         }
     }
-    isDiscoveryRunning() {
-        return this._discovery_timer != null;
-    }
-    startDiscovery() {
-        if (this.isDiscoveryRunning()) {
-            throw new Error('Discovery already running');
-        }
-        this._discovery_timer = setTimeout(() => {
-            this._discovery_timer = null;
-        }, 1000 * KNXConstants.KNX_CONSTANTS.SEARCH_TIMEOUT);
-        this._sendSearchRequestMessage();
-    }
-    stopDiscovery() {
-        if (!this.isDiscoveryRunning()) {
-            return;
-        }
-        if (this._discovery_timer !== null) clearTimeout(this._discovery_timer);
-        this._discovery_timer = null;
-    }
-    getDescription(host, port) {
-        if (this._clientSocket == null) {
-            throw new Error('No client socket defined');
-        }
-        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);
-    }
+    // isDiscoveryRunning() {
+    //     return this._discovery_timer != null;
+    // }
+    // startDiscovery() {
+    //     if (this.isDiscoveryRunning()) {
+    //         throw new Error('Discovery already running');
+    //     }
+    //     this._discovery_timer = setTimeout(() => {
+    //         this._discovery_timer = null;
+    //     }, 1000 * KNXConstants.KNX_CONSTANTS.SEARCH_TIMEOUT);
+    //     this._sendSearchRequestMessage();
+    // }
+    // stopDiscovery() {
+    //     if (!this.isDiscoveryRunning()) {
+    //         return;
+    //     }
+    //     if (this._discovery_timer !== null) clearTimeout(this._discovery_timer);
+    //     this._discovery_timer = null;
+    // }
+    // getDescription(host, port) {
+    //     if (this._clientSocket == null) {
+    //         throw new Error('No client socket defined');
+    //     }
+    //     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);
+    // }
     Connect(knxLayer = TunnelCRI.TunnelTypes.TUNNEL_LINKLAYER) {
 
         if (this._clientSocket == null) {
@@ -644,20 +598,25 @@ class KNXClient extends EventEmitter {
             // TCP
             const timeoutError = new Error(`Connection timeout to ${this._peerHost}:${this._peerPort}`);
             let conn = this;
-            this._clientSocket.connect({ port: this._peerPort, host: this._peerHost, localAddress: this._options.localAddress }, function () {
+            this._clientSocket.connect( this._peerPort, this._peerHost, function () {
                 // conn._timer = setTimeout(() => {
                 //     conn._timer = null;
                 //     conn.emit(KNXClientEvents.error, timeoutError);
                 // }, 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), conn.jKNXSecureKeyring);
+                if (conn._options.isSecureKNXEnabled) conn._sendSecureSessionRequestMessage(new TunnelCRI.TunnelCRI(knxLayer));
             });
 
         } else {
 
             // Multicast
             this._connectionState = STATE.CONNECTED;
+
+            // 16/03/2022 These two are referring to tunneling connection, but i set it here as well. Non si sa mai.
+            this._numFailedTelegramACK = 0; // 25/12/2021 Reset the failed ACK counter
+            this._clearToSend = true; // 26/12/2021 allow to send
+
             this._clientTunnelSeqNumber = -1;
             try {
                 this.emit(KNXClientEvents.connected, this._options);
@@ -702,27 +661,25 @@ class KNXClient extends EventEmitter {
         this._connectionState = STATE.DISCONNECTING;
         this._awaitingResponseType = KNXConstants.KNX_CONSTANTS.DISCONNECT_RESPONSE;
         this._sendDisconnectRequestMessage(this._channelID);
-        //this._timerTimeoutSendDisconnectRequestMessage = setTimeout(() => {
-        this._setDisconnected("Called from KNXClient Disconnected");
-        //}, 1000 * KNXConstants.KNX_CONSTANTS.CONNECT_REQUEST_TIMEOUT);
+        // 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.");
+        }, 2000);
     }
     isConnected() {
         return this._connectionState === STATE.CONNECTED;
     }
     _setDisconnected(_sReason = "") {
-        if (this._timerTimeoutSendDisconnectRequestMessagetimer !== null) clearTimeout(this._timerTimeoutSendDisconnectRequestMessagetimer);
-        this._timerTimeoutSendDisconnectRequestMessage = null;
-        if (this._connectionTimeoutTimer !== null) clearTimeout(this._connectionTimeoutTimer);
-        if (this._tunnelReqTimer !== null) clearTimeout(this._tunnelReqTimer);
-        this.stopHeartBeat();
-        this._connectionState = STATE.DISCONNECTED;
         try {
-            this.emit(KNXClientEvents.disconnected, this._options.ipAddr + ":" + this._options.ipPort + " " + _sReason);
+            if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.debug("KNXClient: called _setDisconnected " + this._options.ipAddr + ":" + this._options.ipPort + " " + _sReason);
         } catch (error) {
         }
-
+        this._connectionState = STATE.DISCONNECTED;
+        this.stopHeartBeat();
+        this._timerTimeoutSendDisconnectRequestMessage = null;
+        if (this._connectionTimeoutTimer !== null) clearTimeout(this._connectionTimeoutTimer);
+        if (this._timerWaitingForACK !== null) clearTimeout(this._timerWaitingForACK);
         this._clientTunnelSeqNumber = -1;
-        this._clearToSend = true; // 26/12/2021 allow to send
         this._channelID = null;
 
         // 08/12/2021
@@ -730,11 +687,16 @@ class KNXClient extends EventEmitter {
             this._clientSocket.close();
         } catch (error) { }
 
+        try {
+            this.emit(KNXClientEvents.disconnected, this._options.ipAddr + ":" + this._options.ipPort + " " + _sReason);
+        } catch (error) {
+        }
+        this._clearToSend = true; // 26/12/2021 allow to send                
     }
     _runHeartbeat() {
         if (this._heartbeatRunning) {
             this.getConnectionStatus();
-            setTimeout(() => {
+            let t = setTimeout(() => { // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
                 this._runHeartbeat();
             }, 1000 * this._options.connectionKeepAliveTimeout);
         }
@@ -747,7 +709,7 @@ class KNXClient extends EventEmitter {
         return (this._clearToSend !== undefined ? this._clearToSend : true);
     }
 
-    _incSeqNumber(seq) {
+    _incSeqNumber() {
         this._clientTunnelSeqNumber++;
         if (this._clientTunnelSeqNumber > 255) {
             this._clientTunnelSeqNumber = 0;
@@ -758,10 +720,10 @@ class KNXClient extends EventEmitter {
     //     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"}`);
-        if (this._tunnelReqTimer !== null) clearTimeout(this._tunnelReqTimer);
         this._clearToSend = false; // 26/12/2021 stop sending until ACK received
-        this._tunnelReqTimer = setTimeout(() => {
+        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"}`);
+        if (this._timerWaitingForACK !== null) clearTimeout(this._timerWaitingForACK);
+        this._timerWaitingForACK = setTimeout(() => {
             try {
                 this._numFailedTelegramACK += 1;
                 if (this._numFailedTelegramACK > 2) {
@@ -836,6 +798,12 @@ class KNXClient extends EventEmitter {
                         this._setDisconnected("Connect response error " + knxConnectResponse.status);
                         return;
                     }
+
+                    // 16/03/2022
+                    if (this._timerWaitingForACK !== null) clearTimeout(this._timerWaitingForACK);
+                    this._numFailedTelegramACK = 0; // 16/03/2022 Reset the failed ACK counter
+                    this._clearToSend = true; // 16/03/2022 allow to send
+
                     this._connectionState = STATE.CONNECTED;
                     this._channelID = knxConnectResponse.channelID;
                     try {
@@ -860,7 +828,7 @@ class KNXClient extends EventEmitter {
                     } catch (error) {
                     }
                 }
-                this._setDisconnected("Received Disconnect Response");
+                this._setDisconnected("Received DISCONNECT_RESPONSE from the KNX interface.");
             }
             else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.DISCONNECT_REQUEST) {
 
@@ -875,7 +843,10 @@ class KNXClient extends EventEmitter {
 
                 this._connectionState = STATE.DISCONNECTING;
                 this._sendDisconnectResponseMessage(knxDisconnectRequest.channelID);
-                this._setDisconnected("Received Disconnect Request");
+                // 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);
+                }, 1000);
             }
             else if (knxHeader.service_type === KNXConstants.KNX_CONSTANTS.TUNNELING_REQUEST) {
 
@@ -932,7 +903,7 @@ class KNXClient extends EventEmitter {
                 // Check the received ACK sequence number
                 if (!this._options.suppress_ack_ldatareq) {
                     if (knxTunnelingAck.seqCounter === this._getSeqNumber()) {
-                        if (this._tunnelReqTimer !== null) clearTimeout(this._tunnelReqTimer);
+                        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
                         try {
@@ -1032,7 +1003,7 @@ class KNXClient extends EventEmitter {
         this.send(KNXProtocol.KNXProtocol.newKNXDescriptionRequest(new HPAI.HPAI(this._options.localIPAddress)));
     }
     _sendSearchRequestMessage() {
-        this.send(KNXProtocol.KNXProtocol.newKNXSearchRequest(new HPAI.HPAI(this._options.localIPAddress, this._localPort)), KNXConstants.KNX_CONSTANTS.KNX_PORT, KNXConstants.KNX_CONSTANTS.KNX_IP);
+        //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) {
         this.send(KNXProtocol.KNXProtocol.newKNXConnectRequest(cri));
@@ -1046,18 +1017,22 @@ class KNXClient extends EventEmitter {
     _sendDisconnectResponseMessage(channelID, status = KNXConstants.ConnectionStatus.E_NO_ERROR) {
         this.send(KNXProtocol.KNXProtocol.newKNXDisconnectResponse(channelID, status));
     }
-    _sendSecureSessionRequestMessage(cri, jKNXSecureKeyring) {
+    _sendSecureSessionRequestMessage(cri) {
         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, jKNXSecureKeyring));
+        this.send(KNXProtocol.KNXProtocol.newKNXSecureSessionRequest(cri, oHPAI));
     }
 }
 
+
 // module.exports = function KNXClientEvents() {
 //     return KNXClientEvents;
 // }
 module.exports = {
     KNXClient: KNXClient,
-    KNXClientEvents: KNXClientEvents
+    KNXClientEvents: KNXClientEvents,
+    getDecodedKeyring: function () {
+        return jKNXSecureKeyring;
+    } // Contains the decoded keyring file
 };
 //exports.KNXClient = KNXClient;
 //exports.KNXClientEvents = KNXClientEvents;

package/KNXEngine/KnxLog.js

@@ -1,6 +1,8 @@
 /**
 * (C) 2021 Supergiovane
 */
+"use strict";
+
 const util = require('util')
 const possibleLEvels = ['silent', 'error', 'warn', 'info', 'debug', 'trace'];
 let logger

package/KNXEngine/dptlib/dpt16.js

@@ -22,7 +22,8 @@ exports.formatAPDU = function (value) {
   }
 
   var buf = new Buffer.alloc(14);
-  buf.write(value, 'ascii')
+  if (this.subtypeid === "001") buf.write(value, 'latin1');
+  if (this.subtypeid === "000") buf.write(value, 'ascii');
   return buf;
 
 }
@@ -33,7 +34,9 @@ exports.fromBuffer = function (buf) {
     knxLog.get().error("DPT6: Buffer should be 14 byte long, got", buf.length);
     return null;
   }
-  return buf.toString('ascii');
+  if (this.subtypeid === "001") return buf.toString('latin1');
+  if (this.subtypeid === "000") return buf.toString('ascii');
+  
 
 }
 

package/README.md

@@ -21,7 +21,8 @@ payload = true // Turn light on
 payload = {red:255, green:200, blue:30} // Put some colors in our life
 ```
 
-## DESCRIPTION
+
+## NODE LIST
 
 * **KNX-ULTIMATE node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/2.-Node-Configuration), allow you to control your *KNX installation* via Node-Red. You can control all your KNX devices as well as create a *Virtual Device* in Node-Red, to link external *non KNX* devices, and make it compatible with your KNX installation. I'ts very SIMPLE TO USE thus very customizable.  
 * **SCENE CONTROLLER node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/SceneController-Configuration), The scene controller node can act as a real scene controller, with recall and save of the current scene.
@@ -32,6 +33,9 @@ payload = {red:255, green:200, blue:30} // Put some colors in our life
 * **LOAD CONTROL node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/LoadControl-Configuration). Control your loads (Oven, Washing machine, etc..) and avoit shutting down the main voltage due to too high power consumption.
 * **VIEWER node** [here](https://github.com/Supergiovane/node-red-contrib-knx-ultimate/wiki/knxUltimateViewer). View all Group Addresses and values of your KNX BUS, in the Node-Red Dashboard.
 
+<br>
+<br>
+
 ## CHANGELOG
 
 * See <a href="https://github.com/Supergiovane/node-red-contrib-knx-ultimate/blob/master/CHANGELOG.md">here the changelog</a>
@@ -39,18 +43,25 @@ payload = {red:255, green:200, blue:30} // Put some colors in our life
 <br>
 <br>
 
-## SEARCHING FOR HELP _ VOLUNTEER NEEDED _
+## VOLUNTEER NEEDED FOR KNX SECURE
+
 **************************************************
 **************************************************
-*I need volunteer helping in development of KNX Secure. High knowledge of cryptography and KNX is needed.*
+
+KNX-Secure is under development and **should** be ready by mid 2022.<br/>
+Many users requested me to "extract" the baseline KNX API and make it accessible via npmjs. Here is it.<br/>
+The API is named **KNXUltimate**. In the README page is well documented and there are also samples for unsecure and secure KNX connections.
+* <a href="https://github.com/Supergiovane/KNXUltimate#readme">KNXUltimate API</a>
+
+I need volunteer helping in development of KNX Secure.<br/>
+High knowledge of cryptography and KNX is needed.
 **************************************************
 **************************************************
 <br>
 <br>
 
-## KNX SECURE
 
-KNX-Secure is under development and **should** be ready by mid 2022. You can help me by clicking here [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square)](https://www.paypal.me/techtoday) 
+
 
 ## HELP, SAMPLES, TROUBLESHOOT, WIKI, FAQ, BEST PRACTICES
 

package/nodes/knxUltimate-config.html

@@ -247,7 +247,7 @@
          </div>
         <div id="SecureKNX" style="margin: 5px 5px 5px 5px;" >
             <p>
-                <p>WARNING: FUNCTION NOT ENABLED. KNX SECURE WILL BE ACTIVE ON EARLY 2022</p>
+                <p>WARNING: FUNCTION NOT ENABLED. KNX SECURE SHOULD BE READY ON MID 2022</p>
                 <div class="form-row">
                     <i class="fa fa-youtube"></i>
                     <a href="https://youtu.be/OpR7ZQTlMRU" target="_blank">