node-red-contrib-knx-ultimate 7.0.3 → 7.1.0-beta.0

package/nodes/knxUltimateUtility.html

@@ -0,0 +1,325 @@
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/htmlUtils.js"></script>
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/knxUtilityProfiles.js"></script>
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/flowMigrationBackup.js"></script>
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/knxUtilityMigration.js"></script>
+
+<script type="text/javascript">
+  (function () {
+    const profiles = window.KNXUltimateUtilityProfiles;
+    const types = Object.keys(profiles.PROFILE_TYPES);
+    const clone = (value) => value === undefined ? undefined : JSON.parse(JSON.stringify(value));
+    const definition = (type) => types.includes(type) ? profiles.getDefinition(type, RED) : undefined;
+    const text = (key) => RED._('node-red-contrib-knx-ultimate/knxUltimateUtility:knxUltimateUtility.' + key);
+    const activeType = (node) => node._utilityEditor ? node._utilityEditor.type() : node.utilityType;
+    const validationContext = (node) => typeof node._utilityEditor?.values === 'function' ? node._utilityEditor.values() : node;
+
+    function buildDefaults() {
+      // Node-RED must know every persistable field and the real config-node
+      // reference before opening the editor. Only the active profile validates.
+      const defaults = {
+        server: {
+          value: '',
+          type: 'knxUltimate-config',
+          validate: function (value) {
+            const descriptor = definition(activeType(this))?.defaults.server;
+            if (!descriptor) return true;
+            if (!value || value === '_ADD_') return false;
+            const gateway = RED.nodes.node(value);
+            return Boolean(gateway && gateway.type === 'knxUltimate-config' && gateway.valid !== false);
+          }
+        },
+        name: {
+          value: '',
+          validate: function (value) {
+            const descriptor = definition(activeType(this))?.defaults.name;
+            return !descriptor || typeof descriptor.validate !== 'function' || descriptor.validate.call(validationContext(this), value);
+          }
+        },
+        // The bus address is shared by WatchDog, Logger, SceneController and
+        // LoadControl. Imports that omit it must not inherit WatchDog's sample GA.
+        topic: {
+          value: '',
+          validate: function (value) {
+            const descriptor = definition(activeType(this))?.defaults.topic;
+            if (!descriptor) return true;
+            if (descriptor.required && (value === '' || value === undefined || value === null)) return false;
+            return typeof descriptor.validate !== 'function' || descriptor.validate.call(validationContext(this), value);
+          }
+        },
+        utilityType: { value: 'alerter', required: true, validate: (value) => types.includes(value) },
+        inputs: { value: 1 },
+        outputs: { value: 3 }
+      };
+      types.forEach((type) => {
+        Object.entries(definition(type).defaults).forEach(([key, property]) => {
+          if (Object.prototype.hasOwnProperty.call(defaults, key)) return;
+          const descriptor = { ...property };
+          delete descriptor.required;
+          defaults[key] = {
+            ...descriptor,
+            value: clone(property.value),
+            validate: function (value) {
+              const selected = definition(activeType(this));
+              const descriptor = selected && selected.defaults[key];
+              if (!descriptor) return true;
+              if (descriptor.required && (value === '' || value === undefined || value === null)) return false;
+              return typeof descriptor.validate !== 'function' || descriptor.validate.call(validationContext(this), value);
+            }
+          };
+        });
+      });
+      return defaults;
+    }
+
+    function setValue(field, value) {
+      if (!field.length) return;
+      if (field.is(':checkbox')) field.prop('checked', value === true || value === 'true');
+      else if (value !== undefined && value !== null) field.val(typeof value === 'object' ? JSON.stringify(value) : value);
+    }
+
+    function readValue(field, fallback) {
+      if (!field.length) return fallback;
+      if (field.is(':checkbox')) return field.prop('checked');
+      const value = field.val();
+      return value === undefined || value === null ? fallback : value;
+    }
+
+    function translateFragment(container, type) {
+      container.find('[data-i18n]').each(function () {
+        const element = $(this);
+        const spec = element.attr('data-i18n');
+        const match = spec.match(/^\[([^\]]+)\](.+)$/);
+        const key = match ? match[2] : spec;
+        const value = profiles.translate(type, key, RED);
+        if (value && value !== key) {
+          if (match) element.attr(match[1], value);
+          else element.text(value);
+          element.removeAttr('data-i18n');
+        }
+      });
+    }
+
+    RED.nodes.registerType('knxUltimateUtility', {
+      category: 'KNX Ultimate',
+      color: '#C7E9C0',
+      defaults: buildDefaults(),
+      catalogDefaults: {
+        server: { type: 'knxUltimate-config' }, name: {}, utilityType: {}, inputs: {}, outputs: {}
+      },
+      inputs: 1,
+      outputs: 3,
+      icon: function () { return definition(this.utilityType)?.icon || 'node-knx-icon.svg'; },
+      paletteLabel: 'KNX Utility',
+      label: function () { return this.name || 'KNX Utility · ' + text('types.' + this.utilityType); },
+      outputLabels: function (index) {
+        if (this.utilityType === 'alerter') return text('outputs.' + index);
+        const selected = definition(this.utilityType);
+        if (this.utilityType === 'logger') return text('logger_outputs.' + index);
+        const labels = selected?.outputLabels;
+        if (typeof labels === 'function') return labels.call(this, index);
+        return Array.isArray(labels) ? labels[index] : '';
+      },
+      button: {
+        visible: function () { return this.utilityType === 'datetime'; },
+        enabled: function () { return !this.changed && this.utilityType === 'datetime'; },
+        onclick: function () {
+          const selected = definition(this.utilityType);
+          if (selected?.button?.onclick) selected.button.onclick.call(this);
+        }
+      },
+      oneditprepare: function () {
+        const node = this;
+        const drafts = {};
+        let selectedType;
+        let context;
+        let mounted;
+        let closed = false;
+        let helpTimer;
+        const container = $('#knx-utility-profile-editor');
+
+        // Edit a separate context: profile hooks (including asynchronous ETS
+        // suggestions) must never mutate the saved node before Done is pressed.
+        function makeContext(type, useSaved) {
+          const selected = definition(type);
+          const result = { id: node.id, z: node.z, type: node.type, changed: node.changed };
+          Object.entries(selected.defaults).forEach(([key, property]) => {
+            result[key] = clone(useSaved && node[key] !== undefined ? node[key] : property.value);
+          });
+          result.utilityType = type;
+          result._ = (key, values) => profiles.translate(type, key, RED, values);
+          return result;
+        }
+
+        function collect() {
+          if (!mounted || !context) return;
+          Object.keys(mounted.defaults).forEach((key) => {
+            context[key] = readValue($('#node-input-' + key), context[key]);
+          });
+          if (typeof mounted.oneditsave === 'function') mounted.oneditsave.call(context);
+          drafts[selectedType] = context;
+        }
+
+        function dispose() {
+          clearTimeout(helpTimer);
+          if (mounted && context && typeof mounted.oneditcancel === 'function') mounted.oneditcancel.call(context);
+          $('#node-input-server').off('.knxUtilityProfile');
+          // Widget destruction also releases autocomplete menus appended to body.
+          container.find('.ui-autocomplete-input').each(function () {
+            try { $(this).autocomplete('destroy'); } catch (error) { /* already disposed */ }
+          });
+          container.empty();
+        }
+
+        function render(type, first) {
+          if (closed) return;
+          if (!first && type === selectedType) return;
+          if (!first) collect();
+          dispose();
+          selectedType = type;
+          mounted = definition(type);
+          $('#knx-utility-invalid-function').toggle(!mounted);
+          if (!mounted) { context = undefined; return; }
+          context = drafts[type] || makeContext(type, first);
+          // Shared fields retain the user's current selections across profiles.
+          context.server = readValue($('#node-input-server'), node.server);
+          context.name = readValue($('#node-input-name'), node.name);
+          $('#knx-utility-gateway-row').toggle(Boolean(mounted.defaults.server));
+          const isGlobalContext = type === 'globalcontext';
+          if (isGlobalContext && !context.name) {
+            context.name = mounted.defaults.name.value;
+            $('#node-input-name').val(context.name);
+          }
+          $('#knx-utility-name-label').text(text(isGlobalContext ? 'variable_name' : 'name')).removeAttr('data-i18n');
+          $('#knx-utility-name-description').toggle(isGlobalContext);
+          container.html(profiles.getTemplate(type));
+          translateFragment(container, type);
+          Object.keys(mounted.defaults).forEach((key) => {
+            if (key !== 'name' && key !== 'server') setValue($('#node-input-' + key), context[key]);
+          });
+          $('#node-input-inputs').val(mounted.inputs);
+          $('#node-input-outputs').val(mounted.outputs);
+          $('#knx-utility-pin-description').text(text('pins.' + type));
+          $('#node-input-name').attr('placeholder', isGlobalContext ? mounted.defaults.name.value : 'KNX Utility · ' + text('types.' + type));
+          if (typeof mounted.oneditprepare === 'function') mounted.oneditprepare.call(context);
+          // These controls are mounted after Node-RED attaches its initial
+          // validation handlers. Trigger a shared field's standard handler so
+          // the complete editor validates again while the user edits a profile.
+          container.find('input, select, textarea').on('change.knxUtility keyup.knxUtility paste.knxUtility', function () {
+            if (!$(this).attr('skipValidation')) $('#node-input-name').trigger('change');
+          });
+          $('#node-input-name').trigger('change');
+          try { RED.sidebar.show('help'); } catch (error) { /* sidebar unavailable */ }
+          // Node-RED can replace help after the tray opens even when the previous
+          // node's markers still exist. Follow the selected function through
+          // that short transition and cancel retries on close.
+          let attempts = 0;
+          const focusHelp = () => {
+            if (closed || selectedType !== type || typeof document === 'undefined') return;
+            const marker = document.getElementById('knx-utility-help-' + type);
+            if (marker) marker.scrollIntoView({ block: 'start' });
+            if (++attempts < 4) helpTimer = setTimeout(focusHelp, 100);
+          };
+          helpTimer = setTimeout(focusHelp, 100);
+        }
+
+        node._utilityEditor = {
+          type: () => selectedType,
+          values: () => {
+            const values = { ...context, _utilityEditor: node._utilityEditor, _def: node._def };
+            Object.keys(mounted?.defaults || {}).forEach((key) => {
+              values[key] = readValue($('#node-input-' + key), values[key]);
+            });
+            return values;
+          },
+          save: () => {
+            collect();
+            if (!mounted || !context) return;
+            // The gateway selector belongs to Node-RED's normal save path,
+            // which also updates config-node users when its reference changes.
+            Object.keys(mounted.defaults).forEach((key) => {
+              if (key !== 'server') node[key] = clone(context[key]);
+            });
+            node.utilityType = selectedType;
+            node.inputs = mounted.inputs;
+            node.outputs = mounted.outputs;
+          },
+          resize: (size) => {
+            if (mounted && typeof mounted.oneditresize === 'function') mounted.oneditresize.call(context, size);
+          },
+          close: () => {
+            closed = true;
+            dispose();
+            $('#node-input-utilityType').off('.knxUtility');
+          }
+        };
+        const initialType = node.utilityType || 'alerter';
+        $('#node-input-utilityType').val(initialType).on('change.knxUtility', function () { render($(this).val(), false); });
+        const migration = window.KNXUltimateUtilityMigration;
+        $('#knx-utility-migration-row').toggle(Boolean(migration && migration.collectLegacyUtilityNodes(RED).length));
+        render(initialType, true);
+      },
+      oneditsave: function () {
+        if (this._utilityEditor) {
+          this._utilityEditor.save();
+          this._utilityEditor.close();
+          delete this._utilityEditor;
+        }
+      },
+      oneditcancel: function () {
+        if (this._utilityEditor) {
+          this._utilityEditor.close();
+          delete this._utilityEditor;
+        }
+      },
+      oneditresize: function (size) {
+        if (this._utilityEditor) this._utilityEditor.resize(size);
+      }
+    });
+  }());
+</script>
+
+<style>
+  #node-input-utilityType { max-width: calc(100% - 160px); }
+  #dialog-form:has(#knx-utility-profile-editor) > .form-row > label { width: 150px; }
+  #knx-utility-profile-editor .form-row > label { width: 180px; }
+  #knx-utility-profile-editor .form-row { box-sizing: border-box; }
+  #knx-utility-profile-editor input { min-width: 0; }
+  #knx-utility-migration-row .red-ui-button { background: #d97706; border-color: #b45309; color: white; }
+</style>
+
+<script type="text/html" data-template-name="knxUltimateUtility">
+  <div class="form-row" id="knx-utility-migration-row" style="display:none">
+    <button type="button" class="red-ui-button knx-utility-migrate-flow" data-i18n="[title]knxUltimateUtility.migration_button_title"><i class="fa fa-exchange"></i> <span data-i18n="knxUltimateUtility.migration_button"></span></button>
+  </div>
+  <div class="form-row">
+    <label for="node-input-utilityType"><i class="fa fa-cogs"></i> <span data-i18n="knxUltimateUtility.function"></span></label>
+    <select id="node-input-utilityType" style="width:70%">
+      <option value="alerter" data-i18n="knxUltimateUtility.types.alerter"></option>
+      <option value="autoresponder" data-i18n="knxUltimateUtility.types.autoresponder"></option>
+      <option value="datetime" data-i18n="knxUltimateUtility.types.datetime"></option>
+      <option value="watchdog" data-i18n="knxUltimateUtility.types.watchdog"></option>
+      <option value="globalcontext" data-i18n="knxUltimateUtility.types.globalcontext"></option>
+      <option value="logger" data-i18n="knxUltimateUtility.types.logger"></option>
+      <option value="staircase" data-i18n="knxUltimateUtility.types.staircase"></option>
+      <option value="garage" data-i18n="knxUltimateUtility.types.garage"></option>
+      <option value="scenecontroller" data-i18n="knxUltimateUtility.types.scenecontroller"></option>
+      <option value="loadcontrol" data-i18n="knxUltimateUtility.types.loadcontrol"></option>
+      <option value="hatranslator" data-i18n="knxUltimateUtility.types.hatranslator"></option>
+    </select>
+  </div>
+  <div class="form-row" id="knx-utility-gateway-row">
+    <label for="node-input-server"><i class="fa fa-circle-o"></i> <span data-i18n="knxUltimateUtility.gateway"></span></label>
+    <input type="text" id="node-input-server">
+  </div>
+  <div class="form-row">
+    <label for="node-input-name"><i class="fa fa-tag"></i> <span id="knx-utility-name-label" data-i18n="knxUltimateUtility.name"></span></label>
+    <input type="text" id="node-input-name">
+  </div>
+  <div class="form-row" id="knx-utility-name-description" style="display:none" data-i18n="knxUltimateUtility.variable_name_description"></div>
+  <div class="form-row" id="knx-utility-pin-description" style="opacity:.8"></div>
+  <div class="form-tips" id="knx-utility-invalid-function" style="display:none" data-i18n="knxUltimateUtility.invalid_function"></div>
+  <input type="hidden" id="node-input-inputs">
+  <input type="hidden" id="node-input-outputs">
+  <hr>
+  <div id="knx-utility-profile-editor"></div>
+</script>

