iobroker.zigbee2mqtt 3.2.2 → 3.2.5

package/lib/deviceController.js

@@ -6,19 +6,6 @@ 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.
- * String.includes() würde Substring-Matches liefern (z.B. "0x12" trifft "0x1234").
- *
- * @param {string} debugDevices
- * @param {string} address
- * @returns {boolean}
- */
-function isDebugDevice(debugDevices, address) {
-    if (!debugDevices || !address) { return false; }
-    return String(debugDevices).split(',').map((s) => s.trim()).includes(address);
-}
-
 /**
  * Verwaltet das Erstellen und Aktualisieren von Geräte- und Gruppenobjekten in ioBroker
  * basierend auf den Zigbee2MQTT-Exposes.
@@ -43,6 +30,31 @@ class DeviceController extends dmUtils.DeviceManagement {
         this.logCustomizations = logCustomizations;
         this.createCache = createCache;
         this.imageController = new ImageController(adapter);
+
+        // Debug-Device Cache - wird lazy befüllt (siehe isDebugDevice)
+        this._debugDeviceCache = null;
+    }
+
+    /**
+     * Checks if the given device is a debug device.
+     * Der CSV-String wird einmalig geparst und in einem Set gecached (O(1) Lookup).
+     * Case-insensitive Vergleich.
+     *
+     * @param {string} ieeeAddr - IEEE address of the device
+     * @returns {boolean}
+     */
+    isDebugDevice(ieeeAddr) {
+        if (!ieeeAddr) { return false; }
+        if (this._debugDeviceCache === null) {
+            const debugDeviceList = this.logCustomizations.debugDevices || '';
+            this._debugDeviceCache = new Set(
+                debugDeviceList
+                    .split(',')
+                    .map(s => s.trim().toLowerCase())
+                    .filter(s => s.length > 0)
+            );
+        }
+        return this._debugDeviceCache.has(ieeeAddr.toLowerCase());
     }
 
     /**
@@ -58,12 +70,15 @@ class DeviceController extends dmUtils.DeviceManagement {
             return;
         }
         utils.clearArray(this.deviceCache);
+        // Topic->Device Map-Cache invalidieren, da deviceCache neu aufgebaut wird
+        // (verhindert veraltete Referenzen -> u.a. available-State bleibt sonst false)
+        this.invalidateStatesDeviceMap();
         for (const devicesMessag of devicesMessage) {
             if (!devicesMessag || !devicesMessag.ieee_address) {
                 continue;
             }
 
-            if (isDebugDevice(this.logCustomizations.debugDevices, devicesMessag.ieee_address)) {
+            if (this.isDebugDevice(devicesMessag.ieee_address)) {
                 this.adapter.log.warn(
                     `--->>> fromZ2M -> ${devicesMessag.ieee_address} exposes: ${JSON.stringify(devicesMessag)}`
                 );
@@ -76,7 +91,11 @@ class DeviceController extends dmUtils.DeviceManagement {
                 if (Array.isArray(devicesMessag.definition.exposes)) {
                     try {
                         const newDevice = await createDeviceFromExposes(devicesMessag, this.adapter);
-                        newDevice.icon = await this.imageController.getDeviceIcon(devicesMessag);
+                        try {
+                            newDevice.icon = await this.imageController.getDeviceIcon(devicesMessag);
+                        } catch (e) {
+                            this.adapter.log.warn(`[deviceController] Could not load icon for device ${newDevice.common?.name || 'unknown'}: ${e.message}`);
+                        }
                         newDevice.manufacturer = devicesMessag.definition.vendor || '';
                         newDevice.model = devicesMessag.definition.model || '';
                         newDevice.modelDescription = devicesMessag.definition.description || '';
@@ -292,12 +311,14 @@ class DeviceController extends dmUtils.DeviceManagement {
             return;
         }
         utils.clearArray(this.groupCache);
+        // Topic->Device Map-Cache invalidieren, da groupCache neu aufgebaut wird
+        this.invalidateStatesDeviceMap();
         for (const groupMessage of groupsMessage) {
             // Fix 5: fehlende Pflichtfelder abfangen
             if (!groupMessage || groupMessage.id == null || !groupMessage.friendly_name) {
                 continue;
             }
-            if (isDebugDevice(this.logCustomizations.debugDevices, String(groupMessage.id))) {
+            if (this.isDebugDevice(String(groupMessage.id))) {
                 this.adapter.log.warn(`--->>> fromZ2M -> ${groupMessage.id} exposes: ${JSON.stringify(groupMessage)}`);
             }
             this.defineGroupDevice(groupMessage.friendly_name, `group_${groupMessage.id}`, groupMessage.scenes || []);
@@ -469,6 +490,8 @@ class DeviceController extends dmUtils.DeviceManagement {
             .find((x) => x.id === messageObj.payload.data.from);
         if (renamedDevice) {
             renamedDevice.id = messageObj.payload.data.to;
+            // Topic (device.id) hat sich geändert -> Map-Cache invalidieren
+            this.invalidateStatesDeviceMap();
         }
     }
 
@@ -485,6 +508,18 @@ class DeviceController extends dmUtils.DeviceManagement {
         }
     }
 
+    /**
+     * Invalidiert den Topic->Device Map-Cache des StatesController.
+     * Muss nach jedem Neuaufbau von deviceCache/groupCache aufgerufen werden,
+     * damit findDeviceByTopic() keine veralteten Geräteobjekte liefert
+     * (sonst bleibt z.B. das available-State neu angelernter Geräte auf false).
+     */
+    invalidateStatesDeviceMap() {
+        if (this.adapter.statesController && typeof this.adapter.statesController.clearDeviceMap === 'function') {
+            this.adapter.statesController.clearDeviceMap();
+        }
+    }
+
     /**
      * Erstellt eine bereinigte Kopie eines State-Objekts ohne interne Laufzeit-Felder
      * (getter, setter, prop, etc.) für die ioBroker-Objektdefinition.
@@ -765,11 +800,9 @@ class DeviceController extends dmUtils.DeviceManagement {
         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' };
@@ -781,7 +814,6 @@ class DeviceController extends dmUtils.DeviceManagement {
         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' };
@@ -793,7 +825,6 @@ class DeviceController extends dmUtils.DeviceManagement {
         }
 
         // ── 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' };
@@ -806,7 +837,6 @@ class DeviceController extends dmUtils.DeviceManagement {
         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 },

package/lib/exposes.js

@@ -111,6 +111,7 @@ function genState(expose, role, name, desc) {
                 states: {},
             };
 
+            state.type = 'string';
             for (const val of expose.values) {
                 // if a definition of a button (eg. Aqara presence detector FP1)
                 if (val === '') {
@@ -118,7 +119,6 @@ function genState(expose, role, name, desc) {
                 } else {
                     state.states[val] = val;
                 }
-                state.type = typeof val;
             }
             // Fix 4: wenn values leer → type bleibt undefined → Fallback auf 'string'
             if (!state.type) {
@@ -153,6 +153,7 @@ function genState(expose, role, name, desc) {
             break;
 
         default:
+            console.warn(`[genState] Unknown expose type: ${expose.type}`);
             break;
     }
 
@@ -203,13 +204,12 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
         state = Object.assign({}, state);
 
         if (access === undefined) {access = z2mAccess.ALL;}
-        state.readable = (access & z2mAccess.STATE) > 0;
-        state.writable = (access & z2mAccess.SET) > 0;
+        state.read = (access & z2mAccess.STATE) > 0;
+        state.write = (access & z2mAccess.SET) > 0;
         const stateExists = states.findIndex((x, _index, _array) => x.id === state.id);
 
         if (stateExists < 0) {
-            state.write = state.writable;
-            if (!state.writable) {
+            if (!state.write) {
                 if (state.hasOwnProperty('setter')) {
                     delete state.setter;
                 }
@@ -219,7 +219,7 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
                 }
             }
 
-            if (!state.readable) {
+            if (!state.read) {
                 if (state.hasOwnProperty('getter')) {
                     //to awid some worning on unprocessed data
                     state.getter = (_payload) => undefined;
@@ -228,7 +228,7 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
 
             return states.push(state);
         } 
-            if (state.readable && !states[stateExists].readable) {
+            if (state.read && !states[stateExists].read) {
                 states[stateExists].read = state.read;
                 // as state is readable, it can't be button or event
                 if (states[stateExists].role === 'button') {
@@ -259,11 +259,11 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
                 } else if (state.hasOwnProperty('prop')) {
                     states[stateExists].prop = state.prop;
                 }
-                states[stateExists].readable = true;
+                states[stateExists].read = true;
             }
 
-            if (state.writable && !states[stateExists].writable) {
-                states[stateExists].write = state.writable;
+            if (state.write && !states[stateExists].write) {
+                states[stateExists].write = state.write;
                 // use new state `setter`
                 if (state.hasOwnProperty('setter')) {
                     states[stateExists].setter = state.setter;
@@ -303,7 +303,7 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
                 if (state.hasOwnProperty('epname')) {
                     states[stateExists].epname = state.epname;
                 }
-                states[stateExists].writable = true;
+                states[stateExists].write = true;
             }
 
             return states.length;
@@ -1289,9 +1289,8 @@ async function createDeviceFromExposes(devicesMessag, adapter) {
                                     return !isNaN(payload[expose.property][prop.property])
                                         ? payload[expose.property][prop.property]
                                         : undefined;
-                                } 
-                                    return undefined;
-                                
+                                }
+                                return undefined;
                             };
                         } else {
                             state.getter = (payload) => {

package/lib/imageController.js

@@ -106,7 +106,7 @@ class ImageController {
             return '';
         }
 
-        const imageSize = this.adapter.config.deviceIconsSize;
+        const imageSize = this.adapter.config.deviceIconsSize || 120;
         const z2mModel = device.definition.model || '';
         const z2mIconFileNameJPG = `${this.sanitizeZ2MDeviceName(z2mModel)}.jpg`;
         const z2mIconFileNamePNG = `${this.sanitizeZ2MDeviceName(z2mModel)}.png`;

package/lib/mqttServerController.js

@@ -2,6 +2,7 @@
 
 const Aedes = require('aedes');
 const net = require('node:net');
+const MemoryPersistence = require('aedes-persistence');
 
 /**
  * Verwaltet den internen oder Dummy-MQTT-Server (Aedes) für den Zigbee2MQTT-Adapter.
@@ -58,10 +59,9 @@ class MqttServerController {
      */
     async createMQTTServer() {
         if (!this._checkConfig()) {
-            return;
+            return false;
         }
         try {
-            const MemoryPersistence = require('aedes-persistence');
             const db = MemoryPersistence();
             const aedes = Aedes({ persistence: db });
             this.aedesBroker = aedes;
@@ -82,10 +82,20 @@ class MqttServerController {
                     }
                 );
             });
