iobroker.zigbee 3.3.2 → 3.3.3

package/README.md

@@ -141,6 +141,12 @@ You can thank the authors by these links:
 
 -----------------------------------------------------------------------------------------------------
 ## Changelog
+### 3.3.3 (2026-01-11)
+* Fix crash bug
+* getter for composite states V1
+* zhc
+*
+
 ### 3.3.2 (2026-01-04)
 * Fix sync brightness / state
 * Fix bug in expose

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "3.3.2",
+    "version": "3.3.3",
     "news": {
+      "3.3.3": {
+        "en": "Fix crash bug\ngetter for composite states V1\nzhc\n",
+        "de": "Fehler behoben\ngetter für zusammengesetzte Zustände V1\nzh\n",
+        "ru": "Исправить ошибку crash bug\nгеттер для композитных состояний V1\nджк\n",
+        "pt": "Corrigir erro de falha\ngetter para estados compostos V1\nzhc\n",
+        "nl": "Fix crash bug\ngetter voor samengestelde toestanden V1\nzhc\n",
+        "fr": "Correction d'un bug de plantage\ngetter pour les états composites V1\nzhc\n",
+        "it": "Correre bug crash\ngetter per stati compositi V1\nzhc\n",
+        "es": "Corrección de fallo\ngetter para estados compuestos V1\nzhc\n",
+        "pl": "Napraw błąd awarii\ngetter for composite states V1\nzhc\n",
+        "uk": "Виправлення помилки збою\nоберт для композитних станів V1\nжк\n",
+        "zh-cn": "修复崩溃错误\nv1 复合状态获取器\n日语\n"
+      },
       "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",
@@ -80,19 +93,6 @@
         "pl": "Ulepszenia dotyczące debugowania interfejsu użytkownika\nOpcja \"resend _ states\" do publikowania wartości stanu dla urządzenia przy ponownym połączeniu\nUlepszona karta grupowa\nUlepszone informacje grupowe\nZmodyfikowana karta koordynatora (2 strony)\nponowna próba błędu 25\njasne komunikaty błędów ukryte\nZHC 25.50.0 lub nowsze",
         "uk": "Удосконалення на дебурзі UI\nВаріант 'resend_states' для публікації державних значень для пристрою на відключенні\nПокращена групова карта\nПокращена інформація групи\nЗмінена карта координатора (2 сторони)\nптиця по помилки 25\nчіткі повідомлення про помилку\nZHC 25.50.0 або новачок",
         "zh-cn": "调试 UI 的改进\n选项“ resend_ states ” 以在重新连接时发布状态值以设备\n改进组卡\n改进组信息\n修改的协调员卡(2面)\n重试错误 25\n清除隐藏的错误消息\nZHC 25.50.0或更新"
-      },
-      "3.2.2": {
-        "en": "Bugfix on delete object.\nimproved device query.\nfixed delete device with local overrides.\n",
-        "de": "Bugfix auf Löschobjekt.\nverbesserte geräteabfrage.\nfeste löschvorrichtung mit lokalen overrides.\n",
-        "ru": "Bugfix для удаления объекта.\nулучшенный запрос устройства.\nфиксированное устройство удаления с локальными переопределениями.\n",
-        "pt": "Correcção de erros ao apagar o objecto.\npesquisa de dispositivos melhorada.\ndispositivo de exclusão fixo com substituições locais.\n",
-        "nl": "Bugfix bij verwijderen van object.\nverbeterde apparaatquery.\nvast delete apparaat met lokale overrides.\n",
-        "fr": "Correction sur objet de suppression.\nrequête de périphérique améliorée.\ndispositif de suppression fixe avec redéfinitions locales.\n",
-        "it": "Bugfix su delete object.\nmigliore query del dispositivo.\ndispositivo di cancellazione fisso con override locali.\n",
-        "es": "Bugfix en el objeto borrado.\nmejorada consulta de dispositivos.\ndispositivo de eliminación fijo con anulas locales.\n",
-        "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"
       }
     },
     "titleLang": {

package/lib/exposes.js

@@ -180,15 +180,32 @@ function genState(expose, overrides) {
 
 function generateCompositeStates(expose, _channelID, options)
 {
-    const states = [];
     const stname = `${_channelID}${expose.property}`;
     const stateId = stname.replace(/\*/g, '');
     const stateName = (expose.description || expose.name);
     const channelID = options.newCompositeMethod ? `c_${stateId}.` : '';
+    const stateData = {
+        states: [],
+        keys:[]
+    };
+    if (expose?.features?.[Symbol.iterator]) for (const prop of expose.features) {
+        if (prop.type === 'composite' || prop.type === 'list') {
+            const subStateData = generateCompositeStates(prop, channelID, options);
+            if (options.newCompositeMethod)
+                stateData.keys.push(prop.property);
+            else
+                stateData.keys.push(...subStateData.keys);
+            stateData.states.push(...subStateData.states);
+        }
+        else {
+            stateData.states.push(genState(prop, options.newCompositeMethod ? { fromComposite: true, name: `${channelID}${prop.property}` , channelID: stateId }: { fromComposite: true }))
+            stateData.keys.push(prop.property)
+        }
+    }
     if (options.newCompositeMethod) {
-
         if (typeof stname !== 'string') return undefined;;
-        states.push({
+        const KeysToUpdate = stateData.keys;
+        stateData.states.push({
             id: stateId,
             name: stateName,
             icon: undefined,
@@ -196,11 +213,17 @@ function generateCompositeStates(expose, _channelID, options)
             write: Boolean (expose.access & ea.SET),
             read: Boolean(expose.access & ea.GET),
             type: 'string',
+            subkeys : stateData.keys,
             getter: (value) => {
                 const myval = value[stateId];
                 if (myval != undefined && typeof myval === 'object') return JSON.stringify(myval);
                 return myval;
             },
+            compositeGetter: (value) => {
+                const myval = value[stateId];
+                if (typeof myval === 'object') return myval;
+                return undefined;
+            },
             setter: (value) => {
                 try {
                     return JSON.parse(value);
@@ -212,15 +235,8 @@ function generateCompositeStates(expose, _channelID, options)
         })
 
     }
-    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 }))
-    }
 
-    return states;
+    return stateData;
 
 }
 function createFromExposes(model, def, device, options, log) {
@@ -982,8 +998,11 @@ function createFromExposes(model, def, device, options, log) {
             case 'composite':
             {
                 const cStates = generateCompositeStates(expose, '', options);
-                for (const state of cStates)
-                    pushToStates(state, expose.access);
+                for (const state of cStates.states)
+                    if (options.newCompositeMethod)
+                        pushToStates(state, expose.access);
+                    else
+                        pushToStates(modifyState(state, { pairedkeys: cStates.keys } , false), expose.access);
                 break;
             }
             case 'list':

package/lib/statescontroller.js

@@ -1173,6 +1173,11 @@ class StatesController extends EventEmitter {
 
         let stateID = statedesc.id;
 
+        if (statedesc.compositeGetter) {
+            const compositePayload = statedesc.compositeGetter(payload);
+            if (compositePayload) await this.publishToState(devId, model, compositePayload, debugId);
+        }
+
         // checking value
         if (value === undefined || value === null) {
             const message = `value '${JSON.stringify(value)}' from device ${devId} via ${mode} for '${statedesc.name} (ID ${statedesc.id} ${statedesc.prop ? 'with property '+statedesc.prop : ''})`;
@@ -1253,7 +1258,7 @@ class StatesController extends EventEmitter {
             let has_published = false;
             if (devStates.states !== undefined) {
                 try {
-                    const states = devStates.states.filter(statedesc => payload.hasOwnProperty(statedesc.prop || statedesc.id)
+                    const states = devStates.states.filter(statedesc => payload.hasOwnProperty(statedesc.prop ? statedesc.prop: statedesc.id)
                     );
 
                     for (const stateInd in states) {

package/lib/zigbeecontroller.js

@@ -1465,6 +1465,17 @@ class ZigbeeController extends EventEmitter {
                             }
                         }
                         retry = 0;
+                        if (readKey.converter) {
+                            const tt = preparedOptions.transition || preparedOptions.transition_time;
+                            const did = deviceId;
+                            setTimeout(async () => {
+                                try {
+                                    await readKey.converter.convertGet(target, readKey.key, {device:entity.device}) }
+                                catch (error) {
+                                    this.warn(`error reading ${readKey.key} from ${deviceId} : ${error?.message}`);
+                                }
+                            }, tt ? tt * 1000 : 100);
+                        }
                     } catch (error) {
                         if (has_elevated_debug) {
                             const message = `caught error ${error?.message? error.message : 'no reason given'} when setting value for device ${deviceId}.`;
@@ -1483,10 +1494,6 @@ class ZigbeeController extends EventEmitter {
                     }
                 } 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "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.1",
-    "zigbee-herdsman-converters": "^25.99.0"
+    "zigbee-herdsman": "8.0.2",
+    "zigbee-herdsman-converters": "25.104.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {