iobroker.zigbee 1.8.22 → 1.8.24

package/README.md

@@ -134,6 +134,12 @@ You can thank the authors by these links:
 -----------------------------------------------------------------------------------------------------
 
 ## Changelog
+### 1.8.24 (2023-09-05)
+* (arteck) switch to exposes tab for some Aqara Devices
+
+### 1.8.23 (2023-08-10)
+* (arteck) query from xiaomi is now better
+
 ### 1.8.22 (2023-08-05)
 * (arteck) crash when meta is empty
 

package/admin/admin.js

@@ -31,7 +31,7 @@ const updateCardInterval = setInterval(updateCardTimer, 6000);
 
 const savedSettings = [
     'port', 'panID', 'channel', 'disableLed', 'countDown', 'groups', 'extPanID', 'precfgkey', 'transmitPower',
-    'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent',
+    'adapterType', 'debugHerdsman', 'disableBackup', 'disablePing', 'external', 'startWithInconsistent', 'warnOnDeviceAnnouncement'
 ];
 
 function getDeviceByID(ID) {
@@ -799,6 +799,9 @@ function load(settings, onChange) {
     if (settings.disablePing === undefined) {
         settings.disablePing = false;
     }
+    if (settings.warnOnDeviceAnnouncement === undefined) {
+        settings.warnOnDeviceAnnouncement = true;
+    }
 
     // example: select elements with id=key and class=value and insert value
     for (const key in settings) {

package/admin/index.html

@@ -109,6 +109,10 @@
                         <input id="disableQueue" type="checkbox" class="value" />
                         <label class="translate" for="disableQueue">Disable Queue</label>
                     </div>
+                    <div class="input-field col s2 m2 l2">
+                        <input id="warnOnDeviceAnnouncement" type="checkbox" class="value" />
+                        <label class="translate" for="warnOnDeviceAnnouncement">Log warning on Zigbee device announcement</label>
+                    </div>
                 </div>
             </div>
         </div>

package/admin/index_m.html

@@ -689,6 +689,10 @@
                     <input id="debugHerdsman" type="checkbox" class="value"/>
                     <label class="translate" for="debugHerdsman">Zigbee-herdsman debug info</label>
                 </div>
+                <div class="input-field col s12 m6 l4 col-warnOnDeviceAnnouncement">
+                    <input id="warnOnDeviceAnnouncement" type="checkbox" class="value"/>
+                    <label class="translate" for="warnOnDeviceAnnouncement">Log warning on Zigbee device announcement</label>
+                </div>
                 <div class="input-field col s12 m6 l4">
                     <a id="reset-btn" class="waves-effect waves-light white-text btn-large translate">Reset...</a>
                 </div>

package/admin/tab_m.html

@@ -605,6 +605,10 @@
                         <input id="disablePing" type="checkbox" class="value" />
                         <label class="translate" for="disablePing">Disable active availability check</label>
                     </div>
+                    <div class="input-field col s12 m6 l4 col-warnOnDeviceAnnouncement">
+                        <input id="warnOnDeviceAnnouncement" type="checkbox" class="value" />
+                        <label class="translate" for="warnOnDeviceAnnouncement">Log warning on Zigbee device announcement</label>
+                    </div>
                     <div class="input-field col s12 m6 l8 col-transmitPower">
                         <select id="transmitPower" class="value" >
                             <option value="" disabled selected class="translate">transmitPower</option>

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.8.22",
+    "version": "1.8.24",
     "news": {
+      "1.8.24": {
+        "en": "switch to exposes tab for some Aqara Devices",
+        "de": "schalter, um die Registerkarte für einige Aqara-Geräte freizusetzen",
+        "ru": "перейти на вкладку exposes для некоторых устройств Aqara",
+        "pt": "mudar para expor guia para alguns dispositivos Aqara",
+        "nl": "vertaling:",
+        "fr": "commutation pour exposer l'onglet pour certains appareils Aqara",
+        "it": "interruttore per esporre la scheda per alcuni dispositivi Aqara",
+        "es": "interruptor para exponer ficha para algunos dispositivos Aqara",
+        "pl": "zamienił tablicę dla niektórych Aqara Devices",
+        "uk": "перемикач для установки для деяких пристроїв Aqara",
+        "zh-cn": "对某些Aqara Devic的表格的转换"
+      },
+      "1.8.23": {
+        "en": "query from xiaomi is now better",
+        "de": "anfrage von xiaomi ist jetzt besser",
+        "ru": "запрос от xiaomi теперь лучше",
+        "pt": "consulta de xiaomi é agora melhor",
+        "nl": "quee van xiaomi is nu beter",
+        "fr": "la question de xiaomi est maintenant mieux",
+        "it": "query da xiaomi è ora meglio",
+        "es": "la consulta de xiaomi ahora es mejor",
+        "pl": "wykorzystywanie z xiaomi jest obecnie lepsze",
+        "uk": "запиту від xiaomi тепер краще",
+        "zh-cn": "来自米亚米的询问现在更好。"
+      },
       "1.8.22": {
         "en": "crash when meta is empty",
         "de": "crash, wenn meta leer ist",
@@ -67,32 +93,6 @@
         "pl": "wadliwość i błąd\n",
         "uk": "маленька фіксація відправлень і журнал помилок\n",
         "zh-cn": "很少发送过材料和错误逻辑\n"
-      },
-      "1.8.17": {
-        "en": "sentry corr",
-        "de": "versand",
-        "ru": "сендри корр",
-        "pt": "corante de sentinela",
-        "nl": "vertaling:",
-        "fr": "corr",
-        "it": "cor",
-        "es": "centry corr",
-        "pl": "kor",
-        "uk": "кофрів",
-        "zh-cn": "发信"
-      },
-      "1.8.16": {
-        "en": "battery corr",
-        "de": "batterie korrektor",
-        "ru": "аккумулятор корр",
-        "pt": "corante da bateria",
-        "nl": "batterij corr",
-        "fr": "batterie",
-        "it": "batteria corpo",
-        "es": "batería corrido",
-        "pl": "baterie",
-        "uk": "акумулятор",
-        "zh-cn": "电池组"
       }
     },
     "titleLang": {
@@ -188,8 +188,8 @@
         "condition": {
           "operand": "and",
           "rules": [
-            "oldVersion<=1.6.18",
-            "newVersion>=1.7.0"
+            "oldVersion<=1.8.22",
+            "newVersion>=1.8.24"
           ]
         },
         "title": {
@@ -205,16 +205,16 @@
           "zh-cn": "重要通知!"
         },
         "text": {
-          "en": "This new version cleans the file backup (under \\opt\\iobroker\\iobroker-data\\zigbee_0\\) of the adapter. Only the last 10 backups are kept.",
-          "de": "Diese neue Version bereinigt das Datei backup (unter \\opt\\iobroker\\iobroker-data\\zigbee_0\\) des Adapter. Es werden nur die letzten 10 Sicherungen behalten.",
-          "ru": "Эта новая версия очищает резервную копию файла (в папке \\opt\\iobroker\\iobroker-data\\zigbee_0\\) адаптера. Сохраняются только последние 10 резервных копий.",
-          "pt": "Esta nova versão limpa o backup do arquivo (em \\opt\\iobroker\\iobroker-data\\zigbee_0\\) do adaptador. Apenas os últimos 10 backups são mantidos.",
-          "nl": "Deze nieuwe versie maakt de bestandsback-up schoon (onder \\opt\\iobroker\\iobroker-data\\zigbee_0\\) van de adapter. Alleen de laatste 10 back-ups worden bewaard.",
-          "fr": "Cette nouvelle version nettoie le fichier de sauvegarde (sous \\opt\\iobroker\\iobroker-data\\zigbee_0\\) de l'adaptateur. Seules les 10 dernières sauvegardes sont conservées.",
-          "it": "Questa nuova versione pulisce il backup del file (in \\opt\\iobroker\\iobroker-data\\zigbee_0\\) dell'adattatore. Vengono mantenuti solo gli ultimi 10 backup.",
-          "es": "Esta nueva versión limpia la copia de seguridad del archivo (en \\opt\\iobroker\\iobroker-data\\zigbee_0\\) del adaptador. Solo se conservan las últimas 10 copias de seguridad.",
-          "pl": "Ta nowa wersja czyści kopię pliku (w \\opt\\iobroker\\iobroker-data\\zigbee_0\\) adaptera. Przechowywanych jest tylko 10 ostatnich kopii.",
-          "zh-cn": "这个新版本清理了适配器的文件备份（在 \\opt\\iobroker\\iobroker-data\\zigbee_0\\ 下）。仅保留最后 10 个备份。"
+          "en": "This new version use exposes for Aqara Button WXKG01LM. Plz select this device into exposes/Auschliessen tab",
+          "ru": "Эта новая версия использует экспозиции для Aqara Button WXKG01LM. Пожалуйста, выберите это устройство в exposes/Auschliessen tab",
+          "pt": "Esta nova versão usa expões para Aqara Button WXKG01LM. Por favor, selecione este dispositivo no separador exposes/Auschliessen",
+          "nl": "Deze nieuwe versie gebruikt blootstellingen voor Aqara Button WXK01LM. Kies alsjeblieft dit apparaat uit in de openbare aanklagers",
+          "fr": "Cette nouvelle version utilise pour Aqara Button WXKG01LM. Veuillez sélectionner cet appareil dans l'onglet Affichage/Auschliessen",
+          "it": "Questa nuova versione utilizza per Aqara Button WXKG01LM. Si prega di selezionare questo dispositivo per exposes/Auschliessen scheda",
+          "es": "Este nuevo uso expone para Aqara Button WXKG01LM. Por favor, seleccione este dispositivo en la pestaña exposes/Auschliessen",
+          "pl": "Nowa wersja została udostępniona dla zmian Aqary Button WXKG01LM. Prosze dodać to do exposes/Auschliessen tabsena",
+          "uk": "Ця нова версія використовується для кнопки Aqara Button WXKG01LM. Будь ласка, оберіть цей пристрій у вкладці ",
+          "zh-cn": "这一新版本用于Aqara Button WXKG01LM。 请选择这一装置暴露/Auschliessen tab"
         },
         "link": "https://github.com/ioBroker/ioBroker.zigbee/blob/master/README.md",
         "level": "warn",
@@ -250,7 +250,8 @@
     "disablePing": false,
     "disableBackup": false,
     "external": "",
-    "startWithInconsistent": false
+    "startWithInconsistent": false,
+    "warnOnDeviceAnnouncement": true
   },
   "instanceObjects": [
     {

package/lib/backup.js

@@ -93,14 +93,14 @@ class Backup {
         if (fs.existsSync(dir)) {
             const directoryContent = fs.readdirSync(dir);
 
-            let files = directoryContent.filter((filename) => {
+            const files = directoryContent.filter((filename) => {
                 if (filename.indexOf('gz') > 0) {
                     return fs.statSync(`${dir}/${filename}`).isFile();
                 }
             });
 
-            let sorted = files.sort((a, b) => {
-                let aStat = fs.statSync(`${dir}/${a}`),
+            files.sort((a, b) => {
+                const aStat = fs.statSync(`${dir}/${a}`),
                     bStat = fs.statSync(`${dir}/${b}`);
 
                 return new Date(bStat.birthtime).getTime() - new Date(aStat.birthtime).getTime();

package/lib/commands.js

@@ -116,31 +116,31 @@ class Commands {
         if (this.zbController) {
             let devId = '';
             if (message) {
-              if (message.id) devId = getZbId(message.id);
-              if (message.code) {
-                try {
-                  this.debug(`letsPairing called with code ${message.code}`);
-                  const success = await this.zbController.addPairingCode(message.code)
-                  if (!success) {
-                    this.adapter.sendTo(
-                        from, command,
-                        {error: 'Pairing code rejected by Coordinator!'},
-                        callback
-                    );
-                    return;
-                  };
-                }
-                catch (e) {
-                  this.error(JSON.stringify(e))
-                  this.adapter.sendTo(
-                      from, command,
-                      {error: 'Exception when trying to add QR code'},
-                      callback
-                  );
-                  return;
+                if (message.id) devId = getZbId(message.id);
+                if (message.code) {
+                    try {
+                        this.debug(`letsPairing called with code ${message.code}`);
+                        const success = await this.zbController.addPairingCode(message.code);
+                        if (!success) {
+                            this.adapter.sendTo(
+                                from, command,
+                                {error: 'Pairing code rejected by Coordinator!'},
+                                callback
+                            );
+                            return;
+                        }
+                    }
+                    catch (e) {
+                        this.error(JSON.stringify(e));
+                        this.adapter.sendTo(
+                            from, command,
+                            {error: 'Exception when trying to add QR code'},
+                            callback
+                        );
+                        return;
 
+                    }
                 }
-              }
             }
             // allow devices to join the network within 60 secs
             this.adapter.logToPairing('Pairing started ' + devId, true);
@@ -307,7 +307,7 @@ class Commands {
                             }
                         }
                         devInfo.paired = !!devInfo.info;
-//                        devInfo.groups = groups[devInfo._id];
+                        //                        devInfo.groups = groups[devInfo._id];
                         devices.push(devInfo);
                     }
                     return devices;

package/lib/devices.js

@@ -3092,7 +3092,7 @@ const groupStates = [states.brightness_step].concat(lightStatesWithColor);
 function getByModel() {
     const byModel = new Map();
     for (const device of devices) {
-        for (const model of device.models) {        
+        for (const model of device.models) {
             const stripModel = model.replace(/\0.*$/g, '').trim();
             byModel.set(stripModel, device);
         }

package/lib/exposes.js

@@ -873,7 +873,7 @@ function applyExposes(mappedDevices, byModel, allExcludesObj) {
     // create or update device from exposes
     for (const deviceDef of zigbeeHerdsmanConverters.definitions) {
         applyDeviceDef(mappedDevices, byModel, allExcludesStr, deviceDef);
-        
+
         if (deviceDef.hasOwnProperty('whiteLabel')) {
             for (const deviceWhiteLabel of deviceDef.whiteLabel) {
                 applyDeviceDef(mappedDevices, byModel, allExcludesStr, {
@@ -881,7 +881,7 @@ function applyExposes(mappedDevices, byModel, allExcludesObj) {
                     model: deviceWhiteLabel.model,
                     vendor: deviceWhiteLabel.vendor,
                     description: deviceWhiteLabel.description || deviceDef.description,
-                });       
+                });
             }
         }
     }

package/lib/groups.js

@@ -123,7 +123,7 @@ class Groups {
         try {
             const groups = message && message.groups ? message.groups : {};
             const devId = message && message.id ? message.id : undefined;
-            this.warn('updateGroupMembership called with ' + JSON.stringify(devId))
+            this.warn('updateGroupMembership called with ' + JSON.stringify(devId));
             if (devId === undefined) {
                 this.adapter.sendTo(from, command, {error: 'No device specified'}, callback);
             }
@@ -138,7 +138,7 @@ class Groups {
                 for (const gpid of groups[epid]) {
                     const gpidn = parseInt(gpid);
                     if (gpidn < 0) {
-                        this.warn(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` )
+                        this.warn(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
                         const response = await this.zbController.removeDevFromGroup(sysid, (-gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -146,7 +146,7 @@ class Groups {
                         }
 
                     } else if (gpidn > 0) {
-                        this.warn(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` )
+                        this.warn(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
                         const response = await this.zbController.addDevToGroup(sysid, (gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -158,7 +158,7 @@ class Groups {
                 }
             }
         } catch (e) {
-            this.warn('caught error ' + JSON.stringify(e) + ' in updateGroupMembership')
+            this.warn('caught error ' + JSON.stringify(e) + ' in updateGroupMembership');
             this.adapter.sendTo(from, command, {error: e}, callback);
             return;
         }

package/lib/states.js

@@ -5828,10 +5828,10 @@ const states = {
         },
         getter: (payload) => {
             if (payload && payload.effect && payload.effect.hasOwnProperty('effect')) return payload.effect.effect;
-            return "steady";
+            return 'steady';
         }
 
-     },
+    },
     effect_json: {
         id: 'effect_json',
         name: 'Effect',
@@ -5958,10 +5958,10 @@ const states = {
         getter: (payload) => {
             if (payload.color) {
                 const c = payload.color;
-                if (c.hasOwnProperty("h") && c.hasOwnProperty("s") && c.hasOwnProperty("b"))
-                  return rgb.hsvToRGBString(c.h, c.s, c.b * 100 / 255);
-                if (c.hasOwnProperty("h") && c.hasOwnProperty("s") && c.hasOwnProperty("v"))
-                  return rgb.hsvToRGBString(c.h, c.s, c.v * 100);
+                if (c.hasOwnProperty('h') && c.hasOwnProperty('s') && c.hasOwnProperty('b'))
+                    return rgb.hsvToRGBString(c.h, c.s, c.b * 100 / 255);
+                if (c.hasOwnProperty('h') && c.hasOwnProperty('s') && c.hasOwnProperty('v'))
+                    return rgb.hsvToRGBString(c.h, c.s, c.v * 100);
             }
         },
         setterOpt: (value, options) => {

package/lib/statescontroller.js

@@ -142,9 +142,9 @@ class StatesController extends EventEmitter {
             callback(result);
             return;
         }
-        
-        const states = devStates.states.filter(statedesc => statedesc.isOption || statedesc.inOptions);        
-        if (states == null || states == undefined) {       
+
+        const states = devStates.states.filter(statedesc => statedesc.isOption || statedesc.inOptions);
+        if (states == null || states == undefined) {
             callback(result);
             return;
         }

package/lib/utils.js

@@ -138,10 +138,10 @@ function getModelRegEx( model) {
 }
 
 function getEntityInfo(entity) {
-  if (entity) {
-      return `Type: ${entity.type} Name: ${entity.name}`;
-  }
-  return `getEntityInfo: Illegal Entity ${JSON.stringify(entity)}`;
+    if (entity) {
+        return `Type: ${entity.type} Name: ${entity.name}`;
+    }
+    return `getEntityInfo: Illegal Entity ${JSON.stringify(entity)}`;
 }
 
 exports.secondsToMilliseconds   = seconds => seconds * 1000;

package/lib/zbDeviceConfigure.js

@@ -109,7 +109,9 @@ class DeviceConfigure extends BaseExtension {
                 this.attempts[device.ieeeAddr] = 0;
             }
             try {
-                await this.doConfigure(device, mappedDevice);
+                if (mappedDevice && device) {
+                    await this.doConfigure(device, mappedDevice);
+                }
             } catch (error) {
                 this.sendError(error);
                 this.warn(

package/lib/zigbeecontroller.js

@@ -83,6 +83,7 @@ class ZigbeeController extends EventEmitter {
             this.transmitPower = options.transmitPower;
         }
         this.disableLed = options.disableLed;
+        this.warnOnDeviceAnnouncement = options.warnOnDeviceAnnouncement;
 
         this.debug(`Using zigbee-herdsman with settings: ${JSON.stringify(herdsmanSettings)}`);
         this.herdsman = new ZigbeeHerdsman.Controller(herdsmanSettings, this.adapter.log);
@@ -319,7 +320,7 @@ class ZigbeeController extends EventEmitter {
             this.info(`added code ${code} for pairing`);
             return true;
         }
-      return false;
+        return false;
     }
 
     async getGroupMembersFromController(id) {
@@ -579,7 +580,11 @@ class ZigbeeController extends EventEmitter {
         this.debug('handleDeviceAnnounce', message);
         const entity = await this.resolveEntity(message.device || message.ieeeAddr);
         const friendlyName = entity.name;
-        this.warn(`Device '${friendlyName}' announced itself`);
+        if (this.warnOnDeviceAnnouncement) {
+            this.warn(`Device '${friendlyName}' announced itself`);
+        } else {
+            this.info(`Device '${friendlyName}' announced itself`);
+        }
 
         try {
             if (entity && entity.mapped) {
@@ -784,7 +789,7 @@ class ZigbeeController extends EventEmitter {
                     for (k in this) {
                         yield k;
                     }
-                }
+                };
             }
             let result;
             if (cmd === 'configReport') {
@@ -812,20 +817,20 @@ class ZigbeeController extends EventEmitter {
             this.debug(`addDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
             // generate group debug info and display it
             const members = await this.getGroupMembersFromController(groupId);
-            let memberIDs = []
-            for (let member of members) {
-              memberIDs.push(member.ieee);
+            let memberIDs = [];
+            for (const member of members) {
+                memberIDs.push(member.ieee);
             }
             this.debug(`addDevToGroup ${groupId} with ${memberIDs.length} members ${safeJsonStringify(memberIDs)}`);
             if (epid != undefined) {
                 for (const ep of entity.endpoints) {
                     this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`);
                     if (ep.ID == epid) {
-                      if (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)) {
-                        this.debug(`adding endpoint ${ep.ID} (${epid}) to group ${groupId}`);
-                        await (ep.addToGroup(group.mapped));
-                      }
-                      else this.error(`cluster genGroups not supported for endpoint ${epid} of ${devId}`);
+                        if (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)) {
+                            this.debug(`adding endpoint ${ep.ID} (${epid}) to group ${groupId}`);
+                            await (ep.addToGroup(group.mapped));
+                        }
+                        else this.error(`cluster genGroups not supported for endpoint ${epid} of ${devId}`);
                     }
                 }
             } else {
@@ -862,9 +867,9 @@ class ZigbeeController extends EventEmitter {
             const group = await this.resolveEntity(groupId);
 
             const members = await this.getGroupMembersFromController(groupId);
-            let memberIDs = []
-            for (let member of members) {
-                memberIDs.push(member.ieee)
+            let memberIDs = [];
+            for (const member of members) {
+                memberIDs.push(member.ieee);
             }
 
             this.debug(`removeDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
@@ -872,15 +877,15 @@ class ZigbeeController extends EventEmitter {
 
             if (epid != undefined) {
                 for (const ep of entity.endpoints) {
-                  this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`)
+                    this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`);
                     if (ep.ID == epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))) {
                         await ep.removeFromGroup(group.mapped);
                         this.info(`removing endpoint ${ep.ID} of ${devId} from group ${groupId}`);
                     }
                 }
             } else {
-              await entity.endpoint.removeFromGroup(group.mapped);
-              this.info(`removing endpoint ${entity.endpoint.ID} of ${devId} from group ${groupId}`);
+                await entity.endpoint.removeFromGroup(group.mapped);
+                this.info(`removing endpoint ${entity.endpoint.ID} of ${devId} from group ${groupId}`);
             }
         } catch (error) {
             this.sendError(error);

package/main.js

@@ -124,7 +124,7 @@ class Zigbee extends utils.Adapter {
                                     message
                                 }));
                         }
-    
+
                         if (typeof error == 'string') {
                             Sentry.captureException(new Error(error));
                         } else {
@@ -134,7 +134,7 @@ class Zigbee extends utils.Adapter {
                 }
             }
         } catch (err) {
-            this.log.error(`SentryError : ${message} ${error} ${err} `);        
+            this.log.error(`SentryError : ${message} ${error} ${err} `);
         }
     }
 
@@ -278,7 +278,7 @@ class Zigbee extends utils.Adapter {
             delete toAdd['homeassistant'];
             try {
                 zigbeeHerdsmanConverters.addDeviceDefinition(toAdd);
-            } catch { 
+            } catch {
                 this.log.error(`unable to apply external converter ${JSON.stringfy(toAdd)}`);
             }
         }
@@ -465,50 +465,57 @@ class Zigbee extends utils.Adapter {
         // this assigment give possibility to use iobroker logger in code of the converters, via meta.logger
         meta.logger = this.log;
 
-        await this.checkIfModelUpdate(entity);        
-
-        let voltage = 0;
-        let battKey = false;
-        
-        if (mappedModel !== null && mappedModel !== undefined) {
-            if (mappedModel.meta !== undefined && mappedModel.meta !== null) {
-                if (mappedModel.meta.battery !== undefined) {
-                    const isVoltage = entity.mapped.meta.battery.hasOwnProperty('voltageToPercentage');
-            
-                    if (isVoltage) {
-                        const keys = Object.keys(message.data);
-            
-                        for (const key of keys) {
-                            const value = message.data[key];
-                            
-                            this.log.debug(`--> BatteryValue ${safeJsonStringify(value)} from battery search`);
-                            
-                            if (value != undefined && value[1] != undefined) {
-                                if (key == 65282 && value[1][1] != undefined) {
-                                    voltage = value[1][1].elmVal;
-                                    battKey = true;
-                                    break;
-                                }
-                                if (key == 65281) {
-                                    voltage = value[1];
-                                    battKey = true;
-                                    break;
-                                }      
-                            }
+        await this.checkIfModelUpdate(entity);
+
+        let _voltage = 0;
+        let _temperature = 0;
+        let _humidity = 0;
+
+        let isMessure = false;
+        let isBattKey = false;
+
+        if (mappedModel && mappedModel.meta && mappedModel.meta.battery) {
+            const isVoltage = mappedModel.meta.battery.hasOwnProperty('voltageToPercentage');
+
+            if (isVoltage) {
+                const keys = Object.keys(message.data);
+
+                for (const key of keys) {
+                    const value = message.data[key];
+
+                    if (value && value[1]) {
+                        if (key == 65282 && value[1][1]) {
+                            _voltage = value[1][1].elmVal;
+                            isBattKey = true;
+                            break;
+                        }
+                        if (key == 65281) {
+                            _voltage = value[1];
+                            isBattKey = true;
+                            _temperature = value[100];
+                            _temperature = _temperature /100;
+                            _humidity = value[101];
+                            _humidity = _humidity / 100;
+                            isMessure = true;
+                            break;
                         }
                     }
                 }
             }
         }
-        
+
         // always publish link_quality and battery
         if (message.linkquality) { // send battery with
             this.publishToState(devId, model, {linkquality: message.linkquality});
-            if (battKey) {
-                this.publishToState(devId, model, {voltage: voltage});
-                const  battProz = zigbeeHerdsmanConvertersUtils.batteryVoltageToPercentage(voltage,entity.mapped.meta.battery.voltageToPercentage);
+            if (isBattKey) {
+                this.publishToState(devId, model, {voltage: _voltage});
+                const  battProz = zigbeeHerdsmanConvertersUtils.batteryVoltageToPercentage(_voltage,entity.mapped.meta.battery.voltageToPercentage);
                 this.publishToState(devId, model, {battery: battProz});
             }
+            if (isMessure) {
+                this.publishToState(devId, model, {temperature: _temperature});
+                this.publishToState(devId, model, {humidity: _humidity});
+            }
         }
 
         // publish raw event to "from_zigbee"
@@ -540,31 +547,43 @@ class Zigbee extends utils.Adapter {
             return;
         }
 
-        let payload = {};
-
-        const publish = (_payload) => {
-            if (_payload) {
-                this.publishToState(devId, model, _payload);
-            }
-        };
+        this.processConverters(converters, devId, model, mappedModel, message, meta)
+        //            .then(() => {
+        //
+        //    })
+            .catch((error) => {
+                this.log.error(`Error while processing converters: '${error}'`);
+            });
+    }
 
+    async processConverters(converters, devId, model, mappedModel, message, meta) {
         for (const converter of converters) {
-            this.stController.collectOptions(devId, model, (options) => {
-                try {
-                    payload = converter.convert(mappedModel, message, publish, options, meta);
-    
-                    if (payload) {
-                        if (Object.keys(payload).length) {
-                            publish(payload);
-                        }
-                    }
-                } catch (err) {
-                    this.log.warn(`convert problem with '${model}' '${devId}' `);
+            const publish = (payload) => {
+                this.log.debug(`Publish ${safeJsonStringify(payload)} to ${safeJsonStringify(devId)}`);
+                if (payload) {
+                    this.publishToState(devId, model, payload);
                 }
+            };
+
+            const options = await new Promise((resolve, reject) => {
+                this.stController.collectOptions(devId, model, (options) => {
+                    resolve(options);
+                });
             });
+
+            const payload = await new Promise((resolve, reject) => {
+                const payload = converter.convert(mappedModel, message, publish, options, meta);
+                if (payload) {
+                    resolve(payload);
+                }
+            });
+
+            publish(payload);
         }
     }
 
+
+
     publishToState(devId, model, payload) {
         this.stController.publishToState(devId, model, payload);
     }
@@ -595,20 +614,20 @@ class Zigbee extends utils.Adapter {
         }
         try {
             const entity = await this.zbController.resolveEntity(deviceId);
-            
+
             this.log.debug(`entity: ${deviceId} ${model} ${safeJsonStringify(entity)}`);
-            
-            const mappedModel = entity.mapped;       
-                  
+
+            const mappedModel = entity.mapped;
+
             if (!mappedModel) {
                 this.log.debug(`No mapped model for ${model}`);
                 return;
             }
-    
+
             stateList.forEach(async changedState => {
                 const stateDesc = changedState.stateDesc;
                 const value = changedState.value;
-    
+
                 if (stateDesc.id === 'send_payload') {
                     try {
                         const json_value = JSON.parse(value);
@@ -623,14 +642,14 @@ class Zigbee extends utils.Adapter {
                     }
                     return;
                 }
-    
+
                 if (stateDesc.isOption) {
                     // acknowledge state with given value
                     this.acknowledgeState(deviceId, model, stateDesc, value);
                     // process sync state list
                     //this.processSyncStatesList(deviceId, modelId, syncStateList);
                     // if this is the device query state => trigger the device query
-    
+
                     // on activation of the 'device_query' state trigger hardware query where possible
                     if (stateDesc.id === 'device_query') {
                         if (this.query_device_block.indexOf(deviceId) > -1) {
@@ -647,7 +666,7 @@ class Zigbee extends utils.Adapter {
                                             await converter.convertGet(entity.device.endpoints[0], ckey, {});
                                         } catch (error) {
                                             this.log.warn(`Failed to read state '${JSON.stringify(ckey)}'of '${entity.device.ieeeAddr}' after query with '${JSON.stringify(error)}'`);
-    
+
                                         }
                                     }
                                 }
@@ -671,7 +690,7 @@ class Zigbee extends utils.Adapter {
                     this.sendError(`No converter available for '${model}' with key '${stateDesc.id}' `);
                     return;
                 }
-    
+
                 const preparedValue = (stateDesc.setter) ? stateDesc.setter(value, options) : value;
                 const preparedOptions = (stateDesc.setterOpt) ? stateDesc.setterOpt(value, options) : {};
                 let syncStateList = [];
@@ -683,11 +702,11 @@ class Zigbee extends utils.Adapter {
                         }
                     });
                 }
-    
+
                 const epName = stateDesc.epname !== undefined ? stateDesc.epname : (stateDesc.prop || stateDesc.id);
                 const key = stateDesc.setattr || stateDesc.prop || stateDesc.id;
                 this.log.debug(`convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)}`);
-    
+
                 let target;
                 if (model === 'group') {
                     target = entity.mapped;
@@ -695,9 +714,9 @@ class Zigbee extends utils.Adapter {
                     target = await this.zbController.resolveEntity(deviceId, epName);
                     target = target.endpoint;
                 }
-    
+
                 this.log.debug(`target: ${safeJsonStringify(target)}`);
-    
+
                 const meta = {
                     endpoint_name: epName,
                     options: preparedOptions,
@@ -707,11 +726,11 @@ class Zigbee extends utils.Adapter {
                     logger: this.log,
                     state: {},
                 };
-                
+
                 if (preparedOptions.hasOwnProperty('state')) {
                     meta.state = preparedOptions.state;
                 }
-                
+
                 try {
                     const result = await converter.convertSet(target, key, preparedValue, meta);
                     this.log.debug(`convert result ${safeJsonStringify(result)}`);
@@ -721,20 +740,20 @@ class Zigbee extends utils.Adapter {
                         }
                         // process sync state list
                         this.processSyncStatesList(deviceId, model, syncStateList);
-    
+
                         if (isGroup) {
                             await this.callPluginMethod('queryGroupMemberState', [deviceId, stateDesc]);
                             this.acknowledgeState(deviceId, model, stateDesc, value);
                         }
                     }
-                    
+
                 } catch (error) {
                     this.filterError(`Error ${error.code} on send command to ${deviceId}.` +
                         ` Error: ${error.stack}`, `Send command to ${deviceId} failed with`, error);
                 }
             });
         } catch (err) {
-            this.log.error(`No entity for ${deviceId}`);    
+            this.log.error(`No entity for ${deviceId}`);
         }
     }
 
@@ -950,7 +969,7 @@ class Zigbee extends utils.Adapter {
     }
 
     onPairing(message, data) {
-        if (Number.isInteger(data)) {           
+        if (Number.isInteger(data)) {
             this.setState('info.pairingCountdown', data, true);
         }
         if (data === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.8.22",
+  "version": "1.8.24",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -15,7 +15,7 @@
     }
   ],
   "engines": {
-    "node": ">=10"
+    "node": ">=16"
   },
   "optionalDependencies": {
     "serialport": "^11.0.1"
@@ -23,9 +23,9 @@
   "dependencies": {
     "@iobroker/adapter-core": "^3.0.3",
     "tar": "^6.1.15",
-    "typescript": "^5.1.6",
-    "zigbee-herdsman": "0.17.2",
-    "zigbee-herdsman-converters": "15.54.0"
+    "typescript": "^5.2.2",
+    "zigbee-herdsman": "0.18.7",
+    "zigbee-herdsman-converters": "15.70.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -34,11 +34,11 @@
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
     "@iobroker/testing": "^4.1.0",
-    "axios": "^1.3.4",
-    "chai": "^4.3.7",
+    "axios": "^1.5.0",
+    "chai": "^4.3.8",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.46.0",
-    "eslint-config-prettier": "^8.9.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",

package/support/docgen.js

@@ -1,6 +1,6 @@
 /**
  * This script generates the supported devices page.
- * 
+ *
  */
 
 let devices = [...require('zigbee-herdsman-converters').devices];
@@ -86,7 +86,7 @@ vendors.sort();
 text += '|  Model | Description | Picture |\n';
 text += '| ------------- | ------------- | -------------------------- |\n';
 vendors.forEach((vendor) => {
-    text += `|  | **${vendor}**  |   |\n`;   
+    text += `|  | **${vendor}**  |   |\n`;
     text += logDevices([...iobDevices.keys()].map((m) => devices.get(m)).filter((d) => d && d.vendor === vendor).map((d) => d.model));
 });