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

package/CHANGELOG.md

@@ -7,7 +7,13 @@
 # CHANGELOG
 
 <p>
-<b>Version 1.3.39</b> - Mai 2022<br/>
+<b>Version 1.3.41</b> - Mai 2022<br/>
+- Fixed an issue in the gateway config node UI, where you manually set the IP interface name.<br />
+- Fixed an issue introduced by a breaking change in Node 18.<br />
+- Added more "trace" log in the ipAddressHelper function, to better track the ethernet interface details.<br />
+</p>
+<p>
+<b>Version 1.3.40</b> - Mai 2022<br/>
 - Fixed an issue in the GlobalContext node, preventing the node from searching for the DPT, if the CSV ETS file has been imported and you don't specify the DPT in the msg input. Thanks to @Sebastien-Posca for pointing me out that.<br />
 </p>
 <p>

package/KNXEngine/KNXClient.js

@@ -350,7 +350,8 @@ class KNXClient extends EventEmitter {
         } else {
             // Tunneling
             const cEMIMessage = CEMIFactory.CEMIFactory.newLDataRequestMessage("write", srcAddress, dstAddress, data);
-            cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+            //cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1; // No ack like telegram sent from ETS (0 means don't care)
+            cEMIMessage.control.ack = 0;// No ack like telegram sent from ETS (0 means don't care)
             cEMIMessage.control.broadcast = 1;
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
@@ -383,7 +384,7 @@ class KNXClient extends EventEmitter {
         if (this._options.hostProtocol === "Multicast") {
             // Multicast
             const cEMIMessage = CEMIFactory.CEMIFactory.newLDataIndicationMessage("response", srcAddress, dstAddress, data);
-            cEMIMessage.control.ack = 0;
+            cEMIMessage.control.ack = 0; // No ack like telegram sent from ETS (0 means don't care)
             cEMIMessage.control.broadcast = 1;
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
@@ -395,7 +396,8 @@ class KNXClient extends EventEmitter {
         } else {
             // Tunneling
             const cEMIMessage = CEMIFactory.CEMIFactory.newLDataRequestMessage("response", srcAddress, dstAddress, data);
-            cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+            //cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+            cEMIMessage.control.ack = 0;// No ack like telegram sent from ETS (0 means don't care)
             cEMIMessage.control.broadcast = 1;
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
@@ -436,7 +438,8 @@ class KNXClient extends EventEmitter {
         } else {
             // Tunneling
             const cEMIMessage = CEMIFactory.CEMIFactory.newLDataRequestMessage("read", srcAddress, dstAddress, null);
-            cEMIMessage.control.ack = 0;// No ack like telegram sent from ETS
+             //cEMIMessage.control.ack = this._options.suppress_ack_ldatareq ? 0 : 1;
+            cEMIMessage.control.ack = 0;// No ack like telegram sent from ETS (0 means don't care)
             cEMIMessage.control.broadcast = 1;
             cEMIMessage.control.priority = 3;
             cEMIMessage.control.addressType = 1;
@@ -764,6 +767,7 @@ class KNXClient extends EventEmitter {
         }, KNXConstants.KNX_CONSTANTS.TUNNELING_REQUEST_TIMEOUT * 1000);
 
     }
+
     _processInboundMessage(msg, rinfo) {
 
         try {
@@ -879,13 +883,24 @@ class KNXClient extends EventEmitter {
 
                 const knxTunnelingRequest = knxMessage;
                 if (knxTunnelingRequest.channelID !== this._channelID) {
+                    try {
+                        this.sysLogger.debug("Received KNX packet: TUNNELING: L_DATA_IND, NOT FOR ME: MyChannelID:" + this._channelID + " ReceivedPacketChannelID: " + knxTunnelingRequest.channelID + " ReceivedPacketseqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                    } catch (error) { }
                     return;
                 }
                 // 26/12/2021 send the ACK if the server requestet that
                 // Then REMOVED, because some interfaces sets the "ack request" always to 0 even if it needs ack.
                 //if (knxMessage.cEMIMessage.control.ack){
-                let knxTunnelAck = KNXProtocol.KNXProtocol.newKNXTunnelingACK(knxTunnelingRequest.channelID, knxTunnelingRequest.seqCounter, KNXConstants.KNX_CONSTANTS.E_NO_ERROR);
-                this.send(knxTunnelAck);
+                //setTimeout(() => {
+                try {
+                    let knxTunnelAck = KNXProtocol.KNXProtocol.newKNXTunnelingACK(knxTunnelingRequest.channelID, knxTunnelingRequest.seqCounter, KNXConstants.KNX_CONSTANTS.E_NO_ERROR);
+                    this.send(knxTunnelAck);
+                } catch (error) {
+                    this.sysLogger.error("Received KNX packet: TUNNELING: L_DATA_IND, ERROR BUOLDING THE TUNNELINK ACK: " + error.message + " MyChannelID:" + this._channelID + " ReceivedPacketChannelID: " + knxTunnelingRequest.channelID + " ReceivedPacketseqCounter:" + knxTunnelingRequest.seqCounter + " Host:" + this._options.ipAddr + ":" + this._options.ipPort);
+                }
+
+                //}, 20);
+
                 //}      
 
                 if (knxTunnelingRequest.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_IND) {
@@ -973,6 +988,8 @@ class KNXClient extends EventEmitter {
                         this.emit(KNXClientEvents.indication, knxRoutingInd, false);
                     } catch (error) {
                     }
+
+
                 }
                 else if (knxRoutingInd.cEMIMessage.msgCode === CEMIConstants.CEMIConstants.L_DATA_CON) {
 

package/KNXEngine/util/ipAddressHelper.js

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

package/nodes/knxUltimate-config.html

@@ -278,6 +278,10 @@
         </label>
         <select id="node-config-input-KNXEthInterface"></select>
     </div>
+    <div class="form-row" id="divKNXEthInterfaceManuallyInput" style="display: none;">
+        <label for="node-config-input-KNXEthInterfaceManuallyInput">Interface name:</label>
+        <input type="text" id="node-config-input-KNXEthInterfaceManuallyInput" placeholder="Interface name, ex: eth0 or ens1 or Ethernet 1 and so on..."></input>
+    </div>
     <div class="form-row">
         <label for="node-config-input-autoReconnect" style="width: 200px">
             <i class="fa fa-plug"></i>
@@ -288,10 +292,7 @@
             <option value="no" data-i18n="knxUltimate-config.properties.autoReconnect_no"></option>
         </select>
     </div>
-    <div class="form-row" id="divKNXEthInterfaceManuallyInput" style="display: none;">
-        <label for="node-config-input-KNXEthInterfaceManuallyInput"></label>
-        <input type="text" id="node-config-input-KNXEthInterfaceManuallyInput" placeholder="Interface name, ex: eth0 or ens1 or Ethernet 1 and so on..."></input>
-    </div>
+    
     <div id="advancedOptionsAccordion">
         <h3><span data-i18n="knxUltimate-config.properties.adv_options"></span></h3>
         <div>

package/nodes/knxUltimate-config.js

@@ -431,6 +431,7 @@ return msg;`, "helplink": "https://github.com/Supergiovane/node-red-contrib-knx-
 
         // 16/02/2020 KNX-Ultimate nodes calls this function, then this funcion calls the same function on the Watchdog
         node.reportToWatchdogCalledByKNXUltimateNode = (_oError) => {
+            // _oError is = { nodeid: node.id, topic: node.outputtopic, devicename: devicename, GA: GA, text: text };
             var readHistory = [];
             let delay = 0;
             node.nodeClients

package/nodes/knxUltimate.js

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

package/nodes/knxUltimateSceneController.js

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

package/nodes/knxUltimateWatchDog.js

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

package/package.json

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