iobroker.zigbee 1.9.6 → 1.10.0

package/README.md

@@ -134,6 +134,13 @@ You can thank the authors by these links:
 -----------------------------------------------------------------------------------------------------
 
 ## Changelog
+### 1.10.0 (2024-01-13)
+* (arteck) new zigbee-herdsman-converters 18.x
+* (arteck) configure message is now a warning
+
+### 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

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.6",
+    "version": "1.10.0",
     "news": {
+      "1.10.0": {
+        "en": "new zigbee-herdsman-converters 18.x\nconfigure message is now a warning",
+        "de": "neue zickbee-herdsman-konverter 18.x\nkonfigurieren von meldungen",
+        "ru": "новые зигби-гердсман-конвертеры 18.x\nнастройка сообщения - это предупреждение",
+        "pt": "novos conversores de zigbee-herdsman 18.x\nconfigurar a mensagem é agora um aviso",
+        "nl": "nieuwe zigbee-herdsman-converters 18.x\nconfigureren bericht is nu een waarschuwing",
+        "fr": "nouveaux convertisseurs zigbee-herdsman 18.x\nconfigure message est maintenant un avertissement",
+        "it": "nuovo zigbee-herdsman-converter 18.x\nconfigurare il messaggio è ora un avviso",
+        "es": "nuevos zigbee-herdsman-converters 18.x\nmensaje de configuración es ahora una advertencia",
+        "pl": "nowe konwertery zigbee- herdsman- 18 x\nkonfiguracja wiadomości jest teraz ostrzeżeniem",
+        "uk": "новий zigbee-herdsman-converters 18.х\nналаштування повідомлення тепер попередження",
+        "zh-cn": "新的 zigbee- herdsman- 转换器 18.x 电话\n配置信件现在是警告"
+      },
+      "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",
@@ -67,32 +93,6 @@
         "pl": "państwa genowe zjawiają się jako funkcje\nodbudowa nazw. json z przyciskiem czystego przycisku",
         "uk": "генні стани від вибухів як функції\nrebuild dev_names. json з державною кнопкою очищення",
         "zh-cn": "根塔里斯·奥古尔(签名)\n页:1 j. 有国家清洁,但顿"
-      },
-      "1.9.1": {
-        "en": "corr TypeError: Cannot read properties of undefined (reading 'state')",
-        "de": "korpustyp Fehler: Kann Eigenschaften von undefinierten (Lesezustand) nicht lesen",
-        "ru": "тип корр Ошибка: Не смогите прочитать свойства неопределенного (читая состояние)",
-        "pt": "tipo de corante Erro: Não pode ler propriedades de indefinido (estado de leitura)",
-        "nl": "_ Kan geen eigendommen lezen van onbepaalde staat",
-        "fr": "type Erreur: Impossible de lire les propriétés indéfinies (état de lecture)",
-        "it": "tipo Errore: non può leggere le proprietà di non definito (stato di lettura)",
-        "es": "tipo de corrido Error: No se pueden leer propiedades de estado indefinido (estado de lectura)",
-        "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更新"
       }
     },
     "titleLang": {

package/lib/devices.js

@@ -587,7 +587,7 @@ function states_with_epname(entity, states) {
 }
 
 const devices = [
-    {
+    /*   {
         models: ['WXKG01LM'],
         icon: 'img/xiaomi_wireless_switch.png',
         states: [
@@ -596,6 +596,7 @@ const devices = [
             states.long_press,
         ],
     },
+    */
     {
         models: ['WXKG11LM'],
         icon: 'img/aqara_switch.png',

package/lib/exposes.js

@@ -915,8 +915,6 @@ function applyExposes(mappedDevices, byModel, allExcludesObj) {
 
 function applyDeviceDef(mappedDevices, byModel, allExcludesStr, deviceDef) {
     const stripModel = utils.getModelRegEx(deviceDef.model);
-    // check if device is mapped
-
     const existsMap = byModel.get(stripModel);
 
     if ((deviceDef.hasOwnProperty('exposes') && (!existsMap || !existsMap.hasOwnProperty('states'))) || allExcludesStr.indexOf(stripModel) > 0) {
@@ -930,7 +928,7 @@ function applyDeviceDef(mappedDevices, byModel, allExcludesStr, deviceDef) {
                 existsMap.exposed = true;
             }
         } catch (e) {
-            console.log(`Wrong expose devicedefinition ${deviceDef.vendor} ${stripModel}`);
+            console.log(`Wrong expose device definition ${deviceDef.vendor} ${stripModel}`);
         }
     }
 }

package/lib/zbDelayedAction.js

@@ -35,15 +35,6 @@ class DelayedAction extends BaseExtension {
     async onZigbeeStarted() {
         try {
             this.coordinatorEndpoint = await this.zigbee.getDevicesByType('Coordinator')[0].endpoints[0];
-
-            // for (const device of await this.zigbee.getClients()) {
-            //     const mappedDevice = zigbeeHerdsmanConverters.findByDevice(device);
-            //     this.debug(`shouldAction? ${device.ieeeAddr} ${device.modelID}`);
-            //     if (this.shouldAction(device, mappedDevice)) {
-            //         this.debug(`Yes!`);
-            //         await this.doActions(device, mappedDevice);
-            //     }
-            // }
         } catch (error) {
             this.sendError(error);
             this.error(

package/lib/zbDeviceConfigure.js

@@ -43,7 +43,7 @@ class DeviceConfigure extends BaseExtension {
             this.coordinatorEndpoint = await this.zigbee.getDevicesByType('Coordinator')[0].endpoints[0];
 
             for (const device of await this.zigbee.getClients()) {
-                const mappedDevice = zigbeeHerdsmanConverters.findByDevice(device);
+                const mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
 
                 if (forcedConfigureOnEachStart.find((d) => d && d.hasOwnProperty('zigbeeModel') && d.zigbeeModel.includes(device.modelID))) {
                     this.debug(`DeviceConfigure ${device.ieeeAddr} ${device.modelID} forced by adapter config`);
@@ -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,23 @@ 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.warn(` ${device.ieeeAddr} ${device.modelID} Failed to configure. When device works is all fine when not wake up the device and check again`);
+                this.debug(` --> ${error.stack} `);
+            }
         }
     }
 }

package/lib/zbDeviceEvent.js

@@ -11,7 +11,7 @@ class DeviceEvent extends BaseExtension {
 
     async onZigbeeStarted() {
         for (const device of await this.zigbee.getClients()) {
-            this.callOnEvent(device, 'start', {});
+            await this.callOnEvent(device, 'start', {});
         }
     }
 
@@ -20,7 +20,7 @@ class DeviceEvent extends BaseExtension {
 
     }
 
-    onZigbeeEvent(data, mappedDevice) {
+    async onZigbeeEvent(data, mappedDevice) {
         if (data.device) {
             this.callOnEvent(data.device, data.type, data, mappedDevice);
         }
@@ -29,14 +29,14 @@ class DeviceEvent extends BaseExtension {
     async stop() {
         if (this.zigbee.getClients() > 0) {
             for (const device of await this.zigbee.getClients()) {
-                this.callOnEvent(device, 'stop', {});
+                await this.callOnEvent(device, 'stop', {});
             }
         }
     }
 
-    callOnEvent(device, type, data, mappedDevice) {
+    async callOnEvent(device, type, data, mappedDevice) {
         if (!mappedDevice) {
-            mappedDevice = zigbeeHerdsmanConverters.findByDevice(device);
+            mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
         }
 
         if (mappedDevice && mappedDevice.onEvent) {

package/lib/zigbeecontroller.js

@@ -402,7 +402,7 @@ class ZigbeeController extends EventEmitter {
             } else {
                 const device = await this.herdsman.getDeviceByIeeeAddr(key);
                 if (device) {
-                    const mapped = zigbeeHerdsmanConverters.findByDevice(device);
+                    const mapped = await zigbeeHerdsmanConverters.findByDevice(device);
                     const endpoints = mapped && mapped.endpoint ? mapped.endpoint(device) : null;
                     let endpoint;
                     if (endpoints && ep != undefined && endpoints[ep]) {
@@ -439,10 +439,17 @@ class ZigbeeController extends EventEmitter {
                 name: `Group ${key}`,
             };
         } else {
+            let mapped;
+            try {
+                mapped = await zigbeeHerdsmanConverters.findByDevice(key);
+            } catch (err) {
+                this.error(`zigbeeHerdsmanConverters findByDevice ${key.ieeeAddr}`);
+            }
+
             return {
                 type: 'device',
                 device: key,
-                mapped: zigbeeHerdsmanConverters.findByDevice(key),
+                mapped: mapped,
                 name: key.type === 'Coordinator' ? 'Coordinator' : key.ieeeAddr,
             };
         }
@@ -545,7 +552,7 @@ class ZigbeeController extends EventEmitter {
                 } catch (error) {
                     this.sendError(error);
                     if (error)
-                        this.debug(`Failed to remove device ${error.stack}`);
+                        this.debug(`Failed to remove device. If device is remove is all fine, when not use Force remove`);
                     // skip error if force
                     if (!force) {
                         throw error;
@@ -671,7 +678,8 @@ class ZigbeeController extends EventEmitter {
                 this.emit('new', entity);
             }
         } else if (message.status === 'failed') {
-            this.error(`Failed to interview '${friendlyName}', device has not successfully been paired. ${message.error}`);
+            this.error(`Failed to interview '${friendlyName}', device has not successfully been paired. Try again !!!!!!!!!! `);
+            //this.error(`Failed to interview '${friendlyName}', device has not successfully been paired. Try again !!!!!!!!!! ${message.error}`);
             this.emit('pairing', 'Interview failed', friendlyName);
         } else {
             if (message.status === 'started') {

package/main.js

@@ -424,9 +424,9 @@ class Zigbee extends utils.Adapter {
     }
 
     async checkIfModelUpdate(entity) {
-        const model = entity.mapped ? entity.mapped.model : entity.device.modelID,
-            device = entity.device,
-            devId = device.ieeeAddr.substr(2);
+        const model = entity.mapped ? entity.mapped.model : entity.device.modelID;
+        const device = entity.device;
+        const devId = device.ieeeAddr.substr(2);
 
         return new Promise((resolve) => {
             this.getObject(devId, (err, obj) => {
@@ -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}'`);
+                }
             });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.9.6",
+  "version": "1.10.0",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -22,12 +22,12 @@
   },
   "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-converters": "16.18.0"
+    "zigbee-herdsman": "0.32.3",
+    "zigbee-herdsman-converters": "18.11.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -37,7 +37,7 @@
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@iobroker/testing": "^4.1.0",
     "axios": "^1.6.3",
-    "chai": "^4.3.10",
+    "chai": "^4.3.5",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.1.0",