iobroker.zigbee 3.3.1 → 3.3.2

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2025 Kirov Ilya <kirovilya@gmail.com>
+Copyright (c) 2018-2026 Kirov Ilya <kirovilya@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -141,10 +141,16 @@ You can thank the authors by these links:
 
 -----------------------------------------------------------------------------------------------------
 ## Changelog
+### 3.3.2 (2026-01-04)
+* Fix sync brightness / state
+* Fix bug in expose
+* Fix rewrite state config
+*
+
 ### 3.3.1 (2025-12-31)
 * Update documentation
 * Color Hue/Saturation in Groups
-* ZH8
+* Zigbee-Herdsman v8.x.x
 * Sort by model in Admin
 * Object for complex exposes
 * POSSIBLY BREAKING: Complex exposes changed to 'channel / state' structure
@@ -411,7 +417,7 @@ You can thank the authors by these links:
 ## License
 The MIT License (MIT)
 
-Copyright (c) 2018-2025 Kirov Ilya <kirovilya@gmail.com>
+Copyright (c) 2018-2026 Kirov Ilya <kirovilya@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "3.3.1",
+    "version": "3.3.2",
     "news": {
+      "3.3.2": {
+        "en": "Fix sync brightness / state\nFix bug in expose\nFix rewrite state config\n",
+        "de": "Synchronisierhelligkeit / Zustand\nFehler behoben in exponieren\nRewriting State config\n",
+        "ru": "Исправление яркости синхронизации / состояние\nУстранение ошибки в разоблачении\nRewrite state config (переписать конфигурацию состояния)\n",
+        "pt": "Corrigir o brilho / estado da sincronização\nCorrigir erro na exposição\nCorrigir a configuração do estado de reescrita\n",
+        "nl": "Synchronische helderheid / status herstellen\nFix bug in expos\nHerschrijf statusconfiguratie\n",
+        "fr": "Correction de la luminosité de synchronisation / état\nCorrection du bogue dans l'exposition\nCorrection de la configuration de l'état de réécriture\n",
+        "it": "Fissare la luminosità di sincronizzazione / stato\nFissare bug in esposizione\nRiparare la configurazione dello stato di riscrittura\n",
+        "es": "Fijar el brillo de sincronización / estado\nFijar fallo en exponer\nReescribir el config del estado\n",
+        "pl": "Napraw jasność / stan synchronizacji\nPopraw błąd w odsłonięciu\nPopraw stan konfiguracji\n",
+        "uk": "Виправлення сипучих яскравості / стану\nВиправлення помилок у вигнанні\nВиправлення перезапису державного налаштування\n",
+        "zh-cn": "修正同步亮度/ 状态\n在曝光中修复错误\n修改状态配置\n"
+      },
       "3.3.1": {
         "en": "Update documentation\nColor Hue/Saturation in Groups\nZH8\nSort by model in Admin\nObject for complex exposes\nPOSSIBLY BREAKING: Complex exposes changed to 'channel / state' structure\nBugfixes\n",
         "de": "Dokumentation zur Aktualisierung\nFarbe Hue/Sättigung in Gruppen\nZH8\nSortieren nach Modell in Admin\nObjekt für komplexe Exponate\nPOSSIBLY BREAKING: Komplex enthüllt geändert in 'Kanal / Zustand' Struktur\nBugfixes\n",
@@ -80,19 +93,6 @@
         "pl": "Bugfix na usunąć obiekt.\nulepszone zapytanie urządzenia.\nnaprawione urządzenie usuwające z lokalnymi przekroczeniami.\n",
         "uk": "Виправлення помилок при видаленні об'єкта.\nпокращений пристрій запиту.\nфіксований пристрій видалення з локальними перенаряддями.\n",
         "zh-cn": "删除对象上的错误修正 .\n改进设备查询 .\n有本地覆盖的固定删除设备 .\n"
-      },
-      "3.2.1": {
-        "en": "fix bug #2640\n",
-        "de": "fehler beheben #2640\n",
-        "ru": "исправить ошибку #2640\n",
-        "pt": "corrigir o erro # 2640\n",
-        "nl": "fix bug #2640\n",
-        "fr": "correction du bug #2640\n",
-        "it": "fix bug #2640\n",
-        "es": "corrección de error #2640\n",
-        "pl": "fix bug # 2640\n",
-        "uk": "виправлення помилки #2640\n",
-        "zh-cn": "修复错误 # 2640\n"
       }
     },
     "titleLang": {

package/lib/exposes.js

@@ -196,7 +196,11 @@ function generateCompositeStates(expose, _channelID, options)
             write: Boolean (expose.access & ea.SET),
             read: Boolean(expose.access & ea.GET),
             type: 'string',
-            getter: (value) => { return (typeof value === 'object' ? JSON.stringify(value) : value) },
+            getter: (value) => {
+                const myval = value[stateId];
+                if (myval != undefined && typeof myval === 'object') return JSON.stringify(myval);
+                return myval;
+            },
             setter: (value) => {
                 try {
                     return JSON.parse(value);
@@ -208,100 +212,12 @@ function generateCompositeStates(expose, _channelID, options)
         })
 
     }