+            return true;
         } catch (err) {
-            this.adapter.log.error(`createMQTTServer error: ${err && err.message ? err.message : String(err)}`);
+            const code = err && err.code ? err.code : '';
+            if (code === 'EACCES' || code === 'EADDRINUSE') {
+                this.adapter.log.error(
+                    `Port ${this.adapter.config.mqttServerPort} is already in use or requires admin privileges. ` +
+                    `Please change the port in the adapter settings or stop the other service.`
+                );
+            } else {
+                this.adapter.log.error(`createMQTTServer error: ${err && err.message ? err.message : String(err)}`);
+            }
             // Sicherstellen dass kein halboffener Server übrig bleibt
             this.closeServer();
+            return false;
         }
     }
 
@@ -95,7 +105,7 @@ class MqttServerController {
      */
     async createDummyMQTTServer() {
         if (!this._checkConfig()) {
-            return;
+            return false;
         }
         try {
              const aedes = Aedes();
@@ -117,9 +127,19 @@ class MqttServerController {
                     }
                 );
             });
+            return true;
         } catch (err) {
-            this.adapter.log.error(`createDummyMQTTServer error: ${err && err.message ? err.message : String(err)}`);
+            const code = err && err.code ? err.code : '';
+            if (code === 'EACCES' || code === 'EADDRINUSE') {
+                this.adapter.log.error(
+                    `Port ${this.adapter.config.mqttServerPort} is already in use or requires admin privileges. ` +
+                    `Please change the port in the adapter settings or stop the other service.`
+                );
+            } else {
+                this.adapter.log.error(`createDummyMQTTServer error: ${err && err.message ? err.message : String(err)}`);
+            }
             this.closeServer();
+            return false;
         }
     }
 

