node-red-contrib-knx-ultimate 6.3.0 → 6.3.2

package/nodes/utils/hueControllerProfiles/runtime/light.js

@@ -753,7 +753,9 @@ module.exports = function (RED) {
         let numStep = 10 // Steps from 0 to 100 by 10
         const extendedConf = {}
 
-        if (_KNXbrightness_Direction === 0 && _KNXaction === 0) {
+        // DPT 3.x uses data/step-code 0 for BREAK. The direction bit may be
+        // either 0 ($00) or 1 ($08), so it must not be part of this check.
+        if (_KNXbrightness_Direction === 0) {
           // STOP DIM
           if (node.timerStepDim !== undefined) clearInterval(node.timerStepDim)
           node.brightnessStep = null
@@ -838,7 +840,7 @@ module.exports = function (RED) {
       // 23/23/2023 after many attempts to use dimming_delta function of the HueApeV2, loosing days of my life, without a decent success, will use the standard dimming calculations
       // i decide to go to the "step brightness" way.
       try {
-        if (_KNXbrightness_DirectionTunableWhite === 0 && _KNXaction === 0) {
+        if (_KNXbrightness_DirectionTunableWhite === 0) {
           // STOP DIM
           if (node.timerStepDimTunableWhite !== undefined) clearInterval(node.timerStepDimTunableWhite)
           node.brightnessStepTunableWhite = null
@@ -912,7 +914,7 @@ module.exports = function (RED) {
       // After many attempts to use dimming_delta function of the HueApiV2, loosing days of my life, without a decent success, will use the standard dimming calculations
       // i decide to go to the "step brightness" way.
       try {
-        if (_KNXbrightness_DirectionHSV_H === 0 && _KNXaction === 0) {
+        if (_KNXbrightness_DirectionHSV_H === 0) {
           // STOP DIM
           if (node.timerStepDimHSV_H !== undefined) clearInterval(node.timerStepDimHSV_H)
           node.deleteHueStateQueue() // Clear dimming queue.
@@ -1000,7 +1002,7 @@ module.exports = function (RED) {
       // After many attempts to use dimming_delta function of the HueApiV2, loosing days of my life, without a decent success, will use the standard dimming calculations
       // i decide to go to the "step brightness" way.
       try {
-        if (_KNXbrightness_DirectionHSV_S === 0 && _KNXaction === 0) {
+        if (_KNXbrightness_DirectionHSV_S === 0) {
           // STOP DIM
           if (node.timerStepDimHSV_S !== undefined) clearInterval(node.timerStepDimHSV_S)
           node.deleteHueStateQueue() // Clear dimming queue.

package/nodes/utils/sysLogger.js

@@ -1,34 +1,84 @@
 /**
 * (C) 2024 Supergiovane
 */
-const logger = require('node-color-log')
+const winston = require('winston')
+const { format: formatMessage } = require('util')
+
+const { combine, timestamp, label, printf, colorize, splat } = winston.format
+const colorizer = colorize()
+const SPLAT = Symbol.for('splat')
+
+// Keep the application log format aligned with the KNXUltimate engine while
+// owning a separate logger instance for each Node-RED node/configuration node.
+winston.addColors({
+  time: 'grey',
+  module: 'bold'
+})
+
+const normalizeLevel = (level) => {
+  if (level === 'trace') return 'debug'
+  if (level === 'silent') return 'disable'
+  if (level === 'success') return 'info'
+  if (['debug', 'info', 'warn', 'error', 'disable'].includes(level)) return level
+  return 'info'
+}
+
+const loggerFormat = (prefix) => combine(
+  winston.format((info) => {
+    const args = info[SPLAT]
+    if (Array.isArray(args) && args.length > 0) {
+      // node-color-log printed every argument even without placeholders. Format
+      // them before Winston's splat transform so existing diagnostics keep all
+      // their values while regular %s/%o messages retain Winston semantics.
+      info.message = formatMessage(info.message, ...args)
+      delete info[SPLAT]
+    }
+    return info
+  })(),
+  splat(),
+  timestamp({ format: 'YYYY-MM-DD HH:mm:ss.SSS' }),
+  winston.format((info) => {
+    info.level = String(info.level).toUpperCase()
+    return info
+  })(),
+  label({ label: String(prefix || '-').toUpperCase() }),
+  colorize({ level: true }),
+  printf((info) => {
+    const formattedTimestamp = colorizer.colorize('time', info.timestamp)
+    const formattedLabel = colorizer.colorize('module', info.label || '-')
+    return `${formattedTimestamp} ${info.level} ${formattedLabel}: ${info.message}${info.stack ? `\n${info.stack}` : ''}`
+  })
+)
 
 class loggerClass {
   logLevel = 'info'
   prefix = ''
   constructor (options = {}) {
-    const possibleLevels = ['success', 'debug', 'info', 'warn', 'error', 'disable']
     this.prefix = options.setPrefix || ''
-    if (this.prefix) {
-      this.logger = logger.createNamedLogger(this.prefix)
-    } else {
-      this.logger = logger
-    }
-    let requestedLevel = options.loglevel
-    if (!possibleLevels.includes(requestedLevel)) requestedLevel = 'info'
-    if (requestedLevel === 'trace') requestedLevel = 'debug' // Backward compatibility
-    if (requestedLevel === 'silent') requestedLevel = 'disable' // Backward compatibility
-    this.logger.setLevel(requestedLevel)
-    this.logger.setDate(() => (new Date()).toLocaleString())
+    const requestedLevel = normalizeLevel(options.loglevel)
     this.logLevel = requestedLevel
+    this.logger = winston.createLogger({
+      level: requestedLevel === 'disable' ? 'error' : requestedLevel,
+      silent: requestedLevel === 'disable',
+      format: loggerFormat(this.prefix),
+      transports: [
+        new winston.transports.Console({
+          stderrLevels: ['error']
+        })
+      ]
+    })
   }
 
   destroy = () => {
-    // Placeholder for backward compatibility; kept for API symmetry.
+    if (!this.logger) return
+    this.logger.silent = true
+    this.logger.close()
   }
 
   success = (...args) => {
-    this.logger.success(...args)
+    // Winston's npm levels do not include "success"; preserve the legacy API
+    // and route it through the equivalent informational level.
+    this.logger.info(...args)
   }
 
   debug = (...args) => {

package/package.json

@@ -3,7 +3,7 @@
   "engines": {
     "node": ">=20.18.1"
   },
-  "version": "6.3.0",
+  "version": "6.3.2",
   "description": "KNX Ultimate is the most advanced KNX integration for Node-RED, providing secure KNX/IP communication, routing, ETS project import, Philips Hue, Matter Controller and Matter Bridge (control matter device via KNX and expose KNX GA via Matter), MQTT, diagnostics with AI, virtual devices, and powerful automation nodes. Build professional, reliable, and scalable smart home and building automation projects with minimal effort.",
   "files": [
     "nodes/",
@@ -16,17 +16,17 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@matter/main": "^0.17.4",
-    "@project-chip/matter.js": "^0.17.4",
+    "@matter/main": "^0.17.9",
+    "@project-chip/matter.js": "^0.17.9",
     "dns-sync": "0.2.1",
     "google-translate-tts": "^0.3.0",
-    "js-yaml": "4.2.0",
+    "js-yaml": "4.3.1",
     "knxultimate": "6.0.2",
     "lodash": "4.18.1",
-    "mqtt": "^5.15.1",
-    "node-color-log": "12.0.1",
+    "mqtt": "^5.15.2",
     "ping": "0.4.4",
-    "simple-get": "4.0.1"
+    "simple-get": "4.0.1",
+    "winston": "^3.17.0"
   },
   "node-red": {
     "version": ">=3.1.1",
@@ -111,6 +111,8 @@
     "prepublishOnly": "npm run build",
     "test": "npm run hue-controller:check && DEBUG_KNX_HUE_TEST=0 npm run test:unit && node scripts/check-node-load.js",
     "test:unit": "mocha \"test/**/*.test.js\"",
+    "release:publish": "node scripts/publish-and-refresh.js",
+    "release:refresh-flows": "node scripts/publish-and-refresh.js --refresh-only",
     "hue-controller:generate": "node scripts/generate-hue-controller-profiles.js",
     "hue-controller:check": "node scripts/generate-hue-controller-profiles.js --check",
     "avviaquesto-itest:light": "node test/integration/hueLiveTest.mjs",
@@ -139,12 +141,12 @@
     "docs:serve:norl": "node scripts/dev-serve-docs.js"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^6.0.1",
+    "@vitejs/plugin-vue": "^6.0.8",
     "chai": "^4.3.10",
-    "jspdf": "^2.5.2",
+    "jspdf": "^4.2.1",
     "marked": "^14.1.0",
     "mocha": "^10.4.0",
-    "vite": "^7.1.3",
-    "vue": "^3.5.21"
+    "vite": "^7.3.6",
+    "vue": "^3.5.41"
   }
-}
+}