node-red-contrib-knx-ultimate 1.2.52 → 1.2.57

package/CHANGELOG.md

@@ -3,7 +3,45 @@
 [![Donate via PayPal](https://img.shields.io/badge/Donate-PayPal-blue.svg?style=flat-square)](https://www.paypal.me/techtoday) 
 
 <br/>
-
+<p>
+<b>Version 1.2.57</b> - November 2021<br/>
+- Added following datapoints:<br/>
+- 12.100 counter timesec (s)<br/>
+- 12.101 counter timemin (min)<br/>
+- 12.102 counter timehrs (h)<br/>
+- 12.1200 volume liquid (l)<br/>
+</p>
+<p>
+<b>Version 1.2.56</b> - November 2021<br/>
+- FIX: hotfix echo in tunneling mode doesn't work since 1.2.55.<br/>
+</p>
+<p>
+<b>Version 1.2.55</b> - November 2021<br/>
+- Gateway servere node: recoding of some javascript parts, to increase speed to better accomodate the crypt/entrypt process of the upcoming KNX-Secure implementation.<br/>
+- KNX-Secure: succesfully read ETS Keyring file and decrypt of Devices keys, Group Address keys, Backbone Key, Management Key and Auth Key.<br/>
+- KNX-Secure: a shield icon near the Gateway name in the KNX Device node appears, if KNX-Secure gateway has been selected.<br/>
+- KNX-Secure: node-red log now logs wether the gateway is secure or not, ETS Keyring project name, created By and ETS version.<br/>
+</p>
+<p>
+<b>Version 1.2.54</b> - November 2021<br/>
+- <font color="red">THIS VERSION TOUCHES MANY CONNECTIVITY POINTS.</font> It should handle all things better, but if you've trouble, you can always revert to the previous version by issuing <b>npm install node-red-contrib-knx-ultimate@1.2.53</b><br/>
+- Tunneling/Routing connection optimization: standardized delay in CONNECT_RESPONSE timeout and cleaned some code to better handling installations with more than 500 group addresses.<br/>
+- In tunneling mode, the node now signal the disconnection after 3 KNX Interface's connection state response failed, as per KNX standard.<br/>
+- Increased the socket telegram TTL (Time to Live) for Multicast as well as for Unicast, from 16 to 128 for better handling of multirouted packets.<br/>
+- Added "[THE GATEWAY NODE HAS BEEN DISABLED]" node status message, if you've disabled the KNX Gateway.<br/>
+- NEW: you can now choose to delay the connection to the KNX BUS at start. In some circumstances it's advisable to delay the connection to the BUS to allow the ethernet cards to be lifted up by the sysop. Thi happens often in VM environments.<br/>
+- Changing the log level in the Gateway node doesn't require a node-red restart anymore.<br/>
+- Because i'm flooded by user's queries, i removed a warning from the node status, if the persitent file has not yet been created.<br/>
+- Wait for message acknowledge by the IP router: now waits for 5 failed message ACKs before firing the disconnection sequence.<br/>
+- FIX: fixed a false "disconnection" node status, due to a glitch in the KNX API (after a connection request, the API was sending a false "disconnection" status). Chiamati in causa anche tutti i Santi, prima.<br/>
+- Fixed some check-connection timers not stopping in time.<br/>
+- Speed up the first KNX connection after node-red start/restart/deploy.<br/>
+- Speed up the reconnection attempts in case of disconnections.<br/>
+</p>
+<p>
+<b>Version 1.2.53</b> - November 2021<br/>
+- Device node: as soon as you add a new node with "read from bus at start" option enabeld, it requests the value from the BUS also if you DEPLOY "modified nodes" only. Prior to that, you had to do a full DEPLOY.<br/>
+</p>
 <p>
 <b>Version 1.2.52</b> - October 2021<br/>
 - KNX Logger node: fixed some default fields.<br/>

package/knxultimate-api2/src/Address.js

@@ -2,7 +2,6 @@
 * knxultimate-api - a KNX protocol stack in pure Javascript based on knx.js (originally written by Elias Karakoulakis)
 * (C) 2021 Supergiovane
 */
-const KnxLog = require('./KnxLog')
 const Parser = require('binary-parser').Parser
 const KnxConstants = require('./KnxConstants')
 
@@ -48,7 +47,7 @@ Address.toString = function (buf /* buffer */, addrtype /* ADDRESS_TYPE */, twoL
   let group = (addrtype === KnxConstants.KNX_ADDR_TYPES.GROUP)
   let address = null
 
-  // KnxLog.get().trace('%j, type: %d, %j', buf, addrtype, knxnetprotocol.twoLevelAddressing);
+
   if (!(typeof buf === 'object' && buf.constructor.name === 'Buffer' && buf.length === 2)) {
     throw Error('not a buffer, or not a 2-byte address buffer')
   }
@@ -71,7 +70,7 @@ Address.toString = function (buf /* buffer */, addrtype /* ADDRESS_TYPE */, twoL
 // parse address string to 2-byte Buffer
 Address.parse = function (addr /* string */, addrtype /* TYPE */, twoLevelAddressing) {
   if (!addr) {
-    KnxLog.get().warn('Fix your code - no address given to Address.parse')
+    return "";
   }
 
   let group = (addrtype === KnxConstants.KNX_ADDR_TYPES.GROUP)

package/knxultimate-api2/src/Connection.js

@@ -26,22 +26,23 @@ const onUdpSocketMessage = function (msg /*, rinfo, callback */) {
   //   // DISCONNECT_RESPONSE:  0x020a,
   //   var pera =true;
   // }
-
+  
   try {
     let reader = KnxNetProtocol.createReader(msg)
     let dg
-
+    
     reader.KNXNetHeader('tmp')
-
+    
     if (reader.next()['tmp']) {
       dg = reader.next()['tmp']
     }
-
+    
     /* Catch broken messages       */
     if (dg) {
       /*******************************/
       // if (pera === true) console.log ("BANANA OCCHIO PERA TRUE",msg.toString("hex"),dg)
       const descr = this.datagramDesc(dg)
+      
 
       KnxLog.get().trace('(%s): Received %s message: %j', this.compositeState(), descr, dg)
 
@@ -84,7 +85,6 @@ const onUdpSocketMessage = function (msg /*, rinfo, callback */) {
     }
     /*******************************/
   } catch (err) {
-    console.trace(err)
     KnxLog.get().debug('(%s): Incomplete/unparseable UDP packet: %s: %s',
       this.compositeState(), err, msg.toString()
     );
@@ -199,7 +199,7 @@ const prepareDatagram = function (svcType) {
       this.AddTunnState(datagram)
       break
     default:
-      this.log.debug('Do not know how to deal with svc type %d', svcType)
+      KnxLog.get().debug('Do not know how to deal with svc type %d', svcType)
   }
 
   return datagram
@@ -209,20 +209,28 @@ const prepareDatagram = function (svcType) {
 const send = function (datagram, callback) {
   const conn = this
   let buf
-  let ret
+  let ret = null;
   let descr
 
   if (datagram.constructor !== Buffer) {
-    this.writer = KnxNetProtocol.createWriter()
+    try {
+      this.writer = KnxNetProtocol.createWriter()
+    } catch (error) {
+    }
+
 
     // Forge the datagram
-    ret = this.writer.KNXNetHeader(datagram)
+    try {
+      ret = this.writer.KNXNetHeader(datagram)
+    } catch (error) {
+    }
+
 
     // Check if ret.buffer is null ==> if this.writer.KNXNetHeader() failed
-    if (ret.buffer === null) {
+    if (ret === null || ret.buffer === null) {
       // Check if error was set - if not, pass a standard message to callback
       ret.error !== null ? callback(ret.error) : callback(Error('Unknown error!'))
-
+      KnxLog.get().error(' Const send = function (datagram, callback) %s (%s)', this.compositeState() || "", ret || "");
       // Cancel the sending process
       return null; // 25/03/2021 Supergiovane: was return;
     }
@@ -240,13 +248,12 @@ const send = function (datagram, callback) {
     buf, 0, buf.length,
     conn.remoteEndpoint.port, conn.remoteEndpoint.addr.toString(),
     function (err) {
-        KnxLog.get().trace('(%s): UDP sent %s: %s %s', conn.compositeState(),
-          (err ? err.toString() : 'OK'), descr, buf.toString()
-        )
+      KnxLog.get().trace('(%s): UDP sent %s: %s %s', conn.compositeState(),
+        (err ? err.toString() : 'OK'), descr, buf.toString()
+      )
       if (typeof callback === 'function') callback(err)
     }
   )
-
   return buf; // 25/03/2021 Supergiovane
 }
 
@@ -257,7 +264,7 @@ const write = function (grpaddr, value, dptid, callback) {
   }
 
   if (grpaddr == null || value == null) {
-    this.log.warn('You must supply both grpaddr and value!')
+    KnxLog.get().warn('You must supply both grpaddr and value!')
     return
   }
   // outbound request onto the state machine
@@ -276,7 +283,7 @@ const respond = function (grpaddr, value, dptid) {
     return; // 02/10/2020 Supergiovane: if in tunnel mode and is not connected, exit
   }
   if (grpaddr == null || value == null) {
-    this.log.warn('You must supply both grpaddr and value!')
+    KnxLog.get().warn('You must supply both grpaddr and value!')
     return
   }
   const serviceType = this.useTunneling
@@ -297,11 +304,11 @@ const writeRaw = function (grpaddr, value, bitlength, callback) {
     return; // 02/10/2020 Supergiovane: if in tunnel mode and is not connected, exit
   }
   if (grpaddr == null || value == null) {
-    this.log.warn('You must supply both grpaddr and value!')
+    KnxLog.get().warn('You must supply both grpaddr and value!')
     return
   }
   if (!Buffer.isBuffer(value)) {
-    this.log.warn('Value must be a buffer!')
+    KnxLog.get().warn('Value must be a buffer!')
     return
   }
   // outbound request onto the state machine
@@ -319,7 +326,6 @@ const writeRaw = function (grpaddr, value, bitlength, callback) {
 // you can pass a callback function which gets bound to the RESPONSE datagram event
 const read = function (grpaddr, callback) {
   if (this.useTunneling && this.isTunnelConnected === false) {
-    // console.log("BANANA exit FSM.prototype.write Tunnel down");
     return; // 02/10/2020 Supergiovane: if in tunnel mode and is not connected, exit
   }
 
@@ -366,11 +372,16 @@ const read = function (grpaddr, callback) {
 const Disconnect = function (/* cb */) {
   this.transition('disconnecting');
   //console.log("BANANA Logger distrutto");
+  try {
+    //KnxLog.get().info('Socket disconnected.');
+    //console.log("BANANA Socket disconnected.")
+    //this.socket.disconnect();
+  } catch (error) {
+    //console.log("BANANA ORRORE Socket disconnected.",error)
+  }
   try {
     KnxLog.destroy(); // 16/08/2020 Force reinstantiation of the logger to refresh the settings.
   } catch (error) { }
-  // machina.js removeAllListeners equivalent:
-  // this.off();
 }
 
 // return a descriptor for this datagram (TUNNELING_REQUEST_L_Data.ind)
@@ -430,7 +441,7 @@ const Connection = function (options) {
   if (typeof options.handlers === 'object') {
     Object.keys(options.handlers).forEach(function (key) {
       if (typeof options.handlers[key] === 'function') {
-        conn.on(key, options.handlers[key])
+        conn.on(key, options.handlers[key]);
       }
     })
   }