iobroker.zigbee 1.8.20 → 1.8.22

package/README.md

@@ -16,7 +16,7 @@ With the Zigbee-coordinator based on Texas Instruments SoC, deCONZ ConBee/RaspBe
 ## Hardware
 
 
-One coordinator device is required for each zigbee Adapter instance. The device must be flashed with the respective coordinator firmware. A list of supported coordinators, the necessary equipment for the firmware and the device preparation process for different coordinator devices are described [here (in English)](https://www.zigbee2mqtt.io/guide/adapters/) or [here (in Russian)](https://myzigbee.ru/books/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B8/page/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B0-cc2531cc2530)
+One coordinator device is required for each zigbee Adapter instance. The device must be flashed with the respective coordinator firmware. A list of supported coordinators, the necessary equipment for the firmware and the device preparation process for different coordinator devices are described [here in English](https://www.zigbee2mqtt.io/guide/adapters/) or [smarthomescene.com ](https://smarthomescene.com/blog/best-zigbee-dongles-for-home-assistant-2023/) or [here in Russian](https://myzigbee.ru/books/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B8/page/%D0%BF%D1%80%D0%BE%D1%88%D0%B8%D0%B2%D0%BA%D0%B0-cc2531cc2530)
 
 
 ### Texas Instruments SoC
@@ -25,16 +25,15 @@ Recommended devices are based on either the CC2652 or CC1352 chip. Devices based
 Only CC26xx/cc1352/cc2538 Devices support extraction of the NVRam backup which should allow to swap coordinator hardware without having to reconnect all zigbee devices to the network.
 Current firmware files for these devices can be found [on GitHub](https://github.com/Koenkk/Z-Stack-firmware)
 
-<span><img src="https://ae01.alicdn.com/kf/HTB1Httue3vD8KJjSsplq6yIEFXaJ/Wireless-Zigbee-CC2531-Sniffer-Bare-Board-Packet-Protocol-Analyzer-Module-USB-Interface-Dongle-Capture-Packet.jpg_640x640.jpg" width="100"></span>
-<span><img src="https://ae01.alicdn.com/kf/HTB1zAA5QVXXXXahapXXq6xXFXXXu/RF-TO-USB-CC2530-CC2591-RF-switch-USB-transparent-serial-data-transmission-equipment.jpg_640x640.jpg" width="100"></span>
-<span><img src="docs/de/img/sonoff.png" width="100"></span>
-<span><img src="docs/de/img/CC2538_CC2592_PA.PNG" width="100"></span>
-<span><img src="docs/de/img/cc26x2r.PNG" width="100"></span>
-
+<span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/de/img/CC2531.png" width="100"></span>
+<span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/de/img/CC2591.png" width="100"></span>
+<span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/de/img/sonoff.png" width="100"></span>
+<span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/de/img/CC2538_CC2592_PA.PNG" width="100"></span>
+<span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/de/img/cc26x2r.PNG" width="100"></span>
 
+tutorial/zigbee.png
 ### Dresden Elektronik SoC
-
-<span><img src="docs/en/img/deconz.png"></span>
+<span><img src="https://raw.githubusercontent.com/ioBroker/ioBroker.zigbee/master/docs/en/img/deconz.png" width="180"></span>
 
 recommended:
 - ConBee II
@@ -111,11 +110,18 @@ There are knowledge bases that can be useful for working with Zigbee-devices and
 
 ## Supported devices
 
-Works with devices from this list https://github.com/ioBroker/ioBroker.zigbee/wiki/Supported-devices
+[Works with devices from this list](https://github.com/ioBroker/ioBroker.zigbee/wiki/Supported-devices)
 
 
 ## More Informations
-https://github.com/ioBroker/ioBroker.zigbee/wiki
+
+[in Deutsch](https://github.com/ioBroker/ioBroker.zigbee/blob/master/docs/de/readme.md)
+
+[in English](https://github.com/ioBroker/ioBroker.zigbee/blob/master/docs/en/readme.md)
+
+or 
+
+[wiki](https://github.com/ioBroker/ioBroker.zigbee/wiki)
 
 
 
@@ -125,19 +131,15 @@ You can thank the authors by these links:
 * to Kirov Ilya https://www.paypal.me/goofyk
 * to Arthur Rupp https://paypal.me/ArthurRupp
 
-<!--
-    Placeholder for the next version (at the beginning of the line):
+-----------------------------------------------------------------------------------------------------
 
-    https://github.com/AlCalzone/release-script#usage
-    npm run release major -- -p iobroker license --all 0.9.8 -> 1.0.0
-    npm run release minor -- -p iobroker license --all 0.9.8 -> 0.10.0
-    npm run release patch -- -p iobroker license --all 0.9.8 -> 0.9.9
-    npm run release prerelease beta -- -p iobroker license --all v0.2.1 -> v0.2.2-beta.0
-    ### **WORK IN PROGRESS**
--->
+## Changelog
+### 1.8.22 (2023-08-05)
+* (arteck) crash when meta is empty
 
+### 1.8.21 (2023-07-31)
+* (arteck) no converter found
 
-## Changelog
 ### 1.8.20 (2023-07-31)
 * (arteck) add log
 

package/admin/adapter-settings.js

@@ -96,15 +96,15 @@ function loadSettings(callback) {
             if (typeof load === 'undefined') {
                 alert('Please implement save function in your admin/index.html');
             } else {
-				// detect, that we are now in react container (themeNames = ['dark', 'blue', 'colored', 'light'])
-
-				const _query = query.split('&');
-
-				for (var q = 0; q < _query.length; q++) {
-					if (_query[q].indexOf('react=') !== -1) {
-						$('.adapter-container').addClass('react-' + _query[q].substring(6));
-						theme = 'react-' + _query[q].substring(6);
-					}
+		// detect, that we are now in react container (themeNames = ['dark', 'blue', 'colored', 'light'])
+		
+		const _query = query.split('&');
+		
+		for (var q = 0; q < _query.length; q++) {
+			if (_query[q].indexOf('react=') !== -1) {
+				$('.adapter-container').addClass('react-' + _query[q].substring(6));
+				theme = 'react-' + _query[q].substring(6);
+			}
                 }
 
                 load(res.native, onChange);

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.8.20",
+    "version": "1.8.22",
     "news": {
+      "1.8.22": {
+        "en": "crash when meta is empty",
+        "de": "crash, wenn meta leer ist",
+        "ru": "сбой, когда мета пуста",
+        "pt": "acidente quando meta está vazio",
+        "nl": "als meta leeg is",
+        "fr": "crash quand meta est vide",
+        "it": "crash quando il meta è vuoto",
+        "es": "estrellarse cuando meta está vacía",
+        "pl": "w przypadku, gdy meta jest pusta",
+        "uk": "аварійний випадок, коли мета",
+        "zh-cn": "c 当元空时发生事故"
+      },
+      "1.8.21": {
+        "en": "no converter found",
+        "de": "kein konverter gefunden",
+        "ru": "не найдено конвертер",
+        "pt": "não encontrado",
+        "nl": "geen converter gevonden",
+        "fr": "aucun convertisseur trouvé",
+        "it": "nessun convertitore trovato",
+        "es": "no convertidor encontrado",
+        "pl": "nie znaleziono konwerterów",
+        "uk": "не знайдено",
+        "zh-cn": "未找到转换器"
+      },
       "1.8.20": {
         "en": "add log",
         "de": "log",
@@ -67,19 +93,11 @@
         "pl": "baterie",
         "uk": "акумулятор",
         "zh-cn": "电池组"
-      },
-      "1.8.13": {
-        "en": "see Readme https://github.com/ioBroker/ioBroker.zigbee/blob/master/README.md",
-        "de": "see Readme https://github.com/ioBroker/ioBroker.zigbee/blob/master/README.md"
-      },
-      "1.8.12": {
-        "en": "new Documentation",
-        "de": "neue Dokumentation"
       }
     },
-    "title": "Zigbee",
     "titleLang": {
       "en": "Zigbee",
+      "uk": "Zigbee",
       "ru": "Zigbee",
       "de": "ZigBee",
       "pt": "Zigbee",
@@ -92,6 +110,7 @@
     },
     "desc": {
       "en": "Zigbee adapter for Xiaomi (and other) devices via Chip cc26xx/cc25xx",
+      "uk": "Zigbee adapter for Xiaomi (and other) devices via Chip cc26xx/cc25xx",
       "ru": "Zigbee адаптер для Xiaomi (и других) устройств через Chip cc26xx/cc25xx",
       "de": "ZigBee-Adapter für Xiaomi (und andere) Geräte über Chip cc26xx/cc25xx",
       "pt": "Adaptador Zigbee para dispositivos Xiaomi (e outros) via Chip cc26xx/cc25xx",

package/lib/statescontroller.js

@@ -530,7 +530,7 @@ class StatesController extends EventEmitter {
             return new Promise((resolve, reject) => {
                 request.head(url, (err, res, body) => {
                     if (err) {
-                        return reject(err);
+                        return reject(err + ' ' + res + ' ' + body);
                     }
                     const stream = request(url);
                     stream.pipe(

package/lib/utils.js

@@ -138,8 +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/zigbeecontroller.js

@@ -313,12 +313,12 @@ class ZigbeeController extends EventEmitter {
     }
 
     async addPairingCode(code) {
-      this.debug(`calling addPairingCode with ${code}`);
-      if (code) {
-        await this.herdsman.addInstallCode(code)
-        this.info(`added code ${code} for pairing`)
-        return true;
-      }
+        this.debug(`calling addPairingCode with ${code}`);
+        if (code) {
+            await this.herdsman.addInstallCode(code);
+            this.info(`added code ${code} for pairing`);
+            return true;
+        }
       return false;
     }
 
@@ -784,7 +784,7 @@ class ZigbeeController extends EventEmitter {
                     for (k in this) {
                         yield k;
                     }
-                };
+                }
             }
             let result;
             if (cmd === 'configReport') {
@@ -806,26 +806,26 @@ class ZigbeeController extends EventEmitter {
 
     async addDevToGroup(devId, groupId, epid) {
         try {
-            this.debug(`called addDevToGroup with ${devId}, ${groupId}, ${epid}`)
+            this.debug(`called addDevToGroup with ${devId}, ${groupId}, ${epid}`);
             const entity = await this.resolveEntity(devId);
             const group = await this.resolveEntity(groupId);
             this.debug(`addDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
             // generate group debug info and display it
-            const members = await this.getGroupMembersFromController(groupId)
+            const members = await this.getGroupMembersFromController(groupId);
             let memberIDs = []
             for (let member of members) {
-              memberIDs.push(member.ieee)
+              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})`)
+                    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}`)
+                      else this.error(`cluster genGroups not supported for endpoint ${epid} of ${devId}`);
                     }
                 }
             } else {
@@ -855,16 +855,16 @@ class ZigbeeController extends EventEmitter {
     }
 
     async removeDevFromGroup(devId, groupId, epid) {
-        this.debug(`removeDevFromGroup with ${devId}, ${groupId}, ${epid}`)
+        this.debug(`removeDevFromGroup with ${devId}, ${groupId}, ${epid}`);
         let entity;
         try {
             entity = await this.resolveEntity(devId);
             const group = await this.resolveEntity(groupId);
 
-            const members = await this.getGroupMembersFromController(groupId)
+            const members = await this.getGroupMembersFromController(groupId);
             let memberIDs = []
             for (let member of members) {
-              memberIDs.push(member.ieee)
+                memberIDs.push(member.ieee)
             }
 
             this.debug(`removeDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);

package/main.js

@@ -47,8 +47,6 @@ const E_DEBUG = 2;
 const E_WARN  = 3;
 const E_ERROR = 4;
 
-let _pairingMode = false;
-
 const errorCodes = {
     9999: {severity: E_INFO, message: 'No response'},
     233: {severity: E_DEBUG, message: 'MAC NO ACK'},
@@ -229,14 +227,13 @@ class Zigbee extends utils.Adapter {
             };
             const mN = (fs.existsSync(moduleName) ? moduleName : this.expandFileName(moduleName).replace('.', '_'));
             if (!fs.existsSync(mN)) {
-              this.log.warn(`External converter not loaded - neither ${moduleName} nor ${mN} exist.`)
-
+                this.log.warn(`External converter not loaded - neither ${moduleName} nor ${mN} exist.`);
             }
             else {
                 const converterCode = fs.readFileSync(mN, {encoding: 'utf8'}).toString();
                 let converterLoaded = true;
                 if (converterCode.match(/..\/lib\/legacy/gm)) {
-                    this.log.warn(`External converter ${mN} contains an unsupported reference to '/lib/legacy' - external converter not loaded.`)
+                    this.log.warn(`External converter ${mN} contains an unsupported reference to '/lib/legacy' - external converter not loaded.`);
                     converterLoaded = false;
                 }
                 else
@@ -244,7 +241,7 @@ class Zigbee extends utils.Adapter {
                     // remove the require statements and attempt to place them in the sandbox
                     const requiredLibraries = converterCode.matchAll(/(\w+) += +require\(['"](\S+)['"]\);/gm);
                     for (const line of requiredLibraries) {
-                        const movedLine = line[2].replace('..', '../zigbee-herdsman-converters')
+                        const movedLine = line[2].replace('..', '../zigbee-herdsman-converters');
                         try {
                             sandbox[line[1]] = require(movedLine);
                         }
@@ -265,7 +262,7 @@ class Zigbee extends utils.Adapter {
                         else yield converter;
                     }
                     catch (e) {
-                        this.log.error(`Unable to apply converter from module: ${mN} - the code does not run: ${e}`)
+                        this.log.error(`Unable to apply converter from module: ${mN} - the code does not run: ${e}`);
                     }
                 }
                 else
@@ -273,22 +270,18 @@ class Zigbee extends utils.Adapter {
 
             }
         }
-   }
+    }
 
     applyExternalConverters() {
-      try {
         for (const definition of this.getExternalDefinition()) {
             const toAdd = {...definition};
             delete toAdd['homeassistant'];
             try {
-              zigbeeHerdsmanConverters.addDeviceDefinition(toAdd);
+                zigbeeHerdsmanConverters.addDeviceDefinition(toAdd);
+            } catch { 
+                this.log.error(`unable to apply external converter ${JSON.stringfy(toAdd)}`);
             }
-            catch { this.log.error(`unable to apply external converter ${JSON.stringfy(toAdd)}`) }
         }
-      }
-      catch(error) {
-         this.log.error('error applying external converters');
-      }
     }
 
     async doConnect() {
@@ -476,29 +469,33 @@ class Zigbee extends utils.Adapter {
 
         let voltage = 0;
         let battKey = false;
-
-        if (mappedModel.meta != undefined && 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 (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;
+                                }      
+                            }
                         }
-                        if (key == 65281) {
-                            voltage = value[1];
-                            battKey = true;
-                            break;
-                        }      
                     }
                 }
             }
@@ -551,9 +548,9 @@ class Zigbee extends utils.Adapter {
             }
         };
 
-        try {
-            for (const converter of converters) {
-                this.stController.collectOptions(devId, model, (options) => {
+        for (const converter of converters) {
+            this.stController.collectOptions(devId, model, (options) => {
+                try {
                     payload = converter.convert(mappedModel, message, publish, options, meta);
     
                     if (payload) {
@@ -561,10 +558,10 @@ class Zigbee extends utils.Adapter {
                             publish(payload);
                         }
                     }
-                });
-            }
-        } catch (err) {
-            this.log.error(`convert problem with '${model}' '${devId}' `);
+                } catch (err) {
+                    this.log.warn(`convert problem with '${model}' '${devId}' `);
+                }
+            });
         }
     }
 
@@ -953,14 +950,12 @@ class Zigbee extends utils.Adapter {
     }
 
     onPairing(message, data) {
-        if (Number.isInteger(data)) {
-            _pairingMode = true;
+        if (Number.isInteger(data)) {           
             this.setState('info.pairingCountdown', data, true);
         }
         if (data === 0) {
             // set pairing mode off
             this.setState('info.pairingMode', false, true);
-            _pairingMode = false;
         }
         if (data) {
             this.logToPairing(`${message}: ${data.toString()}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.8.20",
+  "version": "1.8.22",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -18,14 +18,14 @@
     "node": ">=10"
   },
   "optionalDependencies": {
-    "serialport": "^11.0.0"
+    "serialport": "^11.0.1"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.8",
+    "@iobroker/adapter-core": "^3.0.3",
     "tar": "^6.1.15",
     "typescript": "^5.1.6",
     "zigbee-herdsman": "0.17.2",
-    "zigbee-herdsman-converters": "15.49.0"
+    "zigbee-herdsman-converters": "15.54.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -37,9 +37,9 @@
     "axios": "^1.3.4",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "eslint": "^8.46.0",
+    "eslint-config-prettier": "^8.9.0",
+    "eslint-plugin-prettier": "^5.0.0",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.4",