package/lib/rgb.js

@@ -152,6 +152,11 @@ function rgb_to_cie(red, green, blue) {
  * @param v
  */
 function hsvToRGB(h, s, v) {
+    if (arguments.length === 1) {
+        s = h.s;
+        v = h.v;
+        h = h.h;
+    }
     h = (h % 360) / 360;
     s = s / 100;
     v = v / 100;
@@ -159,11 +164,6 @@ function hsvToRGB(h, s, v) {
     let r;
     let g;
     let b;
-    if (arguments.length === 1) {
-        s = h.s;
-        v = h.v;
-        h = h.h;
-    }
     const i = Math.floor(h * 6);
     const f = h * 6 - i;
     const p = v * (1 - s);

package/lib/states.js

@@ -37,6 +37,17 @@ const nameLookup = {
     Hz: 'frequency',
     pf: 'power_factor',
     lx: 'illuminance_lux',
+    '°C': 'temperature_celsius',
+    '°F': 'temperature_fahrenheit',
+    mA: 'milliampere',
+    mV: 'millivolt',
+    'μg/m³': 'microgram_per_cubic_meter',
+    dB: 'decibel',
+    '%rH': 'percent_rh',
+    'km/h': 'kilometer_per_hour',
+    'm/s': 'meter_per_second',
+    'mg/m³': 'milligram_per_cubic_meter',
+    K: 'kelvin',
 };
 
 const unitLookup = {
@@ -53,6 +64,17 @@ const unitLookup = {
     frequency: 'Hz',
     power_factor: 'pf',
     illuminance_lux: 'lx',
+    temperature_celsius: '°C',
+    temperature_fahrenheit: '°F',
+    milliampere: 'mA',
+    millivolt: 'mV',
+    microgram_per_cubic_meter: 'μg/m³',
+    decibel: 'dB',
+    percent_rh: '%rH',
+    kilometer_per_hour: 'km/h',
+    meter_per_second: 'm/s',
+    milligram_per_cubic_meter: 'mg/m³',
+    kelvin: 'K',
 };
 
 const states = {
@@ -396,7 +418,7 @@ const states = {
         unit: '',
         getter: (payload) => {
             // Wenn illuminance_raw bereits im Payload → illuminance_raw_direct setzt ihn direkt
-            if (payload.illuminance_raw != null) { return undefined; }
+            if (payload.illuminance_raw != null) { return Number(payload.illuminance_raw); }
             const lux = payload.illuminance;
             if (lux == null) { return undefined; }
             if (lux <= 0) { return 0; }