iobroker.zigbee 1.8.22 → 1.8.23

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.23",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -25,7 +25,7 @@
     "tar": "^6.1.15",
     "typescript": "^5.1.6",
     "zigbee-herdsman": "0.17.2",
-    "zigbee-herdsman-converters": "15.54.0"
+    "zigbee-herdsman-converters": "15.55.3"
   },
   "description": "Zigbee devices",
   "devDependencies": {

package/support/docgen.js

@@ -1,93 +1,93 @@
-/**
- * This script generates the supported devices page.
- * 
- */
-
-let devices = [...require('zigbee-herdsman-converters').devices];
-
-for (const device of devices) {
-    if (device.whiteLabel) {
-        for (const whiteLabel of device.whiteLabel) {
-            const whiteLabelDevice = {
-                ...device,
-                model: whiteLabel.model,
-                vendor: whiteLabel.vendor,
-                description: whiteLabel.description,
-                whiteLabelOf: device,
-            };
-
-            delete whiteLabelDevice.whiteLabel;
-
-            devices.push(whiteLabelDevice);
-        }
-    }
-}
-
-devices = new Map(devices.map((d) => [d.model, d]));
-
-const Devices = require('../lib/devices');
-let iobDevices = Devices.devices;
-Devices.fillStatesWithExposes('');
-
-const iobCount = iobDevices.filter((d) => (!d.exposed)).length;
-iobDevices = new Map(iobDevices.map((d) => d.models.map((m) => [m, d])).flat());
-
-const fs = require('fs');
-const outputdir = process.argv[2];
-
-if (!outputdir) {
-    console.error('Please specify an output directory');
-}
-
-const file = 'Supported-devices.md';
-let text = `*NOTE: Automatically generated by 'npm run docgen'* \n\n` +
-    `Currently **${iobDevices.size}**(${iobCount} described in adapter) devices are supported.\n\n` +
-    `(⭐EXP) - means that the device is presented automatically, based on the 'exposes' from the zigbee-herdsman-converters.\n\n`;
-
-const logDevices = (devmodels) => {
-    let result = '';
-
-    devmodels.forEach((devmodel) => {
-        const iobDevice = iobDevices.get(devmodel);
-        const device = devices.get(devmodel);
-        const pathImg = (iobDevice.icon.startsWith('http')) ? devmodel : iobDevice.icon.replace(new RegExp('img/', 'g'), '').replace(new RegExp('.png', 'g'), '');
-        const icon = (iobDevice.icon.startsWith('http')) ? iobDevice.icon : `https://github.com/ioBroker/ioBroker.zigbee/raw/master/admin/${iobDevice.icon}`;
-        let brand;
-        const models = [];
-        let zmodels;
-        if (device.zigbeeModel) {
-            zmodels = device.zigbeeModel;
-        } else {
-            zmodels = [devmodel];
-        }
-        zmodels.forEach((modelId) => {
-            const re = /[^\x20-\x7E]+/g;
-            const model = modelId.replace(re, ' ');
-            const desc = `${device.description} (${device.supports})`;
-            const name = `**${device.model}${(iobDevice.exposed) ? ' (⭐EXP)': ''}**<br>`;
-            if (brand == undefined) {
-                brand= {
-                    name: name,
-                    desc: desc,
-                    pathImg: pathImg,
-                };
-            }
-            models.push(model);
-        });
-        const modelsStr = models.join(', ');
-        result += `| ${brand.name} (${modelsStr}) | ${brand.desc} |  ![${brand.pathImg}](${icon}) |\n`;
-    });
-
-    return result;
-};
-
-const vendors = Array.from(new Set([...iobDevices.keys()].map((m) => (devices.get(m)) ? devices.get(m).vendor : null)));
-vendors.sort();
-text += '|  Model | Description | Picture |\n';
-text += '| ------------- | ------------- | -------------------------- |\n';
-vendors.forEach((vendor) => {
-    text += `|  | **${vendor}**  |   |\n`;   
-    text += logDevices([...iobDevices.keys()].map((m) => devices.get(m)).filter((d) => d && d.vendor === vendor).map((d) => d.model));
-});
-
-fs.writeFileSync(outputdir + '/' + file, text);
+/**
+ * This script generates the supported devices page.
+ *
+ */
+
+let devices = [...require('zigbee-herdsman-converters').devices];
+
+for (const device of devices) {
+    if (device.whiteLabel) {
+        for (const whiteLabel of device.whiteLabel) {
+            const whiteLabelDevice = {
+                ...device,
+                model: whiteLabel.model,
+                vendor: whiteLabel.vendor,
+                description: whiteLabel.description,
+                whiteLabelOf: device,
+            };
+
+            delete whiteLabelDevice.whiteLabel;
+
+            devices.push(whiteLabelDevice);
+        }
+    }
+}
+
+devices = new Map(devices.map((d) => [d.model, d]));
+
+const Devices = require('../lib/devices');
+let iobDevices = Devices.devices;
+Devices.fillStatesWithExposes('');
+
+const iobCount = iobDevices.filter((d) => (!d.exposed)).length;
+iobDevices = new Map(iobDevices.map((d) => d.models.map((m) => [m, d])).flat());
+
+const fs = require('fs');
+const outputdir = process.argv[2];
+
+if (!outputdir) {
+    console.error('Please specify an output directory');
+}
+
+const file = 'Supported-devices.md';
+let text = `*NOTE: Automatically generated by 'npm run docgen'* \n\n` +
+    `Currently **${iobDevices.size}**(${iobCount} described in adapter) devices are supported.\n\n` +
+    `(⭐EXP) - means that the device is presented automatically, based on the 'exposes' from the zigbee-herdsman-converters.\n\n`;
+
+const logDevices = (devmodels) => {
+    let result = '';
+
+    devmodels.forEach((devmodel) => {
+        const iobDevice = iobDevices.get(devmodel);
+        const device = devices.get(devmodel);
+        const pathImg = (iobDevice.icon.startsWith('http')) ? devmodel : iobDevice.icon.replace(new RegExp('img/', 'g'), '').replace(new RegExp('.png', 'g'), '');
+        const icon = (iobDevice.icon.startsWith('http')) ? iobDevice.icon : `https://github.com/ioBroker/ioBroker.zigbee/raw/master/admin/${iobDevice.icon}`;
+        let brand;
+        const models = [];
+        let zmodels;
+        if (device.zigbeeModel) {
+            zmodels = device.zigbeeModel;
+        } else {
+            zmodels = [devmodel];
+        }
+        zmodels.forEach((modelId) => {
+            const re = /[^\x20-\x7E]+/g;
+            const model = modelId.replace(re, ' ');
+            const desc = `${device.description} (${device.supports})`;
+            const name = `**${device.model}${(iobDevice.exposed) ? ' (⭐EXP)': ''}**<br>`;
+            if (brand == undefined) {
+                brand= {
+                    name: name,
+                    desc: desc,
+                    pathImg: pathImg,
+                };
+            }
+            models.push(model);
+        });
+        const modelsStr = models.join(', ');
+        result += `| ${brand.name} (${modelsStr}) | ${brand.desc} |  ![${brand.pathImg}](${icon}) |\n`;
+    });
+
+    return result;
+};
+
+const vendors = Array.from(new Set([...iobDevices.keys()].map((m) => (devices.get(m)) ? devices.get(m).vendor : null)));
+vendors.sort();
+text += '|  Model | Description | Picture |\n';
+text += '| ------------- | ------------- | -------------------------- |\n';
+vendors.forEach((vendor) => {
+    text += `|  | **${vendor}**  |   |\n`;
+    text += logDevices([...iobDevices.keys()].map((m) => devices.get(m)).filter((d) => d && d.vendor === vendor).map((d) => d.model));
+});
+
+fs.writeFileSync(outputdir + '/' + file, text);