iobroker.zigbee 1.8.10 → 1.8.13

package/main.js

@@ -516,7 +516,7 @@ class Zigbee extends utils.Adapter {
         if (!converters.length) {
             if (type !== 'readResponse') {
                 this.log.debug(
-                    `No converter available for '${mappedModel.model}' with cluster '${cluster}' and type '${type}'`
+                    `No converter available for '${mappedModel.model}' '${devId}' with cluster '${cluster}' and type '${type}'`
                 );
             }
             return;
@@ -562,144 +562,155 @@ class Zigbee extends utils.Adapter {
 
     async publishFromState(deviceId, model, stateModel, stateList, options) {
         let isGroup = false;
+
+        this.log.debug(`publishFromState : ${deviceId} ${model}`);
         if (model === 'group') {
             isGroup = true;
             deviceId = parseInt(deviceId);
         }
-        const entity = await this.zbController.resolveEntity(deviceId);
-        this.log.debug(`entity: ${safeJsonStringify(entity)}`);
-        const mappedModel = entity.mapped;
-        if (!mappedModel) {
-            this.log.debug(`No mapped model for ${model}`);
-            return;
-        }
-        this.log.debug(`Mapped Model: ${JSON.stringify(mappedModel)}`);
-
-        stateList.forEach(async changedState => {
-            const stateDesc = changedState.stateDesc;
-            const value = changedState.value;
-
-            if (stateDesc.id === 'send_payload') {
-                try {
-                    const json_value = JSON.parse(value);
-                    const payload = {device: deviceId.replace('0x', ''), payload: json_value};
-                    const result = await this.sendPayload(payload);
-                    if (result.hasOwnProperty('success') && result.success) {
-                        this.acknowledgeState(deviceId, model, stateDesc, value);
-                    }
-                } catch (error) {
-                    this.log.warn(`send_payload: ${value} does not parse as JSON Object : ${error.message}`);
-                    return;
-                }
+        try {
+            const entity = await this.zbController.resolveEntity(deviceId);
+            
+            this.log.debug(`entity: ${deviceId} ${model} ${safeJsonStringify(entity)}`);
+            
+            const mappedModel = entity.mapped;       
+                  
+            if (!mappedModel) {
+                this.log.debug(`No mapped model for ${model}`);
                 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) {
-                        this.log.warn(`Device query for '${entity.device.ieeeAddr}' blocked`);
+    
+            stateList.forEach(async changedState => {
+                const stateDesc = changedState.stateDesc;
+                const value = changedState.value;
+    
+                if (stateDesc.id === 'send_payload') {
+                    try {
+                        const json_value = JSON.parse(value);
+                        const payload = {device: deviceId.replace('0x', ''), payload: json_value};
+                        const result = await this.sendPayload(payload);
+                        if (result.hasOwnProperty('success') && result.success) {
+                            this.acknowledgeState(deviceId, model, stateDesc, value);
+                        }
+                    } catch (error) {
+                        this.log.warn(`send_payload: ${value} does not parse as JSON Object : ${error.message}`);
                         return;
                     }
-                    if (mappedModel) {
-                        this.query_device_block.push(deviceId);
-                        this.log.debug(`Device query for '${entity.device.ieeeAddr}' started`);
-                        for (const converter of mappedModel.toZigbee) {
-                            if (converter.hasOwnProperty('convertGet')) {
-                                for (const ckey of converter.key) {
-                                    try {
-                                        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)}'`);
-
+                    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) {
+                            this.log.warn(`Device query for '${entity.device.ieeeAddr}' blocked`);
+                            return;
+                        }
+                        if (mappedModel) {
+                            this.query_device_block.push(deviceId);
+                            this.log.debug(`Device query for '${entity.device.ieeeAddr}' started`);
+                            for (const converter of mappedModel.toZigbee) {
+                                if (converter.hasOwnProperty('convertGet')) {
+                                    for (const ckey of converter.key) {
+                                        try {
+                                            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)}'`);
+    
+                                        }
                                     }
                                 }
                             }
+                            this.log.debug(`Device query for '${entity.device.ieeeAddr}' done`);
+                            const idToRemove = deviceId;
+                            setTimeout(() => {
+                                const idx = this.query_device_block.indexOf(idToRemove);
+                                if (idx > -1) {
+                                    this.query_device_block.splice(idx);
+                                }
+                            }, 10000);
                         }
-                        this.log.debug(`Device query for '${entity.device.ieeeAddr}' done`);
-                        const idToRemove = deviceId;
-                        setTimeout(() => {
-                            const idx = this.query_device_block.indexOf(idToRemove);
-                            if (idx > -1) {
-                                this.query_device_block.splice(idx);
-                            }
-                        }, 10000);
+                        return;
                     }
                     return;
                 }
-                return;
-            }
-            const converter = mappedModel.toZigbee.find(c => c && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
-            if (!converter) {
-                this.log.error(`No converter available for '${model}' with key '${stateDesc.id}' `);
-                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 = [];
-            if (stateModel && stateModel.syncStates) {
-                stateModel.syncStates.forEach(syncFunct => {
-                    const res = syncFunct(stateDesc, value, options);
-                    if (res) {
-                        syncStateList = syncStateList.concat(res);
-                    }
-                });
-            }
-
-            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;
-            } else {
-                target = await this.zbController.resolveEntity(deviceId, epName);
-                target = target.endpoint;
-            }
-
-            this.log.debug(`target: ${safeJsonStringify(target)}`);
-
-            const meta = {
-                endpoint_name: epName,
-                options: preparedOptions,
-                device: entity.device,
-                mapped: model === 'group' ? [] : mappedModel,
-                message: {[key]: preparedValue},
-                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)}`);
-                if (result !== undefined) {
-                    if (stateModel && !isGroup) {
-                        this.acknowledgeState(deviceId, model, stateDesc, value);
-                    }
-                    // process sync state list
-                    this.processSyncStatesList(deviceId, model, syncStateList);
-
-                    if (isGroup) {
-                        await this.callPluginMethod('queryGroupMemberState', [deviceId, stateDesc]);
-                        this.acknowledgeState(deviceId, model, stateDesc, value);
+                const converter = mappedModel.toZigbee.find(c => c && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
+                if (!converter) {
+                    this.log.error(`No converter available for '${model}' with key '${stateDesc.id}' `);
+                    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 = [];
+                if (stateModel && stateModel.syncStates) {
+                    stateModel.syncStates.forEach(syncFunct => {
+                        const res = syncFunct(stateDesc, value, options);
+                        if (res) {
+                            syncStateList = syncStateList.concat(res);
+                        }
+                    });
+                }
+    
+                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;
+                } else {
+                    target = await this.zbController.resolveEntity(deviceId, epName);
+                    target = target.endpoint;
+                }
+    
+                this.log.debug(`target: ${safeJsonStringify(target)}`);
+    
+                const meta = {
+                    endpoint_name: epName,
+                    options: preparedOptions,
+                    device: entity.device,
+                    mapped: model === 'group' ? [] : mappedModel,
+                    message: {[key]: preparedValue},
+                    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)}`);
+                    if (result !== undefined) {
+                        if (stateModel && !isGroup) {
+                            this.acknowledgeState(deviceId, model, stateDesc, value);
+                        }
+                        // 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 (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 function is introduced to explicitly allow user level scripts to send Commands
@@ -917,7 +928,6 @@ class Zigbee extends utils.Adapter {
         if (Number.isInteger(data)) {
             _pairingMode = true;
             this.setState('info.pairingCountdown', data, true);
-            _pairingMode = true;
         }
         if (data === 0) {
             // set pairing mode off

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.8.10",
+  "version": "1.8.13",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -21,11 +21,11 @@
     "serialport": "^10.5.0"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.7",
-    "tar": "^6.1.12",
-    "typescript": "^4.9.3",
-    "zigbee-herdsman": "0.14.83",
-    "zigbee-herdsman-converters": "15.0.15"
+    "@iobroker/adapter-core": "^2.6.8",
+    "tar": "^6.1.15",
+    "typescript": "^5.1.6",
+    "zigbee-herdsman": "0.16.0",
+    "zigbee-herdsman-converters": "15.35.1"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -33,15 +33,15 @@
     "@alcalzone/release-script-plugin-iobroker": "^3.5.9",
     "@alcalzone/release-script-plugin-license": "^3.5.9",
     "@iobroker/testing": "^4.1.0",
-    "axios": "^1.2.0",
+    "axios": "^1.3.4",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.31.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.44.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
-    "gulp-replace": "^1.1.3",
+    "gulp-replace": "^1.1.4",
     "mixin-deep": "^2.0.1",
     "mocha": "^10.2.0"
   },

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);