iobroker.zigbee2mqtt 3.2.0 → 3.2.1

package/README.md

@@ -22,6 +22,12 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 [Adapter Documentation](https://github.com/arteck/ioBroker.zigbee2mqtt/blob/main/docs/wiki.md)
 
 ## Changelog
+### 3.2.1 (2026-05-05)
+* (copilot) Adapter requires node.js >= 22 now
+* (arteck) upd device manager
+* (arteck) fix aedes-persistence
+* (arteck) fix illuminance
+
 ### 3.2.0 (2026-04-26)
 * (arteck) del deprectated setStateAsync
 
@@ -34,9 +40,6 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 ### 3.1.7 (2026-04-24)
 * (arteck) fix illuminance = 0
 
-### 3.1.5 (2026-04-23)
-* (arteck) fix illuminance
-
 ## License
 
 MIT License

package/admin/jsonConfig.json

@@ -465,6 +465,11 @@
           "type": "header",
           "text": "Expert Settings. Please only use if you know what you're doing",
           "size": 2,
+          "xs": 12,
+          "sm": 12,
+          "md": 12,
+          "lg": 12,
+          "xl": 12,
           "newLine": true
         },
         "coordinatorCheck": {
@@ -591,7 +596,11 @@
         "_deleteOldStatesResult": {
           "type": "staticText",
           "text": "",
-          "xs": 12,
+           "xs": 12,
+          "sm": 6,
+          "md": 4,
+          "lg": 3,
+          "xl": 3,
           "newLine": false,
           "style": {
             "marginTop": 8,

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "3.2.0",
+    "version": "3.2.1",
     "news": {
+      "3.2.1": {
+        "en": "Adapter requires node.js >= 22 now\nupd device manager\nfix aedes-persistence\nfix illuminance",
+        "de": "Adapter benötigt node.js >= 22 jetzt\nupd device manager\naedes-persistence reparieren\nbefestigungsleuchten",
+        "ru": "Адаптер требует node.js >= 22 сейчас\nобновленный device manager\nфиксировать стойкость\nфиксировать освещенность",
+        "pt": "Adaptador requer nod.js >= 22 agora\ngerenciador de dispositivos upd\ncorrigir aedes-persistência\nfixar a iluminação",
+        "nl": "Voor de adapter zijn node.js < 22 nu nodig\nupd apparaatbeheer\nfix aedes-persistence\nfix verlichtingssterkte",
+        "fr": "Adaptateur nécessite node.js >= 22 maintenant\ngestionnaire de périphérique mis à jour\nfixer la persistance des aedes\nfixer l'éclairage",
+        "it": "Adattatore richiede node.js >= 22 ora\nupd device manager\nfissare aedes-persistenza\nilluminazione di correzione",
+        "es": "Adaptador requiere node.js ю= 22 ahora\nupd device manager\narreglar aedes-persistence\niluminación de fijación",
+        "pl": "Adapter wymaga node.js > = 22\nmenedżer urządzenia upd\nfix aedes- trwałość\npodświetlenie",
+        "uk": "Адаптер вимагає node.js >= 22 тепер\nдиспетчер пристроїв\nфіксувати адисистентність\nфіксувати ілюмінанс",
+        "zh-cn": "适配器需要节点.js 现在22\n上调设备管理器\n固定死因-持久性\n修补灯光"
+      },
       "3.2.0": {
         "en": "del deprectated setStateAsync",
         "de": "del deprected setStateAsync",
@@ -29,45 +42,6 @@
         "uk": "застібка WS",
         "zh-cn": "修复 WS 关闭"
       },
-      "3.1.8": {
-        "en": "back to old dependency aedes",
-        "de": "zurück zu den alten abhängigkeiten",
-        "ru": "возвращение к старой зависимости",
-        "pt": "voltar ao velho aedes dependência",
-        "nl": "terug naar oude afhankelijkheid",
-        "fr": "retour à de vieilles dépendances",
-        "it": "torna alla vecchia dipendenza",
-        "es": "volver a las viejas",
-        "pl": "powrót do dawnej zależności",
-        "uk": "назад до старих залежностей",
-        "zh-cn": "回到旧的依附物"
-      },
-      "3.1.7": {
-        "en": "fix illuminance = 0",
-        "de": "fixe beleuchtungsstärke = 0",
-        "ru": "фиксированная освещенность = 0",
-        "pt": "iluminação de fixação = 0",
-        "nl": "fix verlichtingssterkte = 0",
-        "fr": "fixer l'éclairage = 0",
-        "it": "illuminazione di correzione = 0",
-        "es": "iluminación de fijación = 0",
-        "pl": "podświetlenie = 0",
-        "uk": "фіксувати ілюмінанс = 0",
-        "zh-cn": "固定灯光=0"
-      },
-      "3.1.6": {
-        "en": "fix illuminance = 0",
-        "de": "fixe beleuchtungsstärke = 0",
-        "ru": "фиксированная освещенность = 0",
-        "pt": "iluminação de fixação = 0",
-        "nl": "fix verlichtingssterkte = 0",
-        "fr": "fixer l'éclairage = 0",
-        "it": "illuminazione di correzione = 0",
-        "es": "iluminación de fijación = 0",
-        "pl": "podświetlenie = 0",
-        "uk": "фіксувати ілюмінанс = 0",
-        "zh-cn": "固定灯光=0"
-      },
       "3.1.5": {
         "en": "fix illuminance",
         "de": "befestigungsleuchten",
@@ -80,19 +54,6 @@
         "pl": "podświetlenie",
         "uk": "фіксувати ілюмінанс",
         "zh-cn": "修补灯光"
-      },
-      "3.1.4": {
-        "en": "fix illuminance if not exists. we calculate it ourselves",
-        "de": "fixe beleuchtungsstärke, wenn nicht vorhanden. wir berechnen es selbst",
-        "ru": "установить свет, если его нет. мы сами вычисляем",
-        "pt": "fixar a iluminação se não existir. nós mesmos calculamos",
-        "nl": "fix verlichtingssterkte indien niet bestaat. we berekenen het zelf",
-        "fr": "fixer l'éclairage s'il n'existe pas. nous le calculons nous-mêmes",
-        "it": "fissare l'illuminazione se non esiste. noi lo calcoliamo noi stessi",
-        "es": "fijar la iluminación si no existe. lo calculamos nosotros mismos",
-        "pl": "naprawić oświetlenie, jeśli nie istnieje. sami to obliczymy",
-        "uk": "зафіксувати ілюмінанс, якщо не існує. ми розраховуємо самі",
-        "zh-cn": "如果不存在的话, 则固定灯光。 我们自己计算"
       }
     },
     "messages": [

package/lib/deviceController.js

@@ -4,6 +4,7 @@ const utils = require('./utils');
 const colors = require('./colors.js');
 const rgb = require('./rgb.js');
 const ImageController = require('./imageController').ImageController;
+const dmUtils = require('@iobroker/dm-utils');
 
 /**
  * Prüft ob eine ieee_address in der kommaseparierten debugDevices-Liste enthalten ist.
@@ -22,7 +23,7 @@ function isDebugDevice(debugDevices, address) {
  * Verwaltet das Erstellen und Aktualisieren von Geräte- und Gruppenobjekten in ioBroker
  * basierend auf den Zigbee2MQTT-Exposes.
  */
-class DeviceController {
+class DeviceController extends dmUtils.DeviceManagement {
     /**
      * Erstellt eine neue DeviceController-Instanz.
      *
@@ -34,6 +35,7 @@ class DeviceController {
      * @param {object} createCache       Cache bereits erstellter ioBroker-Objekte
      */
     constructor(adapter, deviceCache, groupCache, config, logCustomizations, createCache) {
+        super(adapter);
         this.adapter = adapter;
         this.groupCache = groupCache;
         this.deviceCache = deviceCache;
@@ -75,6 +77,12 @@ class DeviceController {
                     try {
                         const newDevice = await createDeviceFromExposes(devicesMessag, this.adapter);
                         newDevice.icon = await this.imageController.getDeviceIcon(devicesMessag);
+                        newDevice.manufacturer = devicesMessag.definition.vendor || '';
+                        newDevice.model = devicesMessag.definition.model || '';
+                        newDevice.modelDescription = devicesMessag.definition.description || '';
+                        newDevice.powerSource = devicesMessag.power_source || '';
+                        newDevice.interviewCompleted = !!devicesMessag.interview_completed;
+                        newDevice.supported = !!devicesMessag.supported;
                         this.deviceCache.push(newDevice);
                     } catch (err) {
                         // Fix 2: friendly_name im Fehlerlog verwenden
@@ -506,7 +514,7 @@ class DeviceController {
     }
 
     /**
-     * Gibt den Anzeigenamen eines Geräts zurück.
+     * Liefert den Anzeigenamen eines Geräts zurück.
      * Ist friendly_name gleich der IEEE-Adresse, wird ein leerer String zurückgegeben.
      *
      * @param {object} device Das Geräteobjekt aus dem Cache
@@ -526,6 +534,321 @@ class DeviceController {
         return device.description ? device.description : '';
     }
 
+    /**
+     * Lädt alle Zigbee2MQTT-Geräte und Gruppen und meldet sie an den Device-Manager.
+     * Wird vom dm-utils-Framework bei 'dm:loadDevices' aufgerufen.
+     *
+     * @param {object} context - Der DeviceLoadContext (addDevice / setTotalDevices / complete).
+     */
+    async loadDevices(context) {
+        const allDevices = [...this.deviceCache];
+        context.setTotalDevices(allDevices.length);
+
+        const SKIP_STATES = new Set([
+            'available', 'transition', 'brightness_move', 'brightness_step',
+            'state_toggle', 'effect', 'color_temp_move',
+        ]);
+
+        const SKIP_READ_STATES = new Set([
+            'link_quality', 'simulated_brightness', 'last_seen',
+            'trigger_count', 'trigger_indicator',
+        ]);
+
+        const SKIP_NAME_PREFIXES = [
+            'Indicates how many',
+            'Indicates whether',
+            'Triggered action',
+        ];
+
+        for (const device of allDevices) {
+            const status = {};
+
+            try {
+                const availState = await this.adapter.getStateAsync(`${device.ieee_address}.available`);
+                status.connection = availState && availState.val === true ? 'connected' : 'disconnected';
+            } catch (_e) {
+                status.connection = 'disconnected';
+            }
+
+            try {
+                const battState = await this.adapter.getStateAsync(`${device.ieee_address}.battery`);
+                if (battState && battState.val != null) {
+                    status.battery = battState.val;
+                }
+            } catch (_e) { /* kein Batterie-State */ }
+
+            const displayName = device.id !== device.ieee_address ? device.id : device.ieee_address;
+
+            const res = {
+                id: device.ieee_address,
+                name: displayName,
+                icon: device.icon || undefined,
+                manufacturer: device.manufacturer || '',
+                model: `${device.model || ''} ${device.modelDescription || ''}`.trim(),
+                status,
+                hasDetails: true,
+                actions: [],
+            };
+
+            if (Array.isArray(device.states)) {
+                const customItems   = {};   // kurze Labels → Kachel
+                const detailItems   = {};   // lange Labels  → Detail-Tab
+                const writeItems    = {};
+                const scheduleItems = {};
+
+                // Maximale Label-Länge für die Kachel ("Sum of produced energy" = 22 Zeichen)
+                const MAX_CARD_LABEL_LEN = 30;
+
+                for (const state of device.states) {
+                    if (!state || !state.id) { continue; }
+                    if (SKIP_STATES.has(state.id)) { continue; }
+                    if (state.isEvent === true) { continue; }
+
+                    const stateId = `${this.adapter.namespace}.${device.ieee_address}.${state.id}`;
+                    const label   = state.name || state.id;
+                    const unit    = state.unit || undefined;
+
+                    const isSchedule = state.id.toLowerCase().includes('schedule') ||
+                                       (state.name || '').toLowerCase().includes('schedule');
+
+                    if (state.write) {
+                        if (isSchedule) {
+                            scheduleItems[state.id] = {
+                                type: 'state', oid: stateId, foreign: true,
+                                label, newLine: true, minRows: 3, maxRows: 20,
+                            };
+                        } else if (state.type === 'boolean') {
+                            writeItems[state.id] = {
+                                type: 'state', oid: stateId, foreign: true,
+                                label, control: 'switch',
+                                trueText: 'ON', falseText: 'OFF',
+                                newLine: true,
+                            };
+                        } else if (state.type === 'number' && state.min != null && state.max != null) {
+                            writeItems[state.id] = {
+                                type: 'state', oid: stateId, foreign: true,
+                                label, unit, control: 'slider',
+                                min: state.min, max: state.max, newLine: true,
+                            };
+                        } else if (state.states) {
+                            writeItems[state.id] = {
+                                type: 'state', oid: stateId, foreign: true,
+                                label, unit, control: 'select',
+                                states: state.states, newLine: true,
+                            };
+                        } else {
+                            writeItems[state.id] = {
+                                type: 'state', oid: stateId, foreign: true,
+                                label, unit, newLine: true,
+                            };
+                        }
+                    } else if (state.read) {
+                        if (SKIP_READ_STATES.has(state.id)) { continue; }
+                        if (isSchedule) { continue; }
+                        const stateName = state.name || '';
+                        if (SKIP_NAME_PREFIXES.some(p => stateName.startsWith(p))) { continue; }
+
+                        // Duplikat vermeiden: State bereits über write-Zweig erfasst → überspringen
+                        if (writeItems[state.id]) { continue; }
+
+                        // LoRaWAN-Muster: oid + foreign:true, Framework liest Live-Wert direkt
+                        const item = {
+                            type: 'state',
+                            oid: stateId,
+                            foreign: true,
+                            label,
+                            unit: unit ?? undefined,
+                            ...(state.type === 'boolean' ? {
+                                trueText:  '✔',
+                                falseText: '✘',
+                            } : {}),
+                        };
+
+                        if (label.length > MAX_CARD_LABEL_LEN) {
+                            detailItems[state.id] = item;
+                        } else {
+                            customItems[state.id] = item;
+                        }
+                    }
+                }
+
+                // Items alphabetisch sortieren (wie LoRaWAN)
+                if (Object.keys(customItems).length > 0) {
+                    const sortedItems = Object.keys(customItems)
+                        .sort((a, b) => a.localeCompare(b))
+                        .reduce((acc, key) => { acc[key] = customItems[key]; return acc; }, {});
+
+                    res.customInfo = {
+                        id: device.ieee_address,
+                        schema: { type: 'panel', items: sortedItems },
+                    };
+                }
+
+                device._scheduleItems = scheduleItems;
+                device._detailItems   = detailItems;
+
+                if (Object.keys(writeItems).length > 0) {
+                    res.actions.push({
+                        id: 'control',
+                        icon: 'settings',
+                        description: 'Control device',
+                        handler: async (_id, ctx) => {
+                            await ctx.showForm(
+                                { type: 'panel', label: displayName, items: writeItems },
+                                { title: `Control – ${displayName}` },
+                            );
+                            return { refresh: false };
+                        },
+                    });
+                }
+            }
+
+            context.addDevice(res);
+        }
+
+        context.complete();
+    }
+
+    /**
+     * Gibt Schema und Daten für die Detailansicht eines einzelnen Geräts zurück.
+     *
+     * @param {string} id        Die IEEE-Adresse des Geräts
+     * @param {object} _action   Das Action-Objekt vom dm-utils-Framework
+     * @param {object} _context  Der Device-Management-Kontext
+     */
+    async getDeviceDetails(id, _action, _context) {
+        this.adapter.log.debug(`getDeviceDetails: ${id}`);
+
+        const device = this.deviceCache.find((d) => d.ieee_address === id);
+        if (!device) { return null; }
+
+        // Zeitstempel formatieren (wie LoRaWAN)
+        const formatTs = (val) => {
+            if (!val) { return '—'; }
+            const ts = isNaN(Number(val)) ? new Date(val) : new Date(Number(val));
+            if (isNaN(ts.getTime())) { return String(val); }
+            return ts.toLocaleString('de-DE', {
+                weekday: 'long', year: 'numeric', month: '2-digit', day: '2-digit',
+                hour: '2-digit', minute: '2-digit', second: '2-digit',
+            });
+        };
+
+        // Live-States lesen
+        let lastSeenText    = '—';
+        let linkQualityText = '—';
+        let batteryText     = '—';
+        let availableText   = '—';
+
+        try {
+            const s = await this.adapter.getStateAsync(`${device.ieee_address}.last_seen`);
+            if (s && s.val != null && s.val !== '') { lastSeenText = formatTs(s.val); }
+        } catch (_e) { /* ignorieren */ }
+
+        try {
+            const s = await this.adapter.getStateAsync(`${device.ieee_address}.link_quality`);
+            if (s && s.val != null) { linkQualityText = `${s.val} / 255`; }
+        } catch (_e) { /* ignorieren */ }
+
+        try {
+            const s = await this.adapter.getStateAsync(`${device.ieee_address}.battery`);
+            if (s && s.val != null) { batteryText = `${s.val} %`; }
+        } catch (_e) { /* ignorieren */ }
+
+        try {
+            const s = await this.adapter.getStateAsync(`${device.ieee_address}.available`);
+            if (s) { availableText = s.val === true ? '✔  Online' : '✘  Offline'; }
+        } catch (_e) { /* ignorieren */ }
+
+        const displayName   = device.id !== device.ieee_address ? device.id : device.ieee_address;
+        const scheduleItems = device._scheduleItems || {};
+        const hasSchedule   = Object.keys(scheduleItems).length > 0;
+        const detailItems   = device._detailItems   || {};
+        const hasDetails    = Object.keys(detailItems).length > 0;
+
+        /** @type {Record<string, any>} */
+        const data = {};
+
+        // ── Tab 1: Gerät ─────────────────────────────────────────────────────
+        /** @type {Record<string, any>} */
+        const infoItems = {};
+        infoItems['_h1']    = { type: 'header',     text: 'Device Identity',  size: 4, newLine: true };
+        infoItems['_d1']    = { type: 'divider',     color: 'primary' };
+        infoItems['ieee']   = { type: 'staticInfo',  label: 'IEEE Address',   data: device.ieee_address,             size: 16, addColon: true, newLine: true };
+        infoItems['fname']  = { type: 'staticInfo',  label: 'Friendly Name',  data: device.id,                       size: 16, addColon: true, newLine: true };
+        infoItems['mfr']    = { type: 'staticInfo',  label: 'Manufacturer',   data: device.manufacturer  || '—',     size: 16, addColon: true, newLine: true };
+        infoItems['model']  = { type: 'staticInfo',  label: 'Model',          data: device.model         || '—',     size: 16, addColon: true, newLine: true };
+        infoItems['descr']  = { type: 'staticInfo',  label: 'Description',    data: device.modelDescription || '—',  size: 16, addColon: true, newLine: true };
+        infoItems['pwr']    = { type: 'staticInfo',  label: 'Power Source',   data: device.powerSource   || '—',     size: 16, addColon: true, newLine: true };
+
+        // ── Tab 2: Verbindung ─────────────────────────────────────────────────
+        /** @type {Record<string, any>} */
+        const connItems = {};
+        connItems['_h1']    = { type: 'header',     text: 'Zigbee Connection',  size: 4, newLine: true };
+        connItems['_d1']    = { type: 'divider',     color: 'primary' };
+        connItems['avail']  = { type: 'staticInfo',  label: 'Status',           data: availableText,    size: 16, addColon: true, newLine: true };
+        connItems['lq']     = { type: 'staticInfo',  label: 'Link Quality',     data: linkQualityText,  size: 16, addColon: true, newLine: true };
+        connItems['ls']     = { type: 'staticInfo',  label: 'Last seen',        data: lastSeenText,     size: 16, addColon: true, newLine: true };
+        if (batteryText !== '—') {
+            connItems['batt'] = { type: 'staticInfo', label: 'Battery',         data: batteryText,      size: 16, addColon: true, newLine: true };
+        }
+
+        // ── Tab 3: Technisch ──────────────────────────────────────────────────
+        /** @type {Record<string, any>} */
+        const techItems = {};
+        techItems['_h1']    = { type: 'header',    text: 'Zigbee Status',       size: 4, newLine: true };
+        techItems['_d1']    = { type: 'divider',    color: 'primary' };
+        techItems['interviewCompleted'] = { type: 'checkbox', label: 'Interview completed', readOnly: true, newLine: true };
+        techItems['supported']          = { type: 'checkbox', label: 'Supported by Z2M',    readOnly: true, newLine: true };
+        techItems['disabled']           = { type: 'checkbox', label: 'Disabled',            readOnly: true, newLine: true };
+
+        data.interviewCompleted = !!device.interviewCompleted;
+        data.supported          = !!device.supported;
+        data.disabled           = !!device.disabled;
+
+        // ── Tabs zusammenbauen ────────────────────────────────────────────────
+        /** @type {Record<string, any>} */
+        const tabs = {
+            _tab_info: { type: 'panel', label: 'Device',     items: infoItems },
+            _tab_conn: { type: 'panel', label: 'Connection', items: connItems },
+            _tab_tech: { type: 'panel', label: 'Technical',  items: techItems },
+        };
+
+        // Values-Tab: States mit langen Labels
+        if (hasDetails) {
+            const sortedDetailItems = Object.keys(detailItems)
+                .sort((a, b) => a.localeCompare(b))
+                .reduce((acc, key) => { acc[key] = detailItems[key]; return acc; }, {});
+            tabs._tab_values = {
+                type: 'panel',
+                label: 'Values',
+                items: {
+                    _h1: { type: 'header', text: 'Additional Values', size: 4, newLine: true },
+                    _d1: { type: 'divider', color: 'primary' },
+                    ...sortedDetailItems,
+                },
+            };
+        }
+
+        // Schedule-Tab: nur für Thermostate
+        if (hasSchedule) {
+            tabs._tab_schedule = {
+                type: 'panel',
+                label: 'Schedule',
+                items: {
+                    _h1: { type: 'header',  text: 'Weekly Schedule', size: 4, newLine: true },
+                    _d1: { type: 'divider', color: 'primary' },
+                    ...scheduleItems,
+                },
+            };
+        }
+
+        return {
+            id: device.ieee_address,
+            schema: { type: 'tabs', items: tabs },
+            data,
+        };
+    }
+
     /**
      * Verarbeitet die Antwort eines Coordinator-Check-Requests von Zigbee2MQTT
      * und schreibt fehlende Router in die info-States.

package/lib/exposes.js

@@ -726,29 +726,26 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
                                 break;
 
                             case 'illuminance':
-                                // Z2M sendet 'illuminance' = Rohwert (kein Lux)
-                                // Wir legen BEIDE States an:
-                                //   1. illuminance_raw  – der unveränderte Rohwert
-                                //   2. illuminance      – in Lux konvertiert (10^(raw/10000))
-                                // Damit bleiben bestehende Scripts auf illuminance_raw kompatibel
-                                // und neue Scripts können direkt illuminance (Lux) nutzen.
-                                pushToStates(statesDefs.illuminance_raw, expose.access);
-                                state = statesDefs.illuminance_from_raw;
+                                // Gerät sendet payload.illuminance (Lux in neuem Z2M).
+                                pushToStates(statesDefs.illuminance_direct, expose.access);
+                                state = statesDefs.illuminance_raw_from_lux;
                                 break;
 
                             case 'illuminance_raw':
-                                // Gerät sendet payload.illuminance_raw direkt (eigener Expose-Typ)
-                                // Wir legen ebenfalls BEIDE States an:
-                                //   1. illuminance_raw  – der unveränderte Rohwert (prop='illuminance_raw')
-                                //   2. illuminance      – in Lux konvertiert (10^(raw/10000))
+                                // Gerät sendet payload.illuminance_raw (ZCL-Rohwert).
                                 pushToStates(statesDefs.illuminance_raw_direct, expose.access);
-                                state = statesDefs.illuminance_from_illuminance_raw;
+                                state = statesDefs.illuminance_from_raw;
                                 break;
 
                             case 'illuminance_lux':
-                                state = statesDefs.illuminance;
+                                // Geräte wie Philips HUE Motion, IKEA liefern illuminance_lux (bereits Lux).
+                                // illuminance_lux_direct: übernimmt Lux direkt.
+                                // illuminance_raw_from_lux2: berechnet Rohwert – nur wenn kein illuminance_raw im Payload.
+                                pushToStates(statesDefs.illuminance_lux_direct, expose.access);
+                                state = statesDefs.illuminance_raw_from_lux2;
                                 break;
 
+
                             case 'power':
                                 state = statesDefs.load_power;
                                 break;

package/lib/mqttServerController.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const core = require('@iobroker/adapter-core');
 const Aedes = require('aedes');
 const net = require('node:net');
 
@@ -51,24 +50,19 @@ class MqttServerController {
     }
 
     /**
-     * Startet den internen MQTT-Server mit nedb-Persistenz (aedes + aedes-persistence-nedb).
+     * Startet den internen MQTT-Server mit In-Memory-Persistenz (aedes + aedes-persistence-memory).
      * Wartet auf den erfolgreichen listen()-Aufruf bevor die Methode zurückkehrt.
+     * Hinweis: aedes-persistence-nedb wurde entfernt, da es das veraltete nedb-Paket
+     * mit util.isDate verwendet (entfernt in Node.js v12+). In-Memory ist für einen
+     * internen Broker ausreichend – Clients subscriben sich bei Reconnect automatisch neu.
      */
     async createMQTTServer() {
         if (!this._checkConfig()) {
             return;
         }
         try {
-            const NedbPersistence = require('aedes-persistence-nedb');
-            const db = new NedbPersistence({
-                path: `${core.getAbsoluteInstanceDataDir(this.adapter)}/mqttData`,
-                prefix: '',
-            });
-            // aedes-persistence-nedb does not implement the async setup() interface
-            // required by aedes v1.x → no-op shim
-            if (!db.setup) {
-                db.setup = async () => {};
-            }
+            const MemoryPersistence = require('aedes-persistence');
+            const db = MemoryPersistence();
             const aedes = Aedes({ persistence: db });
             this.aedesBroker = aedes;
             this.mqttServer  = net.createServer(aedes.handle);

package/lib/states.js

@@ -347,12 +347,19 @@ const states = {
     },
 
     /**
-     * Illuminance berechnet aus dem Z2M-Rohwert (prop='illuminance').
-     * Formel: lux = round(10^(raw / 10000))
-     * Wird zusätzlich zu illuminance_raw angelegt wenn das Gerät keinen
-     * illuminance_lux-Expose liefert.
+     * illuminance (Lux-State) – ausgelöst durch payload.illuminance.
+     *
+     * Fall 1 – beide Werte im Payload (illuminance + illuminance_raw):
+     *   payload.illuminance wird direkt übernommen (neues Z2M sendet bereits Lux).
+     *
+     * Fall 2 – nur illuminance im Payload:
+     *   payload.illuminance wird direkt übernommen.
+     *
+     * Fall 3 – nur illuminance_raw im Payload:
+     *   Dieser State wird NICHT von diesem Eintrag gesetzt (prop='illuminance' nicht vorhanden).
+     *   Stattdessen übernimmt illuminance_from_raw (prop='illuminance_raw') die Berechnung.
      */
-    illuminance_from_raw: {
+    illuminance_direct: {
         id: 'illuminance',
         prop: 'illuminance',
         name: 'Illuminance',
@@ -363,15 +370,20 @@ const states = {
         type: 'number',
         def: 0,
         unit: 'lux',
-        getter: (payload) => {
-            if (payload.illuminance == null) { return undefined; }
-            const raw = payload.illuminance;
-            if (raw <= 0) { return 0; }
-            return Math.round(Math.pow(10, (raw - 1) / 10000));
-        },
     },
 
-    illuminance_raw: {
+    /**
+     * illuminance_raw (Rohwert-State) – ausgelöst durch payload.illuminance.
+     *
+     * Fall 2 – nur illuminance im Payload:
+     *   illuminance_raw wird aus dem Lux-Wert zurückgerechnet:
+     *   raw = round(log10(lux) * 10000 + 1)
+     *
+     * Fall 1 – beide Werte im Payload:
+     *   Getter gibt undefined zurück → dieser State wird NICHT gesetzt,
+     *   stattdessen setzt illuminance_raw_direct (prop='illuminance_raw') den Rohwert direkt.
+     */
+    illuminance_raw_from_lux: {
         id: 'illuminance_raw',
         prop: 'illuminance',
         name: 'Illuminance raw',
@@ -382,11 +394,21 @@ const states = {
         type: 'number',
         def: 0,
         unit: '',
+        getter: (payload) => {
+            // Wenn illuminance_raw bereits im Payload → illuminance_raw_direct setzt ihn direkt
+            if (payload.illuminance_raw != null) { return undefined; }
+            const lux = payload.illuminance;
+            if (lux == null) { return undefined; }
+            if (lux <= 0) { return 0; }
+            return Math.round(Math.log10(lux) * 10000 + 1);
+        },
     },
 
     /**
-     * Rohwert-State wenn das Gerät 'illuminance_raw' als payload-Schlüssel sendet
-     * (z.B. Geräte mit eigenem illuminance_raw-Expose).
+     * illuminance_raw (Rohwert-State) – ausgelöst durch payload.illuminance_raw.
+     *
+     * Fall 1 – beide Werte im Payload: direkt übernehmen.
+     * Fall 3 – nur illuminance_raw im Payload: direkt übernehmen.
      */
     illuminance_raw_direct: {
         id: 'illuminance_raw',
@@ -402,12 +424,15 @@ const states = {
     },
 
     /**
-     * Illuminance in Lux berechnet aus payload.illuminance_raw.
-     * Formel: lux = round(10^(illuminance_raw / 10000))
-     * Wird angelegt wenn das Gerät 'illuminance_raw' als Expose-Typ hat,
-     * aber kein separates 'illuminance_lux' liefert.
+     * illuminance (Lux-State) – ausgelöst durch payload.illuminance_raw.
+     *
+     * Fall 3 – nur illuminance_raw im Payload:
+     *   Lux wird berechnet: lux = round(10^((raw - 1) / 10000))
+     *
+     * Fall 1 – beide Werte im Payload:
+     *   Getter gibt undefined zurück → illuminance_direct (prop='illuminance') setzt Lux direkt.
      */
-    illuminance_from_illuminance_raw: {
+    illuminance_from_raw: {
         id: 'illuminance',
         prop: 'illuminance_raw',
         name: 'Illuminance',
@@ -419,13 +444,58 @@ const states = {
         def: 0,
         unit: 'lux',
         getter: (payload) => {
-            if (payload.illuminance_raw == null) { return undefined; }
+            // Wenn illuminance bereits im Payload → illuminance_direct setzt Lux direkt
+            if (payload.illuminance != null) { return undefined; }
             const raw = payload.illuminance_raw;
+            if (raw == null) { return undefined; }
             if (raw <= 0) { return 0; }
             return Math.round(Math.pow(10, (raw - 1) / 10000));
         },
     },
 
+    /**
+     * illuminance (Lux-State) – ausgelöst durch payload.illuminance_lux.
+     * Geräte wie Philips HUE Motion, IKEA liefern illuminance_lux (bereits Lux).
+     * Wert wird direkt übernommen.
+     */
+    illuminance_lux_direct: {
+        id: 'illuminance',
+        prop: 'illuminance_lux',
+        name: 'Illuminance',
+        icon: undefined,
+        role: 'value.brightness',
+        write: false,
+        read: true,
+        type: 'number',
+        def: 0,
+        unit: 'lux',
+    },
+
+    /**
+     * illuminance_raw (Rohwert-State) – ausgelöst durch payload.illuminance_lux.
+     * Berechnet: raw = round(log10(lux) * 10000 + 1)
+     * NUR wenn kein illuminance_raw im Payload – kein Überschreiben.
+     */
+    illuminance_raw_from_lux2: {
+        id: 'illuminance_raw',
+        prop: 'illuminance_lux',
+        name: 'Illuminance raw',
+        icon: undefined,
+        role: 'value.brightness',
+        write: false,
+        read: true,
+        type: 'number',
+        def: 0,
+        unit: '',
+        getter: (payload) => {
+            if (payload.illuminance_raw != null) { return undefined; }
+            const lux = payload.illuminance_lux;
+            if (lux == null) { return undefined; }
+            if (lux <= 0) { return 0; }
+            return Math.round(Math.log10(lux) * 10000 + 1);
+        },
+    },
+
     // Fix: prop ergänzt – Z2M sendet payload.occupancy
     occupancy: {
         id: 'occupancy',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen and Arthur Rupp",
@@ -21,15 +21,15 @@
     "url": "https://github.com/arteck/ioBroker.zigbee2mqtt.git"
   },
   "engines": {
-    "node": ">= 20"
+    "node": ">= 22"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
     "@iobroker/dm-utils": "^3.0.17",
     "aedes": "^0.51.3",
-    "aedes-persistence-nedb": "^2.0.3",
+    "aedes-persistence": "^9.1.2",
+    "axios": "^1.15.2",
     "mqtt": "^5.15.1",
-    "axios": "^1.14.0",
     "net": "^1.0.2",
     "node-schedule": "^2.1.1",
     "sharp": "^0.34.5",
@@ -41,12 +41,12 @@
     "@alcalzone/release-script-plugin-license": "^5.1.1",
     "@alcalzone/release-script-plugin-manual-review": "^5.1.1",
     "@iobroker/adapter-dev": "^1.5.0",
-    "@iobroker/testing": "^5.2.2",
     "@iobroker/eslint-config": "^2.1.0",
+    "@iobroker/testing": "^5.2.2",
     "@tsconfig/node14": "^14.1.8",
     "@types/node": "^25.5.2",
     "@types/node-schedule": "^2.1.8",
-    "typescript": "~6.0.2"
+    "typescript": "~6.0.3"
   },
   "main": "main.js",
   "files": [