iobroker.zigbee2mqtt 3.1.5 → 3.2.1

package/lib/mqttServerController.js

@@ -1,7 +1,6 @@
 'use strict';
 
-const core = require('@iobroker/adapter-core');
-const { Aedes } = require('aedes');
+const Aedes = require('aedes');
 const net = require('node:net');
 
 /**
@@ -51,40 +50,37 @@ 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 () => {};
-            }
-            this.aedesBroker = await Aedes.createBroker({ persistence: db });
-            this.mqttServer  = net.createServer(this.aedesBroker.handle);
+            const MemoryPersistence = require('aedes-persistence');
+            const db = MemoryPersistence();
+            const aedes = Aedes({ persistence: db });
+            this.aedesBroker = aedes;
+            this.mqttServer  = net.createServer(aedes.handle);
             this._attachServerEvents('MQTT-Server');
 
             await new Promise((resolve, reject) => {
+                this.mqttServer.once('error', reject);
                 this.mqttServer.listen(
                     this.adapter.config.mqttServerPort,
                     this.adapter.config.mqttServerIPBind,
                     () => {
+                        this.mqttServer.removeListener('error', reject);
                         this.adapter.log.info(
                             `Starting MQTT-Server on IP ${this.adapter.config.mqttServerIPBind} and Port ${this.adapter.config.mqttServerPort}`
                         );
                         resolve();
                     }
                 );
-                this.mqttServer.once('error', reject);
             });
         } catch (err) {
             this.adapter.log.error(`createMQTTServer error: ${err && err.message ? err.message : String(err)}`);
@@ -102,22 +98,24 @@ class MqttServerController {
             return;
         }
         try {
-            this.aedesBroker = await Aedes.createBroker();
-            this.mqttServer  = net.createServer(this.aedesBroker.handle);
+             const aedes = Aedes();
+            this.aedesBroker = aedes;
+            this.mqttServer  = net.createServer(aedes.handle);
             this._attachServerEvents('DummyMQTT-Server');
 
             await new Promise((resolve, reject) => {
+                this.mqttServer.once('error', reject);
                 this.mqttServer.listen(
                     this.adapter.config.mqttServerPort,
                     this.adapter.config.mqttServerIPBind,
                     () => {
+                        this.mqttServer.removeListener('error', reject);
                         this.adapter.log.info(
                             `Starting DummyMQTT-Server on IP ${this.adapter.config.mqttServerIPBind} and Port ${this.adapter.config.mqttServerPort}`
                         );
                         resolve();
                     }
                 );
-                this.mqttServer.once('error', reject);
             });
         } catch (err) {
             this.adapter.log.error(`createDummyMQTTServer error: ${err && err.message ? err.message : String(err)}`);
@@ -130,6 +128,17 @@ class MqttServerController {
      * Wird beim Adapter-Stop oder nach einem Fehler beim Start aufgerufen.
      */
     closeServer() {
+        if (this.aedesBroker) {
+            const broker = this.aedesBroker;
+            this.aedesBroker = null;
+            try {
+                broker.close(() => {
+                    this.adapter.log.debug('Aedes broker closed.');
+                });
+            } catch (err) {
+                this.adapter.log.error(`closeServer aedesBroker.close() error: ${err}`);
+            }
+        }
         if (this.mqttServer) {
             const server = this.mqttServer;
             this.mqttServer = null;
@@ -143,21 +152,6 @@ class MqttServerController {
                 this.adapter.log.error(`closeServer mqttServer.close() error: ${err}`);
             }
         }
-        if (this.aedesBroker) {
-            const broker = this.aedesBroker;
-            this.aedesBroker = null;
-            try {
-                broker.close((err) => {
-                    if (err) {
-                        this.adapter.log.debug(`Aedes broker close callback error: ${err}`);
-                    } else {
-                        this.adapter.log.debug('Aedes broker closed.');
-                    }
-                });
-            } catch (err) {
-                this.adapter.log.error(`closeServer aedesBroker.close() error: ${err}`);
-            }
-        }
     }
 }
 

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,13 +370,20 @@ const states = {
         type: 'number',
         def: 0,
         unit: 'lux',
-        getter: (payload) => {
-            if (payload.illuminance == null) { return undefined; }
-            return Math.round(Math.pow(10, payload.illuminance / 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',
@@ -380,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',
@@ -400,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',
@@ -417,8 +444,55 @@ const states = {
         def: 0,
         unit: 'lux',
         getter: (payload) => {
-            if (payload.illuminance_raw == null) { return undefined; }
-            return Math.round(Math.pow(10, payload.illuminance_raw / 10000));
+            // 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);
         },
     },
 

package/lib/statesController.js

@@ -157,7 +157,7 @@ class StatesController {
                     if (typeof value === 'object') {
                         value = JSON.stringify(value);
                     }
-                    await this.adapter.setStateAsync(`${fullPath}.${key}`, value, true);
+                    this.adapter.setState(`${fullPath}.${key}`, value, true);
                 }
                 continue;
             }
@@ -233,7 +233,7 @@ class StatesController {
         if (value === undefined || value === null) {
             return;
         }
-        await this.adapter.setStateAsync(stateName, value, true);
+        this.adapter.setState(stateName, value, true);
     }
 
     /**
@@ -264,7 +264,7 @@ class StatesController {
             return;
         }
 
-        await this.adapter.setStateAsync(stateName, value, true);
+        this.adapter.setState(stateName, value, true);
 
         // Auto-Reset (false → nichts tun, true → nach timeout zurücksetzen)
         // Wenn value=false (z.B. Stop-Aktion im simpleMoveStopState-Modus),
@@ -276,7 +276,7 @@ class StatesController {
         if (value === true) {
             this.timeOutCache[stateName] = this.adapter.setTimeout(() => {
                 delete this.timeOutCache[stateName];
-                this.adapter.setStateAsync(stateName, false, true).catch((err) => {
+                this.adapter.setState(stateName, false, true).catch((err) => {
                     this.adapter.log.debug(`setStateWithTimeout reset error for ${stateName}: ${err}`);
                 });
             }, timeout);

package/lib/websocketController.js

@@ -133,8 +133,8 @@ class WebsocketController {
         this.adapter.log.debug(`WebSocket closed – code: ${code}, reason: ${reason ? reason.toString() : 'none'}`);
 
         try {
+            await this.adapter.setStateChangedAsync('info.connection', false, true);
             if (this.adapter.statesController) {
-                this.adapter.setStateChanged('info.connection', false, true);
                 await this.adapter.statesController.setAllAvailableToFalse();
             }
         } catch (err) {

package/lib/z2mController.js

@@ -87,7 +87,7 @@ class Z2mController {
         if (stateID === 'send_payload') {
             try {
                 controlObj.payload = JSON.parse(stateVal);
-                await this.adapter.setStateAsync(id, state.val, true);
+                this.adapter.setState(id, state.val, true);
             } catch (error) {
                 // Fix 9: rawStr als String direkt als payload – wird in main.js via
                 // JSON.stringify() nochmals gewrappt → würde doppelt quoten.
@@ -122,7 +122,7 @@ class Z2mController {
         if (deviceState.isOption) {
             // set optionsValues 'Cache'
             device.optionsValues[stateName] = state.val;
-            await this.adapter.setStateAsync(id, state.val, true);
+            this.adapter.setState(id, state.val, true);
             return;
         }
 
@@ -130,7 +130,7 @@ class Z2mController {
         const immediateAckRole = ['button'].includes(deviceState.role);
         const immediateAckId = ['brightness_move', 'colortemp_move', 'brightness_step', 'effect'].includes(deviceState.id);
         if (immediateAckRole || immediateAckId) {
-            await this.adapter.setStateAsync(id, state.val, true);
+            this.adapter.setState(id, state.val, true);
         }
 
         if (this.logCustomizations.debugDevices) {

package/main.js

@@ -71,7 +71,7 @@ class Zigbee2mqtt extends core.Adapter {
 
         adapterInfo(this.config, this.log);
 
-        await this.setStateAsync('info.connection', false, true);
+        this.setState('info.connection', false, true);
 
         const debugDevicesState = await this.getStateAsync('info.debugmessages');
         if (debugDevicesState && debugDevicesState.val) {
@@ -109,6 +109,7 @@ class Zigbee2mqtt extends core.Adapter {
                     clientId: `ioBroker.zigbee2mqtt_${Math.random().toString(16).slice(2, 8)}`,
                     clean: true,
                     reconnectPeriod: 500,
+                    connectTimeout: 10000,
                 };
 
                 if (this.config.externalMqttServerCredentials === true) {
@@ -130,6 +131,7 @@ class Zigbee2mqtt extends core.Adapter {
                     clientId: `ioBroker.zigbee2mqtt_${Math.random().toString(16).slice(2, 8)}`,
                     clean: true,
                     reconnectPeriod: 500,
+                    connectTimeout: 10000,
                 });
             }
 
@@ -156,18 +158,25 @@ class Zigbee2mqtt extends core.Adapter {
                 this.log.info('MQTT client reconnecting to Zigbee2MQTT...');
             });
 
-            this.mqttClient.on('offline', () => {
-                (async () => {
-                    this.log.warn('MQTT client offline – connection to Zigbee2MQTT lost.');
-                    await this.setStateChangedAsync('info.connection', false, true);
-                    try {
-                        if (this.statesController) {
-                            await this.statesController.setAllAvailableToFalse();
-                        }
-                    } catch (e) {
-                        this.log.error(`MQTT offline setAllAvailableToFalse error: ${e}`);
+            this.mqttClient.on('offline', async () => {
+                this.log.warn('MQTT client offline – connection to Zigbee2MQTT lost.');
+                await this.setStateChangedAsync('info.connection', false, true).catch((e) =>
+                    this.log.error(`MQTT offline setStateChangedAsync error: ${e}`)
+                );
+                try {
+                    if (this.statesController) {
+                        await this.statesController.setAllAvailableToFalse();
                     }
-                })().catch((e) => this.log.error(`MQTT offline handler error: ${e}`));
+                } catch (e) {
+                    this.log.error(`MQTT offline setAllAvailableToFalse error: ${e}`);
+                }
+            });
+
+            this.mqttClient.on('close', async () => {
+                this.log.debug('MQTT client connection closed.');
+                await this.setStateChangedAsync('info.connection', false, true).catch((e) =>
+                    this.log.error(`MQTT close setStateChangedAsync error: ${e}`)
+                );
             });
 
             this.mqttClient.on('error', (err) => {
@@ -513,7 +522,7 @@ class Zigbee2mqtt extends core.Adapter {
     async onUnload(callback) {
         try {
             if (['exmqtt', 'intmqtt'].includes(this.config.connectionType)) {
-                if (this.mqttClient && !this.mqttClient.disconnected) {
+                if (this.mqttClient && this.mqttClient.connected) {
                     try {
                         this.mqttClient.removeAllListeners();
                         this.mqttClient.end(true);
@@ -561,7 +570,7 @@ class Zigbee2mqtt extends core.Adapter {
                 this.log.error(e);
             }
 
-            await this.setStateAsync('info.connection', false, true);
+            this.setState('info.connection', false, true);
 
             // Schedule-Job beenden
             const job = schedule.scheduledJobs['coordinatorCheck'];
@@ -586,14 +595,14 @@ class Zigbee2mqtt extends core.Adapter {
         if (state && state.ack === false) {
             if (id.endsWith('info.debugmessages')) {
                 this.logCustomizations.debugDevices = state.val != null ? String(state.val) : '';
-                await this.setStateAsync(id, state.val, true);
+                this.setState(id, state.val, true);
                 return;
             }
             if (id.endsWith('info.logfilter')) {
                 this.logCustomizations.logfilter = state.val != null
                     ? String(state.val).split(';').filter((x) => x)
                     : [];
-                await this.setStateAsync(id, state.val, true);
+                this.setState(id, state.val, true);
                 return;
             }
 
@@ -608,7 +617,7 @@ class Zigbee2mqtt extends core.Adapter {
             }
 
             if (['exmqtt', 'intmqtt'].includes(this.config.connectionType)) {
-                if (!this.mqttClient || this.mqttClient.disconnected) {
+                if (!this.mqttClient || !this.mqttClient.connected) {
                     this.log.warn(`Cannot publish state, MQTT client not connected. (${id})`);
                     return;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "3.1.5",
+  "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": "^1.0.2",
-    "aedes-persistence-nedb": "^2.0.3",
+    "aedes": "^0.51.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": [