package/nodes/knxUltimateUtility.js

@@ -0,0 +1,24 @@
+'use strict'
+
+const { setupKnxUtilityRuntime } = require('./utils/knxUtilityProfileAdapter')
+const registerSendNowEndpoint = require('./utils/knxDateTimeSendNow')
+
+module.exports = function (RED) {
+  // Register against the real RED instance; private profile constructors use a
+  // facade that deliberately cannot register public Node-RED node types.
+  registerSendNowEndpoint(RED, 'utility')
+
+  function knxUltimateUtility (config) {
+    try {
+      setupKnxUtilityRuntime(RED, this, config)
+    } catch (error) {
+      if (!this.id) RED.nodes.createNode(this, config)
+      const message = error && error.message ? error.message : String(error)
+      RED.log.error(`knxUltimateUtility: ${message}`)
+      this.status({ fill: 'red', shape: 'dot', text: message })
+      this.error(message)
+    }
+  }
+
+  RED.nodes.registerType('knxUltimateUtility', knxUltimateUtility)
+}

package/nodes/knxUltimateViewer.html

@@ -66,12 +66,24 @@
                     return "";
                 }
             };
+            const resolveLanguage = () => {
+                let language;
+                try {
+                    const translated = RED._("knxUltimateViewer.locale");
+                    if (translated && translated !== "knxUltimateViewer.locale") language = translated;
+                } catch (error) { }
+                const raw = String(language || (RED.settings && RED.settings.lang) || (window.navigator && window.navigator.language) || "en").replace(/_/g, "-").toLowerCase();
+                if (raw.startsWith("zh")) return "zh-CN";
+                const base = raw.split("-")[0];
+                return ["en", "it", "de", "fr", "es"].includes(base) ? base : "en";
+            };
             $("#knx-viewer-open-web-page").on("click", function (evt) {
                 evt.preventDefault();
                 const adminRoot = resolveAdminRoot();
                 const targetBase = adminRoot + "/knxUltimateViewer/page";
                 const params = new URLSearchParams();
                 if (nodeId) params.set("nodeId", nodeId);
+                params.set("lang", resolveLanguage());
                 const accessToken = resolveAccessToken();
                 if (accessToken) params.set("access_token", accessToken);
                 const target = targetBase + (params.toString() ? ("?" + params.toString()) : "");
@@ -126,13 +138,14 @@
 </div>
 
 <div class="form-row">
-    <label><i class="fa fa-external-link"></i> Web UI</label>
+    <label><i class="fa fa-external-link"></i> <span data-i18n="knxUltimateViewer.web-monitor"></span></label>
     <div style="display:flex; gap:8px; flex-wrap:wrap;">
-        <button type="button" class="red-ui-button" id="knx-viewer-open-web-page" style="background-color:#2bb673; border-color:#2bb673; color:#ffffff !important; -webkit-text-fill-color:#ffffff;">
-            <i class="fa fa-leaf" style="color:#10341f !important;"></i> <span style="color:#10341f !important;">Open KNX Viewer Web Page</span>
+        <button type="button" class="red-ui-button" id="knx-viewer-open-web-page" data-i18n="[title]knxUltimateViewer.open-monitor-tooltip">
+            <i class="fa fa-list-alt"></i> <span data-i18n="knxUltimateViewer.open-monitor"></span>
         </button>
     </div>
 </div>
+<div class="form-tips" data-i18n="knxUltimateViewer.monitor-description"></div>
 
 
 

package/nodes/knxUltimateViewer.js

@@ -3,9 +3,9 @@ const path = require('path')
 const KNXAddress = require('knxultimate').KNXAddress
 const _ = require('lodash')
 const { getRequestAccessToken, normalizeAuthFromAccessTokenQuery } = require('./utils/httpAdminAccessToken')
+const createViewerHistory = require('./utils/knxViewerHistory')
 
-let viewerAdminEndpointsRegistered = false
-const viewerRuntimeNodes = new Map()
+const viewerRuntimeContexts = new WeakMap()
 const knxUltimateViewerVueDistDir = path.join(__dirname, 'plugins', 'knxUltimateViewer-vue')
 
 const sendKnxUltimateViewerVueIndex = (req, res) => {
@@ -163,7 +163,20 @@ const buildViewerWebState = (node) => {
 }
 
 module.exports = function (RED) {
-  if (!viewerAdminEndpointsRegistered) {
+  let context = viewerRuntimeContexts.get(RED)
+  if (!context) {
+    context = { nodes: new Map(), endpointsRegistered: false }
+    viewerRuntimeContexts.set(RED, context)
+  }
+  const viewerRuntimeNodes = context.nodes
+  const findViewer = nodeId => nodeId ? viewerRuntimeNodes.get(nodeId) : viewerRuntimeNodes.values().next().value
+  const viewerDetails = node => ({
+    id: node.id,
+    name: node.name || 'KNXViewer',
+    gatewayId: node.serverKNX ? node.serverKNX.id : '',
+    gatewayName: node.serverKNX ? node.serverKNX.name || '' : ''
+  })
+  if (!context.endpointsRegistered) {
     RED.httpAdmin.use('/knxUltimateViewer', normalizeAuthFromAccessTokenQuery)
 
     RED.httpAdmin.get('/knxUltimateViewer/page', RED.auth.needsPermission('knxUltimate-config.read'), (req, res) => {
@@ -191,12 +204,7 @@ module.exports = function (RED) {
     RED.httpAdmin.get('/knxUltimateViewer/nodes', RED.auth.needsPermission('knxUltimate-config.read'), (req, res) => {
       try {
         const nodes = Array.from(viewerRuntimeNodes.values())
-          .map((node) => ({
-            id: node.id,
-            name: node.name || 'KNXViewer',
-            gatewayId: node.serverKNX ? node.serverKNX.id : '',
-            gatewayName: (node.serverKNX && node.serverKNX.name) ? node.serverKNX.name : ''
-          }))
+          .map(viewerDetails)
           .sort((a, b) => String(a.name || '').localeCompare(String(b.name || '')))
         res.json({ nodes })
       } catch (error) {
@@ -207,10 +215,7 @@ module.exports = function (RED) {
     RED.httpAdmin.get('/knxUltimateViewer/state', RED.auth.needsPermission('knxUltimate-config.read'), (req, res) => {
       try {
         const nodeId = String(req.query.nodeId || '').trim()
-        let viewerNode = nodeId ? viewerRuntimeNodes.get(nodeId) : null
-        if (!viewerNode) {
-          viewerNode = Array.from(viewerRuntimeNodes.values())[0]
-        }
+        const viewerNode = findViewer(nodeId)
         if (!viewerNode) {
           res.status(404).json({ error: 'KNX Viewer node not found' })
           return
@@ -221,12 +226,42 @@ module.exports = function (RED) {
       }
     })
 
-    viewerAdminEndpointsRegistered = true
+    RED.httpAdmin.get('/knxUltimateViewer/history', RED.auth.needsPermission('knxUltimate-config.read'), async (req, res) => {
+      try {
+        const nodeId = String(req.query.nodeId || '').trim()
+        const viewerNode = findViewer(nodeId)
+        if (!viewerNode) {
+          res.status(404).json({ error: 'KNX Viewer node not found' })
+          return
+        }
+        if (!viewerNode.viewerHistory) {
+          res.status(503).json({ error: viewerNode.viewerHistoryError || 'KNX Viewer history is unavailable' })
+          return
+        }
+        const limit = req.query.limit === undefined ? 200 : Number(req.query.limit)
+        if (!Number.isInteger(limit) || limit < 1 || limit > 1000) {
+          res.status(400).json({ error: 'History limit must be between 1 and 1000' })
+          return
+        }
+        const result = await viewerNode.viewerHistory.query({
+          limit,
+          before: String(req.query.before || ''),
+          search: String(req.query.search || '').slice(0, 200)
+        })
+        res.set('Cache-Control', 'no-store')
+        res.json({ ...result, node: viewerDetails(viewerNode), retentionHours: 24 })
+      } catch (error) {
+        res.status(error.code === 'INVALID_CURSOR' ? 400 : 500).json({ error: error.message || String(error) })
+      }
+    })
+
+    context.endpointsRegistered = true
   }
 
   function knxUltimateViewer (config) {
     RED.nodes.createNode(this, config)
     const node = this
+    let closed = false
     node.serverKNX = RED.nodes.getNode(config.server) || undefined
     const pushStatus = (status) => {
       if (!status) return
@@ -251,7 +286,7 @@ module.exports = function (RED) {
     node.name = config.name === undefined ? 'KNXViewer' : config.name
     node.outputtopic = node.name
     node.dpt = ''
-    node.notifyreadrequest = false
+    node.notifyreadrequest = true
     node.notifyreadrequestalsorespondtobus = 'false'
     node.notifyreadrequestalsorespondtobusdefaultvalueifnotinitialized = ''
     node.notifyresponse = true
@@ -269,6 +304,23 @@ module.exports = function (RED) {
     node.timerPIN3 = null
     node.exposedGAs = []
 
+    const reportHistoryError = error => {
+      const message = error && error.message ? error.message : String(error)
+      if (node.viewerHistoryError !== message) node.warn('KNX Viewer history: ' + message)
+      node.viewerHistoryError = message
+    }
+    try {
+      node.viewerHistory = createViewerHistory({
+        userDir: RED.settings.userDir,
+        nodeId: node.id,
+        gatewayId: node.serverKNX.id,
+        onError: reportHistoryError
+      })
+      node.viewerHistory.ready.catch(reportHistoryError)
+    } catch (error) {
+      reportHistoryError(error)
+    }
+
     viewerRuntimeNodes.set(node.id, node)
 
     node.setNodeStatus = ({ fill, shape, text, payload, GA }) => {
@@ -286,31 +338,54 @@ module.exports = function (RED) {
     }
 
     node.handleSend = (msg) => {
-      let gaEntry
+      if (closed || !msg || !msg.knx) return
+      const isRead = msg.knx.event === 'GroupValue_Read'
+      const address = String(msg.knx.destination || '').trim()
+      let addressRAW
       try {
-        gaEntry = node.exposedGAs.find(ga => ga.address === msg.knx.destination)
+        addressRAW = KNXAddress.createFromString(address, KNXAddress.TYPE_GROUP).get()
       } catch (error) {
+        return
       }
+      const timestampMs = Date.now()
       const deviceName = msg.devicename === node.name ? 'Import ETS file to view the group address name' : msg.devicename
-      const addressRAW = KNXAddress.createFromString(msg.knx.destination, KNXAddress.TYPE_GROUP).get()
+      const rawPayload = Buffer.isBuffer(msg.knx.rawValue) ? msg.knx.rawValue.toString('hex') : normalizePayloadText(msg.knx.rawValue)
+      const unit = msg.payloadmeasureunit && msg.payloadmeasureunit !== 'unknown' ? String(msg.payloadmeasureunit).trim() : ''
+      if (node.viewerHistory) {
+        node.viewerHistory.record({
+          timestampMs,
+          address,
+          source: String(msg.knx.source || ''),
+          dpt: String(msg.knx.dpt || ''),
+          devicename: msg.devicename === node.name ? '' : String(msg.devicename || ''),
+          payload: msg.payload,
+          payloadText: normalizePayloadText(msg.payload),
+          payloadmeasureunit: unit,
+          rawPayload,
+          event: String(msg.knx.event || '')
+        }).catch(reportHistoryError)
+      }
+      // A read request has no state value and must not change the legacy outputs.
+      if (isRead) return
+      const gaEntry = node.exposedGAs.find(ga => ga.address === address)
       if (gaEntry === undefined) {
         node.exposedGAs.push({
-          address: msg.knx.destination,
+          address,
           addressRAW,
           dpt: msg.knx.dpt,
           payload: msg.payload,
           devicename: deviceName,
-          lastupdate: new Date(),
-          rawPayload: 'HEX Raw: ' + msg.knx.rawValue.toString('hex') || '?',
-          payloadmeasureunit: (msg.payloadmeasureunit !== 'unknown' ? ' ' + msg.payloadmeasureunit : '')
+          lastupdate: new Date(timestampMs),
+          rawPayload: 'HEX Raw: ' + (rawPayload || '?'),
+          payloadmeasureunit: unit ? ' ' + unit : ''
         })
       } else {
         gaEntry.dpt = msg.knx.dpt
         gaEntry.payload = msg.payload
         gaEntry.devicename = deviceName
-        gaEntry.lastupdate = new Date()
-        gaEntry.rawPayload = 'HEX Raw: ' + msg.knx.rawValue.toString('hex') || '?'
-        gaEntry.payloadmeasureunit = (msg.payloadmeasureunit !== 'unknown' ? ' ' + msg.payloadmeasureunit : '')
+        gaEntry.lastupdate = new Date(timestampMs)
+        gaEntry.rawPayload = 'HEX Raw: ' + (rawPayload || '?')
+        gaEntry.payloadmeasureunit = unit ? ' ' + unit : ''
       }
 
       const pin1 = node.createPayloadPIN1()
@@ -416,12 +491,16 @@ module.exports = function (RED) {
     })
 
     node.on('close', function (done) {
+      closed = true
       if (node.timerPIN3 !== null) clearInterval(node.timerPIN3)
-      viewerRuntimeNodes.delete(node.id)
+      if (viewerRuntimeNodes.get(node.id) === node) viewerRuntimeNodes.delete(node.id)
       if (node.serverKNX) {
         node.serverKNX.removeClient(node)
       }
-      done()
+      Promise.resolve().then(() => node.viewerHistory && node.viewerHistory.close()).then(() => done(), error => {
+        reportHistoryError(error)
+        done()
+      })
     })
 
     if (node.serverKNX) {

package/nodes/knxUltimateWatchDog.html

@@ -1,9 +1,11 @@
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/flowMigrationBackup.js"></script>
+<script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/knxUtilityMigration.js"></script>
 <script type="text/javascript" src="resources/node-red-contrib-knx-ultimate/htmlUtils.js"></script>
 
 <script type="text/javascript">
     RED.nodes.registerType('knxUltimateWatchDog', {
-        category: "KNX Ultimate",
-        color: '#C7E9C0',
+        category: 'deprecated',
+        color: '#E5F0E2',
         defaults: {
             server: { type: "knxUltimate-config", required: true },
             topic: { value: "12/0/0" },
@@ -19,9 +21,9 @@
         outputLabels: ["Output"],
         icon: "node-watchdog-icon.svg",
         label: function () {
-            return ((this.name || "KNX Watchdog") + " " + (this.checkLevel == "Ethernet" ? "Gateway IP" : this.topic));
+            return (((this.name || "KNX Watchdog") + " " + (this.checkLevel == "Ethernet" ? "Gateway IP" : this.topic))) + " (deprecated)";
         },
-        paletteLabel: "KNX WatchDog",
+        paletteLabel: "KNX WatchDog (deprecated)",
         oneditprepare: function () {
             const node = this;
             const $knxServerInput = $("#node-input-server");
@@ -163,6 +165,15 @@
 <script type="text/markdown" data-help-name="knxUltimateWatchDog"></script>
 
 <script type="text/html" data-template-name="knxUltimateWatchDog">
+  <div class="form-row knx-utility-legacy-notice" role="note" style="box-sizing:border-box; padding:10px 12px; margin-bottom:12px; border-left:4px solid #d79b00; background:#fff8df; color:#4d3a00;">
+    <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+    <span data-i18n="knxUltimateWatchDog.legacy_notice"></span>
+  </div>
+  <div class="form-row knx-utility-legacy-migration-action" style="margin-bottom:14px;">
+    <button type="button" class="red-ui-button knx-utility-migrate-flow" style="background:#d97706; border-color:#b45309; color:#fff !important; font-weight:700;" data-i18n="[title]knxUltimateWatchDog.migration_button_title">
+      <i class="fa fa-exchange" style="color:#fff !important;"></i> <span style="color:#fff !important;" data-i18n="knxUltimateWatchDog.migration_button"></span>
+    </button>
+  </div>
   <div class="form-row" style="margin-bottom:10px;">
     <span style="color:#ff0000"><i class="fa fa-youtube"></i></span>&nbsp;<a target="_blank" href="https://www.youtube.com/playlist?list=PL9Yh1bjbLAYrU8PsVhW4xzEug2WtVFv3E"><b>KNX-Ultimate video tutorials (YouTube playlist)</b></a>
   </div>

package/nodes/locales/de/knxUltimateAlerter.html

@@ -1,4 +1,6 @@
 <script type="text/markdown" data-help-name="knxUltimateAlerter">
+**Veraltet:** Dieser eigenständige Knoten wird für bestehende Flows weiterhin unterstützt. Verwenden Sie für neue Flows **KNX Utility** und wählen Sie die entsprechende Funktion. Der bisherige Knoten ist in der Palette ausgeblendet und im Flow mit `(deprecated)` gekennzeichnet. Sein Editor bietet eine Schaltfläche, um alle kompatiblen bisherigen KNX-Hilfsknoten in sämtlichen Flows und Subflows nach Bestätigung zu konvertieren. Die Konvertierung erfolgt lokal im Browser, erhält IDs, Einstellungen, Verbindungen und Gruppen und unterstützt Rückgängig. Die Bestätigung schließt den aktuellen Knoten-Editor und verwirft nicht gespeicherte Änderungen. Prüfen Sie das Ergebnis vor Deploy.
+
 # Alerter - Node-Konfiguration
 
 Mit dem Node "Alerter" kannst du auf einem Display oder über den Node node-red-contrib-tts-ultimate (Sprachausgabe) melden, welche ausgewählten Geräte einen Alarmzustand haben, also `payload` **true** liefern.