node-red-contrib-knx-ultimate 3.2.0 → 3.2.1

package/nodes/knxUltimateLoadControl.js

@@ -1,11 +1,18 @@
 
+// 10/09/2024 Setup the color logger
+loggerSetup = (options) => {
+  let clog = require("node-color-log").createNamedLogger(options.setPrefix);
+  clog.setLevel(options.loglevel);
+  clog.setDate(() => (new Date()).toLocaleString());
+  return clog;
+}
 module.exports = function (RED) {
   function knxUltimateLoadControl(config) {
     // const Address = require('knxultimate')
 
     RED.nodes.createNode(this, config)
     const node = this
-    node.server = RED.nodes.getNode(config.server)
+    node.serverKNX = RED.nodes.getNode(config.server)
     node.name = config.name || 'KNX Load Control'
     node.topic = config.topic
     node.dpt = config.dpt
@@ -31,6 +38,8 @@ module.exports = function (RED) {
     node.mainTimer = null
     node.totalWatt = 0 // Current total watt consumption
     node.wattLimit = config.wattLimit === undefined ? 3000 : Number(config.wattLimit)
+    node.sysLogger = loggerSetup({ loglevel: node.serverKNX.loglevel, setPrefix: "knxUltimateLoadControl.js" }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
+
     node.deviceList = []
     for (let index = 1; index < 6; index++) {
       // Eval, the magic. Fill in the device list. DEFINITION DEVICELIST
@@ -46,15 +55,9 @@ module.exports = function (RED) {
       })
     }
 
-    try {
-      node.sysLogger = require('./utils/sysLogger.js').get({ loglevel: node.server.loglevel || 'error' }) // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
-    } catch (error) {
-      node.sysLogger = 'error'
-    }
-
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload, GA, dpt, devicename }) => {
-      if (node.server === null) return
+      if (node.serverKNX === null) return
       // Log only service statuses, not the GA values
       try {
         if (dpt !== '') return
@@ -117,9 +120,9 @@ module.exports = function (RED) {
 
     // 03/02/2022 perform a read on all GA in the list
     node.initialReadAllDevicesInRules = () => {
-      if (node.server) {
+      if (node.serverKNX) {
         // Read status of the Total Power GA
-        if (node.topic !== undefined && node.topic !== null && node.topic !== '') node.server.writeQueueAdd({ grpaddr: node.topic, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id })
+        if (node.topic !== undefined && node.topic !== null && node.topic !== '') node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr: node.topic, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id })
 
         for (let i = 0; i < node.deviceList.length; i++) {
           const grpaddr = node.deviceList[i].monitorGA
@@ -128,7 +131,7 @@ module.exports = function (RED) {
               // Check if it's a group address
               // const ret = Address.KNXAddress.createFromString(grpaddr, Address.KNXAddress.TYPE_GROUP)
               // node.setLocalStatus({ fill: "grey", shape: "dot", text: "Read Power from BUS" });
-              node.server.writeQueueAdd({ grpaddr, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id })
+              node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr, payload: '', dpt: '', outputtype: 'read', nodecallerid: node.id })
             } catch (error) {
               node.setLocalStatus({ fill: 'grey', shape: 'dot', text: 'Not a KNX GA ' + error.message })
             }
@@ -177,7 +180,7 @@ module.exports = function (RED) {
       // Increase shedding timer (Switch off devices)
       if (node.timerIncreaseShedding !== null) clearTimeout(node.timerIncreaseShedding)
       node.timerIncreaseShedding = setTimeout(() => {
-        if (node.server) {
+        if (node.serverKNX) {
           // Check consumption
           if (node.totalWatt > node.wattLimit) {
             // Start increasing shedding!
@@ -195,7 +198,7 @@ module.exports = function (RED) {
       // Decrease shedding timer (Switch devices on again)
       if (node.timerDecreaseShedding !== null) clearTimeout(node.timerDecreaseShedding)
       node.timerDecreaseShedding = setTimeout(() => {
-        if (node.server) {
+        if (node.serverKNX) {
           // Check consumption
           if (node.totalWatt <= node.wattLimit) {
             // Start decreasing shedding!
@@ -230,7 +233,7 @@ module.exports = function (RED) {
       if (oRow.ga !== undefined && oRow.ga !== '' && oRow.ga !== null) {
         // Check if the device is in use. If not, turn off the device and further increase the shedding stage to turn off the next one.
         node.setLocalStatus({ fill: 'red', shape: 'dot', text: 'OFF ' + oRow.name })
-        node.server.writeQueueAdd({ grpaddr: oRow.ga, payload: false, dpt: oRow.dpt, outputtype: 'write', nodecallerid: node.id })
+        node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr: oRow.ga, payload: false, dpt: oRow.dpt, outputtype: 'write', nodecallerid: node.id })
       } else {
         node.setLocalStatus({ fill: 'grey', shape: 'dot', text: 'No GA defined' })
       }
@@ -271,7 +274,7 @@ module.exports = function (RED) {
         if (oRow.autoRestore === true) {
           // Check if the device is in use. If not, turn off the device and further increase the shedding stage to turn off the next one.
           node.setLocalStatus({ fill: 'green', shape: 'dot', text: 'ON ' + oRow.name })
-          node.server.writeQueueAdd({ grpaddr: oRow.ga, payload: true, dpt: oRow.dpt, outputtype: 'write', nodecallerid: node.id })
+          node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr: oRow.ga, payload: true, dpt: oRow.dpt, outputtype: 'write', nodecallerid: node.id })
         } else {
           // Cannot auto switch on the load.
           node.setLocalStatus({ fill: 'yellow', shape: 'dot', text: 'Auto Restore disabled ' + oRow.name })
@@ -303,7 +306,7 @@ module.exports = function (RED) {
         node.sheddingStage = 0
         for (let index = 0; index < node.deviceList.length; index++) {
           const oRow = node.deviceList[index]
-          if (oRow.autoRestore === true) node.server.writeQueueAdd({ grpaddr: oRow.ga, payload: true, dpt: oRow.dpt, outputtype: 'write', nodecallerid: node.id })
+          if (oRow.autoRestore === true) node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr: oRow.ga, payload: true, dpt: oRow.dpt, outputtype: 'write', nodecallerid: node.id })
         }
         const t = setTimeout(() => { // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
           node.setLocalStatus({ fill: 'green', shape: 'dot', text: 'All loads have been restored' })
@@ -363,17 +366,17 @@ module.exports = function (RED) {
       if (node.mainTimer !== null) clearInterval(node.mainTimer)
       if (node.timerDecreaseShedding !== null) clearTimeout(node.timerDecreaseShedding)
       if (node.timerIncreaseShedding !== null) clearTimeout(node.timerIncreaseShedding)
-      if (node.server) {
-        node.server.removeClient(node)
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node)
       }
       done()
     })
 
     // On each deploy, unsubscribe+resubscribe
-    if (node.server) {
-      node.server.removeClient(node)
+    if (node.serverKNX) {
+      node.serverKNX.removeClient(node)
       if (node.topic !== '') {
-        node.server.addClient(node)
+        node.serverKNX.addClient(node)
       }
     }
   }

package/nodes/knxUltimateLogger.js

@@ -2,7 +2,7 @@ module.exports = function (RED) {
   function knxUltimateLogger(config) {
     RED.nodes.createNode(this, config)
     const node = this
-    node.server = RED.nodes.getNode(config.server)
+    node.serverKNX = RED.nodes.getNode(config.server)
     node.notifyreadrequestalsorespondtobus = 'false'
     node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = ''
     node.notifyreadrequest = true
@@ -29,7 +29,7 @@ module.exports = function (RED) {
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload, GA, dpt, devicename }) => {
       try {
-        if (node.server == null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
+        if (node.serverKNX === null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
         const dDate = new Date()
         // 30/08/2019 Display only the things selected in the config
         GA = (typeof GA === 'undefined' || GA == '') ? '' : '(' + GA + ') '
@@ -41,7 +41,7 @@ module.exports = function (RED) {
       }
     }
 
-    if (!node.server) return
+    if (!node.serverKNX) return
 
     // 26/03/2020 Create and output the XML for ETS bus monitor
     function createETSXML() {
@@ -133,19 +133,19 @@ module.exports = function (RED) {
     node.on('close', function (done) {
       if (node.timerCreateETSXML !== null) clearInterval(node.timerCreateETSXML)
       if (node.timerTelegramCount !== null) clearInterval(node.timerTelegramCount)
-      if (node.server) {
-        node.server.removeClient(node)
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node)
       };
       done()
     })
 
     // On each deploy, unsubscribe+resubscribe
     // Unsubscribe(Subscribe)
-    if (node.server) {
+    if (node.serverKNX) {
       if (node.timerCreateETSXML !== null) clearInterval(node.timerCreateETSXML)
       if (node.timerTelegramCount !== null) clearInterval(node.timerTelegramCount)
-      node.server.removeClient(node)
-      node.server.addClient(node)
+      node.serverKNX.removeClient(node)
+      node.serverKNX.addClient(node)
       if (node.autoStartTimerCreateETSXML) node.StartETSXMLTimer() // autoStartTimerCreateETSXML ETS timer
       if (node.autoStartTimerTelegramCounter) node.StartTelegramCounterTimer()
     }

package/nodes/knxUltimateSceneController.js

@@ -1,3 +1,10 @@
+// 10/09/2024 Setup the color logger
+loggerSetup = (options) => {
+  let clog = require("node-color-log").createNamedLogger(options.setPrefix);
+  clog.setLevel(options.loglevel);
+  clog.setDate(() => (new Date()).toLocaleString());
+  return clog;
+}
 module.exports = function (RED) {
   function knxUltimateSceneController(config) {
     const fs = require('fs')
@@ -6,7 +13,7 @@ module.exports = function (RED) {
 
     RED.nodes.createNode(this, config)
     const node = this
-    node.server = RED.nodes.getNode(config.server)
+    node.serverKNX = RED.nodes.getNode(config.server)
     node.name = config.name || 'KNX Scene Controller'
     node.outputtopic = typeof config.outputtopic === 'undefined' ? '' : config.outputtopic
     node.topic = config.topic || ''
@@ -26,7 +33,7 @@ module.exports = function (RED) {
     node.rules = config.rules || [{}]
     node.isSceneController = true // Signal to config node, that this is a node scene controller
     node.userDir = path.join(RED.settings.userDir, 'knxultimatestorage') // 09/03/2020 Storage of ttsultimate (otherwise, at each upgrade to a newer version, the node path is wiped out and recreated, loosing all custom files)
-    node.sysLogger = require('./utils/sysLogger.js').get({ loglevel: node.server.loglevel || 'error' }) // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
+    node.sysLogger = loggerSetup({ loglevel: node.serverKNX.loglevel, setPrefix: "knxUltimateLoadControl.js" }); // 08/04/2021 new logger to adhere to the loglevel selected in the config-window
     node.timerWait = null
     node.icountMessageInWindow = 0
     node.disabled = false // 21/09/2020 you can now disable the scene controller
@@ -84,7 +91,7 @@ module.exports = function (RED) {
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload, GA, dpt, devicename }) => {
       try {
-        if (node.server == null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
+        if (node.serverKNX === null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
         if (node.icountMessageInWindow == -999) return // Locked out
         if (node.disabled === true) fill = 'grey' // 21/09/2020 if disabled, color is grey
         const dDate = new Date()
@@ -96,9 +103,9 @@ module.exports = function (RED) {
         node.status({ fill, shape, text: GA + payload + (node.listenallga === true ? ' ' + devicename : '') + ' (' + dDate.getDate() + ', ' + dDate.toLocaleTimeString() + ' ' + text })
         // 16/02/2020 signal errors to the server
         if (fill.toUpperCase() === 'RED') {
-          if (node.server) {
+          if (node.serverKNX) {
             const oError = { nodeid: node.id, topic: node.outputtopic, devicename, GA, text }
-            node.server.reportToWatchdogCalledByKNXUltimateNode(oError)
+            node.serverKNX.reportToWatchdogCalledByKNXUltimateNode(oError)
           };
         };
       } catch (error) {
@@ -234,7 +241,7 @@ module.exports = function (RED) {
           }
         } else {
           // Topic is Group Address
-          node.server.writeQueueAdd({ grpaddr: rule.topic, payload: oPayload, dpt: rule.dpt, outputtype: 'write', nodecallerid: node.id })
+          node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr: rule.topic, payload: oPayload, dpt: rule.dpt, outputtype: 'write', nodecallerid: node.id })
         }
       }
       const t = setTimeout(() => { // 21/03/2022 fixed possible memory leak. Previously was setTimeout without "let t = ".
@@ -366,8 +373,8 @@ module.exports = function (RED) {
     node.on('input', function (msg) {
       if (typeof msg === 'undefined') return
 
-      if (!node.server) return // 29/08/2019 Server not instantiate
-      if (node.server.linkStatus !== 'connected') {
+      if (!node.serverKNX) return // 29/08/2019 Server not instantiate
+      if (node.serverKNX.linkStatus !== 'connected') {
         if (node.sysLogger !== undefined && node.sysLogger !== null) node.sysLogger.error('knxUltimateSceneController: Lost link due to a connection error')
         return // 29/08/2019 If not connected, exit
       }
@@ -401,16 +408,16 @@ module.exports = function (RED) {
     })
 
     node.on('close', function (done) {
-      if (node.server) {
-        node.server.removeClient(node)
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node)
       }
       done()
     })
 
     // On each deploy, unsubscribe+resubscribe
-    if (node.server) {
-      node.server.removeClient(node)
-      node.server.addClient(node)
+    if (node.serverKNX) {
+      node.serverKNX.removeClient(node)
+      node.serverKNX.addClient(node)
     }
   }
   RED.nodes.registerType('knxUltimateSceneController', knxUltimateSceneController)

package/nodes/knxUltimateViewer.js

@@ -5,7 +5,7 @@ module.exports = function (RED) {
   function knxUltimateViewer(config) {
     RED.nodes.createNode(this, config);
     const node = this;
-    node.server = RED.nodes.getNode(config.server);
+    node.serverKNX = RED.nodes.getNode(config.server);
     node.topic = node.name;
     node.name = config.name === undefined ? 'KNXViewer' : config.name;
     node.outputtopic = node.name;
@@ -31,7 +31,7 @@ module.exports = function (RED) {
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload, GA, dpt, devicename }) => {
       try {
-        if (node.server == null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return; }
+        if (node.serverKNX === null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return; }
         GA = GA === undefined ? '' : GA;
         payload = payload === undefined ? '' : payload;
         payload = typeof payload === 'object' ? JSON.stringify(payload) : payload;
@@ -140,7 +140,7 @@ module.exports = function (RED) {
       //   outputtype: "read",
       //   nodecallerid: _oClient.id,
       // });
-      const aItems = _.clone(node.server.telegramsQueue);
+      const aItems = _.clone(node.serverKNX.telegramsQueue);
       let sPayload = '';
 
       const sHead = `<div class="main"><table><caption>Queue of outgoing telegrams to the KNX BUS. The more the count,</br>the more congested is the KNX BUS.</caption>
@@ -206,16 +206,16 @@ module.exports = function (RED) {
 
     node.on('close', function (done) {
       if (timerPIN3 !== null) clearInterval(timerPIN3);
-      if (node.server) {
-        node.server.removeClient(node);
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node);
       }
       done();
     });
 
     // On each deploy, unsubscribe+resubscribe
-    if (node.server) {
-      node.server.removeClient(node);
-      node.server.addClient(node);
+    if (node.serverKNX) {
+      node.serverKNX.removeClient(node);
+      node.serverKNX.addClient(node);
     }
   }
   RED.nodes.registerType('knxUltimateViewer', knxUltimateViewer);

package/nodes/knxUltimateWatchDog.js

@@ -4,7 +4,7 @@ module.exports = function (RED) {
   function knxUltimateWatchDog(config) {
     RED.nodes.createNode(this, config)
     const node = this
-    node.server = RED.nodes.getNode(config.server)
+    node.serverKNX = RED.nodes.getNode(config.server)
     node.dpt = '1.001'
     node.notifyreadrequestalsorespondtobus = 'false'
     node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = ''
@@ -31,7 +31,7 @@ module.exports = function (RED) {
     // Used to call the status update from the config node.
     node.setNodeStatus = ({ fill, shape, text, payload, GA, dpt, devicename }) => {
       try {
-        if (node.server == null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
+        if (node.serverKNX === null) { node.status({ fill: 'red', shape: 'dot', text: '[NO GATEWAY SELECTED]' }); return }
         if (node.icountMessageInWindow == -999) return // Locked out, doesn't change status.
         const dDate = new Date()
         // 30/08/2019 Display only the things selected in the config
@@ -44,7 +44,7 @@ module.exports = function (RED) {
       }
     }
 
-    if (!node.server) return
+    if (!node.serverKNX) return
 
     function handleTheDog() {
       node.beatNumber += 1
@@ -65,7 +65,7 @@ module.exports = function (RED) {
           const cfg = {
             timeout: 2
           }
-          ping.sys.probe(node.server.host, function (isAlive) {
+          ping.sys.probe(node.serverKNX.host, function (isAlive) {
             if (isAlive) {
               node.watchDogTimerReset()
             } else {
@@ -74,8 +74,8 @@ module.exports = function (RED) {
           }, cfg)
         } else {
           // Issue a read request
-          if (node.server.knxConnection) {
-            node.server.writeQueueAdd({ grpaddr: node.topic, payload: '', dpt: '', outputtype: 'read' })
+          if (node.serverKNX.knxConnection) {
+            node.serverKNX.sendKNXTelegramToKNXEngine({ grpaddr: node.topic, payload: '', dpt: '', outputtype: 'read' })
             node.setNodeStatus({ fill: 'grey', shape: 'dot', text: 'Checking level ' + node.checkLevel + ', with beat telegram ' + node.beatNumber + ' of ' + node.maxRetry, payload: '', GA: '', dpt: '', devicename: '' })
           };
         }
@@ -151,12 +151,12 @@ module.exports = function (RED) {
         };
       };
 
-      if (node.server === undefined) return
+      if (node.serverKNX === undefined) return
 
       // 01/02/2020 Dinamic change of the KNX Gateway IP, Port and Physical Address
       // This new thing has been requested by proServ RealKNX staff.
       if (msg.hasOwnProperty('setGatewayConfig')) {
-        node.server.setGatewayConfig(msg.setGatewayConfig.IP, msg.setGatewayConfig.Port, msg.setGatewayConfig.PhysicalAddress, msg.setGatewayConfig.BindToEthernetInterface, msg.setGatewayConfig.Protocol, msg.setGatewayConfig.importCSV)
+        node.serverKNX.setGatewayConfig(msg.setGatewayConfig.IP, msg.setGatewayConfig.Port, msg.setGatewayConfig.PhysicalAddress, msg.setGatewayConfig.BindToEthernetInterface, msg.setGatewayConfig.Protocol, msg.setGatewayConfig.importCSV)
         const ret = {
           type: 'setGatewayConfig',
           checkPerformed: 'The Watchdog node changed the gateway configuration.',
@@ -170,7 +170,7 @@ module.exports = function (RED) {
 
       // 05/05/2021 force connection/disconnectio of the gateway
       if (msg.hasOwnProperty('connectGateway')) {
-        node.server.connectGateway(msg.connectGateway)
+        node.serverKNX.connectGateway(msg.connectGateway)
         const ret = {
           type: 'connectGateway',
           checkPerformed: 'The Watchdog issued a connection/disconnection to the gateway.',
@@ -185,19 +185,19 @@ module.exports = function (RED) {
 
     node.on('close', function (done) {
       if (node.timerWatchDog !== null) clearInterval(node.timerWatchDog)
-      if (node.server) {
-        node.server.removeClient(node)
+      if (node.serverKNX) {
+        node.serverKNX.removeClient(node)
       };
       done()
     })
 
     // On each deploy, unsubscribe+resubscribe
     // Unsubscribe(Subscribe)
-    if (node.server) {
+    if (node.serverKNX) {
       if (node.timerWatchDog !== null) clearInterval(node.timerWatchDog)
-      node.server.removeClient(node)
+      node.serverKNX.removeClient(node)
       if (node.topic || node.listenallga) {
-        node.server.addClient(node)
+        node.serverKNX.addClient(node)
         if (node.autoStart) node.StartWatchDogTimer() // Autostart watchdog
       }
     }

package/nodes/utils/http.js

@@ -27,7 +27,6 @@ module.exports.use = (config) => {
             simpleget.concat(opt, (err, res, data) => {
                 try {
                     if (err) {
-                        RED.log.error(`utils.https: config.http.call: simpleget.concat ${err.message} : ${err.stack || ""} `);
                         reject(err);
                     } else {
                         // log.trace('http data ' + data);

package/nodes/utils/hueEngine.js

@@ -124,7 +124,7 @@ class classHUE extends EventEmitter {
             const ok = await this.hueApiV2.put(`/resource/light/${jRet._lightID}`, jRet._state);
           } catch (error) {
             if (this.sysLogger !== undefined && this.sysLogger !== null) {
-              this.sysLogger.info(`KNXUltimatehueEngine: classHUE: handleQueue: setLight light: ${error.message}. CHECK WETHER THE DEVICE IS POWERED ON`);
+              this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: setLight light: ${error.message}. CHECK WETHER THE DEVICE IS POWERED ON`);
             }
           }
           break;
@@ -164,8 +164,9 @@ class classHUE extends EventEmitter {
           } catch (error) {
             if (this.sysLogger !== undefined && this.sysLogger !== null) this.sysLogger.error(`KNXUltimatehueEngine: classHUE: handleQueue: Ping: ${error.message}`);
             if (this.timerCheckConnected !== null) clearInterval(this.timerCheckConnected);
-            this.commandQueue.length = [];
+            this.commandQueue = [];
             this.emit("disconnected");
+            this.close();
           }
           break;
         default:
@@ -181,12 +182,18 @@ class classHUE extends EventEmitter {
   handleQueue = async () => {
     // Verifica se è possibile eseguire una nuova richiesta
     do {
-      const remainingRequests = await limiter.removeTokens(1);
-      if (this.commandQueue.length > 0) {
+      try {
+        const remainingRequests = await limiter.removeTokens(1);
+      } catch (error) {
+      }
+      if (this.commandQueue !== undefined && this.commandQueue.length > 0) {
         //if (remainingRequests >= 0) {
         // OK, i can send
         //console.log("\x1b[32m Messaggio. remainingRequests=" + remainingRequests + "\x1b[0m " + new Date().toTimeString(), this.commandQueue.length, "remainingRequests " + remainingRequests);
-        await this.processQueueItem();
+        try {
+          await this.processQueueItem();
+        } catch (error) {
+        }
         //} else {
         // Limit reached, skip this round.
         //console.log("\x1b[41m HO DETTO SPETA. remainingRequests=" + remainingRequests + "\x1b[0m " + new Date().toTimeString(), this.commandQueue.length, "remainingRequests " + remainingRequests);
@@ -198,7 +205,7 @@ class classHUE extends EventEmitter {
 
   writeHueQueueAdd = async (_lightID, _state, _operation) => {
     // Add the new item
-    this.commandQueue.push({ _lightID, _state, _operation });
+    this.commandQueue.unshift({ _lightID, _state, _operation });
   };
 
   /**

package/nodes/utils/payloadManipulation.js

@@ -60,9 +60,9 @@ module.exports.KNXULtimateChangeConfigByInputMSG = function KNXULtimateChangeCon
   config.outputtopic = node.outputtopic;
 
   // Read from the ETS file, the missing props
-  if (node.server.csv !== undefined && node.server.csv !== null) {
+  if (node.serverKNX.csv !== undefined && node.serverKNX.csv !== null) {
     // Read it from ETS File
-    const found = node.server.csv.find(item => item.ga === msg.setConfig.setGroupAddress);
+    const found = node.serverKNX.csv.find(item => item.ga === msg.setConfig.setGroupAddress);
     if (found !== undefined) {
       if (msg.setConfig.setDPT === 'auto') {
         node.dpt = found.dpt; // SET THE DPT

package/nodes/utils/sysLogger.js

@@ -1,70 +1,33 @@
 /**
-* (C) 2021 Supergiovane
+* (C) 2024 Supergiovane
 */
-const util = require('util')
-const possibleLEvels = ['silent', 'error', 'warn', 'info', 'debug', 'trace']
-let logger = undefined;
 
-/*
- * Logger-Level importance levels:
- *  trace < info < warn < error
- */
+class loggerEngine {
+  constructor() {
+    const possibleLEvels = ['success', 'error', 'warn', 'info', 'debug']
 
-const determineLogLevel = options => {
-  let level
-
-  // 24/03/2021 Supergiovane fixed logLevel capitalization to lowercase
-  if (options) {
-    if (options.loglevel) {
-      level = options.loglevel
-    } else {
-      options.debug ? level = 'debug' : level = 'info'
-    }
-  } else {
-    level = 'info'
   }
-  if (!possibleLEvels.includes(level)) level = 'error'
-  return level
-}
-
-module.exports = {
-  get: function (options) {
-    if (logger === undefined) {
-      // console.log('BANANA new logger, level',determineLogLevel(options),(options && options.debug && 'debug') ||
-      // (options && options.loglevel) ||
-      return undefined;
-    }
-    return (logger)
-  },
-  set: function (options) {
-    logger = require('log-driver')({
-      levels: ['silent', 'error', 'warn', 'info', 'debug', 'trace'],
-      level: determineLogLevel(options),
-      format: function () {
-        // arguments[0] is the log level ie 'debug'
-        const a = Array.from(arguments)
-        let ts
-        const dt = new Date()
-        try {
-          ts = dt.toLocaleString().replace(/T/, ' ').replace(/Z$/, '') + '.' + dt.getMilliseconds()
-        } catch (error) {
-          ts = dt.toISOString().replace(/T/, ' ').replace(/Z$/, '') + '.' + dt.getMilliseconds()
-        }
-
-        if (a.length > 2) {
-          // if more than one item to log, assume a fmt string is given
-          const fmtargs = ['[%s] %s ' + a[1], a[0], ts].concat(a.slice(2))
-          return util.format.apply(util, fmtargs)
-        } else {
-          // arguments[1] is a plain string
-          return util.format('[%s] %s %s', a[0], ts, a[1])
-        }
+  get = (options) => {
+    let logger = require('node-color-log');
+    try {
+      //levels: ['silent', 'error', 'warn', 'info', 'debug', 'trace'],     
+      if (options.setPrefix !== undefined) {
+        logger = logger.createNamedLogger(options.setPrefix);
       }
-    })
-    return logger;
-  },
-  destroy: function () {
+      if (options.loglevel === 'trace') options.loglevel = 'debug' // Backwart compatibility
+      if (options.loglevel === 'silent') options.loglevel = 'disable' // Backwart compatibility
+      logger.setLevel(options.loglevel);
+      logger.setDate(() => (new Date()).toLocaleString())
+      return logger
+    } catch (error) {
+      return logger
+    }
+  }
+  destroy = () => {
     // 16/08/2020 Supergiovane Destruction of the logger
     logger = null
   }
+
 }
+const colorlog = new loggerEngine();
+module.exports = colorlog;

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=16.0.0"
   },
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Control your KNX intallation via Node-Red! A bunch of KNX nodes, with integrated Philips HUE control and ETS group address importer. Easy to use and highly configurable.",
   "dependencies": {
     "binary-parser": "2.2.1",
@@ -11,10 +11,10 @@
     "dns-sync": "0.2.1",
     "eventsource": "2.0.2",
     "js-yaml": "4.1.0",
-    "knxultimate": ">=2.3.5",
+    "knxultimate": ">=3.0.0",
     "limiter": "^2.1.0",
     "lodash": "4.17.21",
-    "log-driver": "1.2.7",
+    "node-color-log": "12.0.1",
     "mkdirp": "3.0.1",
     "node-hue-api": "5.0.0-beta.16",
     "path": "0.12.7",