-    for (const prop of expose.features) {
+    if (expose?.features?.[Symbol.iterator]) for (const prop of expose.features) {
         if (prop.type === 'composite' || prop.type === 'list') {
             states.push(...generateCompositeStates(prop, channelID, options))
         }
         else
             states.push(genState(prop, options.newCompositeMethod ? { fromComposite: true, name: `${channelID}${prop.name}` , channelID: stateId }: { fromComposite: true }))
-        /*
-        switch (prop.type) {
-            case 'numeric':
-            case 'text':
-            case 'binary':
-            {
-                const st = genState(prop, 'state', `${channelID}${prop.name}`);
-                st.prop = expose.property;
-                st.inOptions = !LocalData.options.newCompositeMethod;
-                if (LocalData.options.newCompositeMethod) {
-                    st.compositeKey = stateId;
-                    st.compositeTimeout = 250;
-                    st.compositeState = stateId;
-                } else
-                {
-                    // if we have a composite expose, the value have to be an object {expose.property : {prop.property: value}}
-                // I'm not fully sure, as it really needed, but
-                    st.setterOpt = (value, options) => {
-                        const result = {};
-                        options[prop.property] = value;
-                        result[expose.property] = options;
-                        return result;
-                    };
-                    if (prop.access & ea.SET) {
-                        st.setter = (value, options) => {
-                            const result = {};
-                            options[prop.property] = value;
-                            result[expose.property] = options;
-                            return result;
-                        };
-                        st.setattr = expose.property;
-                    }
-                    // if we have a composite expose, the payload will be an object {expose.property : {prop.property: value}}
-                    if (prop.access & ea.STATE) {
-                        st.getter = payload => {
-                            if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(prop.property)) {
-                                return !isNaN(payload[expose.property][prop.property]) ? payload[expose.property][prop.property] : undefined;
-                            } else {
-                                return undefined;
-                            }
-                        };
-                    } else {
-                        st.getter = payload => undefined;
-                    }
-                }
-                pushToStates(st, prop.access);
-                break;
-            }
-            case 'list': {
-                for (const propList of prop.item_type.features) {
-                    const st = genState(propList);
-                    st.prop = expose.property;
-                    st.inOptions = true;
-                    st.setterOpt = (value, options) => {
-                        const result = {};
-                        options[propList.property] = value;
-                        result[expose.property] = options;
-                        return result;
-                    };
-                    if (propList.access & ea.SET) {
-                        st.setter = (value, options) => {
-                            const result = {};
-                            options[propList.property] = value;
-                            result[expose.property] = options;
-                            return result;
-                        };
-                        st.setattr = expose.property;
-                    }
-                    if (propList.access & ea.STATE) {
-                        st.getter = payload => {
-                            if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(propList.property)) {
-                                return !isNaN(payload[expose.property][propList.property]) ? payload[expose.property][propList.property] : undefined;
-                            } else {
-                                return undefined;
-                            }
-                        };
-                    } else {
-                        st.getter = payload => undefined;
-                    }
-
-                    st.id = st.prop + '_' + st.id;
-                    pushToStates(st, propList.access);
-                    break;
-                }
-            }
-
-        }
-            */
     }
 
     return states;
@@ -484,7 +400,7 @@ function createFromExposes(model, def, device, options, log) {
                 let colorXYprop = undefined;
                 let colorHSprop = undefined;
 
-                for (const prop of expose.features) {
+                if (expose?.features?.[Symbol.iterator]) for (const prop of expose.features) {
                     switch (prop.name) {
                         case 'state': {
                             const stateNameS = expose.endpoint ? `state_${expose.endpoint}` : 'state';
@@ -837,7 +753,7 @@ function createFromExposes(model, def, device, options, log) {
                 break;
             }
             case 'switch':
-                for (const prop of expose.features) {
+                if (expose?.features?.[Symbol.iterator]) for (const prop of expose.features) {
                     switch (prop.name) {
                         case 'state':
                             pushToStates(genState(prop, { role:'switch' }), prop.access);
@@ -1045,7 +961,7 @@ function createFromExposes(model, def, device, options, log) {
             case 'lock':
             case 'fan':
             case 'cover':
-                for (const prop of expose.features) {
+                if (expose?.features?.[Symbol.iterator]) for (const prop of expose.features) {
                     switch (prop.name) {
                         case 'state':
                             pushToStates(genState(prop, {role:'switch'}), prop.access);
@@ -1058,7 +974,7 @@ function createFromExposes(model, def, device, options, log) {
                 break;
 
             case 'climate':
-                for (const prop of expose.features) {
+                if (expose?.features?.[Symbol.iterator]) for (const prop of expose.features) {
                     pushToStates(genState(prop), prop.access);
                 }
                 break;

package/lib/models.js

@@ -668,8 +668,9 @@ async function clearModelDefinitions() {
 
 function getStateDefinition(name, type, prop) {
     if (typeof name != 'string') return getStateDefinition('ilstate', type, prop);
+    if (states.hasOwnProperty(name)) return states[name];
     if (legacyStates.hasOwnProperty(name)) return legacyStates[name];
-    return states[name] || {
+    return {
         id: name,
         prop: prop || name,
         name: name.replace('_',' '),

package/lib/statescontroller.js

@@ -751,6 +751,26 @@ class StatesController extends EventEmitter {
         setTimeout(() => this.updateState(dev_id, name, outValue, common), timeout);
     }
 
+    deepCompare(item1, item2) {
+        if (typeof item1 != typeof item2) return false; // different object, definitely different.
+        switch (typeof item1) {
+            case 'boolean':
+            case 'number':
+            case 'string': return item1 === item2;
+            case 'object':
+                if (!item1 || !item2) {
+                    if (!item1 && !item2) return true;
+                    return false;
+                }
+                for (const key of Object.keys(item1)) {
+                    if (!this.deepCompare(item1[key],item2[key])) return false;
+                }
+                return true;
+            case 'function':
+                return true; // functions are always considere equal
+        }
+    }
+
     async updateState(devId, name, value, common) {
         const new_common = {name: name, color:null};
         const stateId = devId + '.' + name;
@@ -790,7 +810,7 @@ class StatesController extends EventEmitter {
             if (stobj.common) {
                 for (const property in new_common) {
                     if (stobj.common[property] != undefined) {
-                        if (stobj.common[property] === new_common[property]) {
+                        if (this.deepCompare(stobj.common[property],new_common[property])) {
                             delete new_common[property];
                         }
                     }
@@ -810,7 +830,7 @@ class StatesController extends EventEmitter {
             }
         }
 
-        //
+        if (new_common.color=== null && (stobj?.common?.color === undefined || stobj?.common.color === null)) delete new_common.color;
         // only change object when any common property has changed
         if (Object.keys(new_common).length) {
             this.adapter.extendObject(stateId, {type: 'state', common: new_common, native: {}}, () =>
@@ -1218,6 +1238,7 @@ class StatesController extends EventEmitter {
             const has_elevated_debug = (this.checkDebugDevice(devId) && !payload.hasOwnProperty('msg_from_zigbee'));
 
             const message = `message received '${JSON.stringify(payload)}' from device ${devId} type '${model}'`;
+
             if (has_elevated_debug)
                 this.emit('device_debug', { ID:debugId, data: { deviceID: devId, flag:'03', IO:true }, message:message});
             else

package/lib/zigbeecontroller.js

@@ -1298,6 +1298,12 @@ class ZigbeeController extends EventEmitter {
 
                     return;
                 }
+                // force read for brightness
+                const skey = stateDesc.setattr || stateDesc.prop || stateDesc.id;
+                const readKey = { key: undefined, converter: undefined };
+                if (skey === 'brightness') readKey.key = 'state';
+                if (skey === 'state') readKey.key = 'brightness';
+
                 for (const c of mappedModel.toZigbee) {
 
                     if (!c.hasOwnProperty('convertSet')) continue;
@@ -1306,6 +1312,8 @@ class ZigbeeController extends EventEmitter {
                     {
                         if (converter === undefined)
                         {
+                            if (readKey.key && readKey.converter === undefined && c.hasOwnProperty('convertGet'))
+                                readKey.converter = c;
                             converter = c;
                             if (has_elevated_debug) {
                                 const message = `Setting converter to keyless converter for ${deviceId} of type ${model}`;
@@ -1340,6 +1348,8 @@ class ZigbeeController extends EventEmitter {
                         converter = c;
                         msg_counter++;
                     }
+                    if (readKey.key && c.key.includes(readKey.key) && c.hasOwnProperty('convertGet'))
+                        readKey.converter = c;
                 }
                 if (converter === undefined) {
                     if (stateDesc.isInternalState) {
@@ -1471,7 +1481,13 @@ class ZigbeeController extends EventEmitter {
                             ` Error: ${error.message}`, `Send command to ${deviceId} failed with`, error);
                         }
                     }
-                } while (retry > 0)
+                } while (retry > 0);
+
+                if (readKey.converter) {
+                    const tt = preparedOptions.transition || preparedOptions.transition_time;
+                    setTimeout(async () => { await readKey.converter.convertGet(target, readKey.key, {device:entity.device})}, tt ? tt * 1000 : 100)
+                }
+
             });
         } catch (err) {
             const message = `No entity for ${deviceId} : ${err && err.message ? err.message : 'no error message'}`;

package/main.js

@@ -706,7 +706,7 @@ class Zigbee extends utils.Adapter {
                 const model = (entity.mapped) ? entity.mapped.model : entity.device.modelID;
                 if (this.debugActive) this.log.debug(`new device ${device.ieeeAddr} ${device.networkAddress} ${model} `);
 
-                this.logToPairing(`New device joined '${device.ieeeAddr}' model ${model}`, true);
+                if (!obj) this.logToPairing(`New device joined '${device.ieeeAddr}' model ${model}`, true);
                 this.stController.updateDev(zbIdorIeeetoAdId(this, device.ieeeAddr, false), model, model, () =>
                     this.stController.syncDevStates(device, model));
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -28,8 +28,8 @@
     "ajv": "^8.17.1",
     "uri-js": "^4.4.1",
     "typescript": "^5.9.3",
-    "zigbee-herdsman": "^8.0.0",
-    "zigbee-herdsman-converters": "^25.85.0"
+    "zigbee-herdsman": "^8.0.1",
+    "zigbee-herdsman-converters": "^25.99.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {