iobroker.zigbee 1.9.5 → 1.9.7

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2023 Kirov Ilya <kirovilya@gmail.com>
+Copyright (c) 2018-2024 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

@@ -134,6 +134,13 @@ You can thank the authors by these links:
 -----------------------------------------------------------------------------------------------------
 
 ## Changelog
+### 1.9.7 (2024-01-05)
+* (arteck) corr configure for some devices
+
+### 1.9.6 (2024-01-01)
+* (arteck) corr ikea bug 
+* (crckmc) trv child lock works
+
 ### 1.9.5 (2023-12-29)
 * (arteck) update dependency
 * (arteck) min node 18.x.
@@ -540,7 +547,7 @@ new Zigbee-herdsman features:
 ## License
 The MIT License (MIT)
 
-Copyright (c) 2018-2023 Kirov Ilya <kirovilya@gmail.com>
+Copyright (c) 2018-2024 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/admin/tab_m.html

@@ -474,7 +474,7 @@
                             <li>
                                 <div class="col main-toolbar-table-types-tools main-toolbar-table-filter input-field" style="line-height: 24px;">
                                     <i class="material-icons prefix" style="line-height: 24px;">search</i>
-                                    <input id="device-search" class="filter-input translateP" placeholder="Искать" autocomplete="new-password" readonly="readonly" onfocus="if (this.hasAttribute('readonly')) {this.removeAttribute('readonly'); this.blur(); this.focus();}" data-lang-placeholder="Filter">
+                                    <input id="device-search" class="filter-input translateP" placeholder="Искать" readonly="readonly" onfocus="if (this.hasAttribute('readonly')) {this.removeAttribute('readonly'); this.blur(); this.focus();}" data-lang-placeholder="Filter">
                                     <a class="filter-clear btn-floating btn-very-small translateT red lighten-3" title="Очистить" data-lang-title="clear" style="display: none;"><i class="material-icons">clear</i></a>
                                 </div>
 

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.9.5",
+    "version": "1.9.7",
     "news": {
+      "1.9.7": {
+        "en": "corr configure for some devices",
+        "de": "corr konfigurieren für einige geräte",
+        "ru": "для некоторых устройств",
+        "pt": "corr configurar para alguns dispositivos",
+        "nl": "corr instellen voor sommige apparaten",
+        "fr": "corr configure pour certains appareils",
+        "it": "corr configurare per alcuni dispositivi",
+        "es": "configuración de corr para algunos dispositivos",
+        "pl": "configure corr dla niektórych urządzeń",
+        "uk": "налаштовувати корр для деяких пристроїв",
+        "zh-cn": "一些设备的corr配置"
+      },
+      "1.9.6": {
+        "en": "corr ikea bug \ntrv child lock works",
+        "de": "corr ikea bug\nkinderschlösser funktioniert",
+        "ru": "корр ikea баг\ntrv детские замки работает",
+        "pt": "corr ikea bug\ntrabalhos de bloqueio de crianças",
+        "nl": "_\nhet kinderslot werkt",
+        "fr": "corr ikea bug\nverrouillage enfant trv fonctionne",
+        "it": "corr ikea bug\ntrv bambino serratura lavori",
+        "es": "corr ikea bug\ntrv niño cerradura funciona",
+        "pl": "kor ikea bug\npracuje w trv childlock",
+        "uk": "ikea помилка\ntrv дитячих замків",
+        "zh-cn": "绑架\n童 工"
+      },
       "1.9.5": {
         "en": "update dependency\nmin node 18.x.",
         "de": "aktualisierung abhängigkeit\nmin node 18.x.",
@@ -67,32 +93,6 @@
         "pl": "kor Type Error: Cannot przeczytał właściwości nieokreślone (czytać stan)",
         "uk": "тип кореня Помилка: Не можна прочитати властивості невизнаного (прочитаного стану)",
         "zh-cn": "类型 Error: Cannot宣读了未界定的(国名)财产"
-      },
-      "1.9.0": {
-        "en": "up to new zhc\nupdate dependency",
-        "de": "bis zum neuen zhc\naktualisierung abhängigkeit",
-        "ru": "до нового жк\nобновление зависимости",
-        "pt": "até novo zhc\ndependência de atualização",
-        "nl": "♪\nvertaling:",
-        "fr": "jusqu'au nouveau zhc\nmettre à jour la dépendance",
-        "it": "fino a nuovo zhc\ndipendenza da aggiornamento",
-        "es": "hasta nuevo zhc\nactualización de la dependencia",
-        "pl": "do nowego żc\nzależności",
-        "uk": "до нового жк\nоновлення залежності",
-        "zh-cn": "新的忠诚\n更新"
-      },
-      "1.8.27": {
-        "en": "update dependency",
-        "de": "aktualisierung abhängigkeit",
-        "ru": "обновление зависимости",
-        "pt": "dependência de atualização",
-        "nl": "vertaling:",
-        "fr": "mettre à jour la dépendance",
-        "it": "dipendenza da aggiornamento",
-        "es": "actualización de la dependencia",
-        "pl": "zależności",
-        "uk": "оновлення залежності",
-        "zh-cn": "更新"
       }
     },
     "titleLang": {

package/lib/statescontroller.js

@@ -624,61 +624,68 @@ class StatesController extends EventEmitter {
         }
         // find states for payload
         if (devStates.states !== undefined) {
-            const states = statesMapping.commonStates.concat(
-                devStates.states.filter(statedesc => payload.hasOwnProperty(statedesc.prop || statedesc.id)));
-
-            for (const stateInd in states) {
-                const statedesc = states[stateInd];
-                let value;
-                if (statedesc.getter) {
-                    value = statedesc.getter(payload);
-                } else {
-                    value = payload[statedesc.prop || statedesc.id];
-                }
-                // checking value
-                if (value === undefined || value === null) {
-                    continue;
-                }
-                let stateID = statedesc.id;
+            try {
+                const states = statesMapping.commonStates.concat(
+                    devStates.states.filter(statedesc => payload.hasOwnProperty(statedesc.prop || statedesc.id))
+                );
+
+                for (const stateInd in states) {
+                    const statedesc = states[stateInd];
+                    let value;
+                    if (statedesc.getter) {
+                        value = statedesc.getter(payload);
+                    } else {
+                        value = payload[statedesc.prop || statedesc.id];
+                    }
+                    // checking value
+                    if (value === undefined || value === null) {
+                        continue;
+                    }
 
-                if (has_debug && statedesc.id !== 'msg_from_zigbee') {
-                    this.warn(`ELEVATED publishToState: value generated '${JSON.stringify(value)}' from device ${devId} for '${statedesc.name}'`);
-                }
+                    let stateID = statedesc.id;
 
-                const common = {
-                    name: statedesc.name,
-                    type: statedesc.type,
-                    unit: statedesc.unit,
-                    read: statedesc.read,
-                    write: statedesc.write,
-                    icon: statedesc.icon,
-                    role: statedesc.role,
-                    min: statedesc.min,
-                    max: statedesc.max,
-                };
-
-                if (typeof value === 'object' && value.hasOwnProperty('stateid')) {
-                    stateID = `${stateID}.${value.stateid}`;
-                    if (value.hasOwnProperty('unit')) {
-                        common.unit = value.unit;
+                    if (has_debug && statedesc.id !== 'msg_from_zigbee') {
+                        this.warn(`ELEVATED publishToState: value generated '${JSON.stringify(value)}' from device ${devId} for '${statedesc.name}'`);
                     }
-                    common.name = value.name ? value.name : value.stateid;
-                    common.role = value.role ? `value.${value.role}` : 'number';
-                    value = value.value;
-                }
 
-                // if needs to return value to back after timeout
-                if (statedesc.isEvent) {
-                    this.updateStateWithTimeout(devId, statedesc.id, value, common, 300, !value);
-                } else {
-                    if (statedesc.prepublish) {
-                        this.collectOptions(devId, model, options =>
-                            statedesc.prepublish(devId, value, newvalue =>
-                                this.updateState(devId, stateID, newvalue, common), options));
+                    const common = {
+                        name: statedesc.name,
+                        type: statedesc.type,
+                        unit: statedesc.unit,
+                        read: statedesc.read,
+                        write: statedesc.write,
+                        icon: statedesc.icon,
+                        role: statedesc.role,
+                        min: statedesc.min,
+                        max: statedesc.max,
+                    };
+
+                    if (typeof value === 'object' && value.hasOwnProperty('stateid')) {
+                        stateID = `${stateID}.${value.stateid}`;
+                        if (value.hasOwnProperty('unit')) {
+                            common.unit = value.unit;
+                        }
+                        common.name = value.name ? value.name : value.stateid;
+                        common.role = value.role ? `value.${value.role}` : 'number';
+                        value = value.value;
+                    }
+
+                    // if needs to return value to back after timeout
+                    if (statedesc.isEvent) {
+                        this.updateStateWithTimeout(devId, statedesc.id, value, common, 300, !value);
                     } else {
-                        this.updateState(devId, stateID, value, common);
+                        if (statedesc.prepublish) {
+                            this.collectOptions(devId, model, options =>
+                                statedesc.prepublish(devId, value, newvalue =>
+                                    this.updateState(devId, stateID, newvalue, common), options)
+                            );
+                        } else {
+                            this.updateState(devId, stateID, value, common);
+                        }
                     }
                 }
+            } catch (e) {
+                this.debug(`No states in device ${devId} : payload ${JSON.stringify(payload)}`);
             }
         }
     }

package/lib/zbDeviceConfigure.js

@@ -112,13 +112,10 @@ class DeviceConfigure extends BaseExtension {
 
                 try {
                     await this.doConfigure(device, mappedDevice);
-                    this.configuring.delete(device.ieeeAddr);
+                    //       this.configuring.delete(device.ieeeAddr);
                 } catch (error) {
                     this.sendError(error);
-                    this.warn(
-                        `DeviceConfigure failed ${device.ieeeAddr} ${device.modelID}, ` +
-                        `attempt ${this.attempts[device.ieeeAddr] + 1} (${error.stack})`,
-                    );
+                    this.warn(`DeviceConfigure failed ${device.ieeeAddr} ${device.modelID} attempt ${this.attempts[device.ieeeAddr] + 1} (${error.stack})`);
                     this.attempts[device.ieeeAddr]++;
                 }
             }
@@ -132,15 +129,20 @@ class DeviceConfigure extends BaseExtension {
         const coordinatorEndpoint = await this.zigbee.getDevicesByType('Coordinator')[0].endpoints[0];
         try {
             if (mappedDevice) {
-                this.info(`Configuring ${device.ieeeAddr} ${device.modelID}`);
+                this.info(`-> Configuring ${device.ieeeAddr} ${device.modelID}`);
                 await mappedDevice.configure(device, coordinatorEndpoint, this);
                 device.meta.configured = zigbeeHerdsmanConverters.getConfigureKey(mappedDevice);
                 device.save();
                 this.info(`DeviceConfigure successful ${device.ieeeAddr} ${device.modelID}`);
             }
         } catch (error) {
-            this.sendError(error);
-            this.error(`Failed to DeviceConfigure.configure ${device.ieeeAddr} ${device.modelID} (${error.stack})`);
+            // https://github.com/Koenkk/zigbee2mqtt/issues/14857
+            if (error.stack.includes('UNSUPPORTED_ATTRIBUTE')) {
+                // do nothing
+            } else {
+                this.sendError(error);
+                this.error(`Failed to DeviceConfigure.configure ${device.ieeeAddr} ${device.modelID} (${error.stack})`);
+            }
         }
     }
 }

package/lib/zbDeviceEvent.js

@@ -40,7 +40,7 @@ class DeviceEvent extends BaseExtension {
         }
 
         if (mappedDevice && mappedDevice.onEvent) {
-            mappedDevice.onEvent(type, data, device);
+            mappedDevice.onEvent(type, data, device,mappedDevice.options,'{}');
         }
     }
 }

package/main.js

@@ -555,7 +555,10 @@ class Zigbee extends utils.Adapter {
 
         this.processConverters(converters, devId, model, mappedModel, message, meta)
             .catch((error) => {
-                this.log.error(`Error while processing converters DEVICE_ID: '${devId}' `);
+                //   'Error: Expected one of: 0, 1, got: 'undefined''
+                if (cluster !== '64529') {
+                    this.log.error(`Error while processing converters DEVICE_ID: '${devId}' cluster '${cluster}' type '${type}'`);
+                }
             });
     }
 
@@ -732,7 +735,7 @@ class Zigbee extends utils.Adapter {
                 };
 
                 // new toZigbee
-                if (preparedValue !== undefined) {
+                if (preparedValue !== undefined && Object.keys(meta.message).filter(p => p.startsWith('state')).length > 0) {
                     if (typeof preparedValue === 'number') {
                         meta.message.state = preparedValue > 0 ? 'ON' : 'OFF';
                     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.9.5",
+  "version": "1.9.7",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.0.4",
-    "@iobroker/dm-utils": "^0.1.8",
+    "@iobroker/dm-utils": "^0.1.9",
     "humanize-duration": "^3.31.0",
     "tar": "^6.2.0",
     "typescript": "^5.3.3",
-    "zigbee-herdsman": "0.28.0",
+    "zigbee-herdsman": "0.30.0",
     "zigbee-herdsman-converters": "16.18.0"
   },
   "description": "Zigbee devices",
@@ -36,11 +36,11 @@
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@iobroker/testing": "^4.1.0",
-    "axios": "^1.6.0",
-    "chai": "^4.3.10",
+    "axios": "^1.6.3",
+    "chai": "^4.3.5",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.0.0",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",