iobroker.zigbee 3.1.2 → 3.1.4

package/lib/exposes.js

@@ -7,7 +7,7 @@ const utils = require('./utils');
 const colors = require('./colors');
 const ea = require('zigbee-herdsman-converters/lib/exposes').access;
 
-
+const LocalData = { options:{} };
 const __logger = undefined;
 
 function genState(expose, role, name, desc) {
@@ -819,9 +819,28 @@ function createFromExposes(model, def, device, log) {
                 break;
 
             case 'composite':
+            {
+                const stname = (expose.property);
+                const stateId = stname.replace(/\*/g, '');
+                const stateName = (expose.description || expose.name);
+                const channelID = LocalData.options.newCompositeMethod ? `${stateId}.` : '';
+                if (LocalData.options.newCompositeMethod) {
+
+                    if (typeof stname !== 'string') break;
+                    pushToStates({
+                        id: stateId,
+                        name: stateName,
+                        icon: undefined,
+                        role: 'state',
+                        write: expose.access & ea.SET,
+                        read: expose.access & ea.GET,
+                        type: 'string',
+                    }, expose.access)
+
+                }
                 for (const prop of expose.features) {
                     if (prop.type == 'numeric') {
-                        const st = genState(prop);
+                        const st = genState(prop, 'state', `${channelID}${prop.name}`);
                         st.prop = expose.property;
                         st.inOptions = true;
                         // I'm not fully sure, as it really needed, but
@@ -831,27 +850,34 @@ function createFromExposes(model, def, device, log) {
                             result[expose.property] = options;
                             return result;
                         };
-                        // if we have a composite expose, the value have to be an object {expose.property : {prop.property: value}}
-                        if (prop.access & ea.SET) {
-                            st.setter = (value, options) => {
-                                const result = {};
-                                options[prop.property] = value;
-                                result[expose.property] = options;
-                                return result;
-                            };
-                            st.setattr = expose.property;
-                        }
-                        // if we have a composite expose, the payload will be an object {expose.property : {prop.property: value}}
-                        if (prop.access & ea.STATE) {
-                            st.getter = payload => {
-                                if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(prop.property)) {
-                                    return !isNaN(payload[expose.property][prop.property]) ? payload[expose.property][prop.property] : undefined;
-                                } else {
-                                    return undefined;
-                                }
-                            };
-                        } else {
-                            st.getter = payload => undefined;
+                        if (LocalData.options.newCompositeMethod) {
+                            st.compositeKey = stateId;
+                            st.compositeTimeout = 250;
+                            st.compositeState = stateId;
+                        } else
+                        {
+                            // if we have a composite expose, the value have to be an object {expose.property : {prop.property: value}}
+                            if (prop.access & ea.SET) {
+                                st.setter = (value, options) => {
+                                    const result = {};
+                                    options[prop.property] = value;
+                                    result[expose.property] = options;
+                                    return result;
+                                };
+                                st.setattr = expose.property;
+                            }
+                            // if we have a composite expose, the payload will be an object {expose.property : {prop.property: value}}
+                            if (prop.access & ea.STATE) {
+                                st.getter = payload => {
+                                    if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(prop.property)) {
+                                        return !isNaN(payload[expose.property][prop.property]) ? payload[expose.property][prop.property] : undefined;
+                                    } else {
+                                        return undefined;
+                                    }
+                                };
+                            } else {
+                                st.getter = payload => undefined;
+                            }
                         }
                         pushToStates(st, prop.access);
                     }
@@ -894,6 +920,7 @@ function createFromExposes(model, def, device, log) {
                     }
                 }
                 break;
+            }
             case 'list':
                 // is not mapped
                 //     for (const prop of expose) {
@@ -909,7 +936,10 @@ function createFromExposes(model, def, device, log) {
 
 }
 
-async function applyExposeForDevice(mappedDevices, byModel, device) {
+async function applyExposeForDevice(mappedDevices, byModel, device, options) {
+    if (options && typeof options == 'object') {
+        LocalData.options = options;
+    }
     const deviceDef = await zigbeeHerdsmanConverters.findByDevice(device);
     if (!deviceDef)  {
         return undefined;

package/lib/groups.js

@@ -216,7 +216,6 @@ class Groups {
                                     break;
                             }
                         }
-
                     }
                 }
             }
@@ -240,12 +239,9 @@ class Groups {
                     }
                 }
             }
-
         }
     }
 
-
-
     static readables = {
         state: { cluster:6, attributes:['onOff']},
         brightness: { cluster:8, attributes:['currentLevel']},
@@ -260,16 +256,21 @@ class Groups {
         const endpoint = entity.endpoint;
         const mappedModel = entity.mapped;
         if (!mappedModel) return;
+        const obj = await this.adapter.getObjectAsync((member.ieee.includes('x') ? member.ieee.split('x')[1] : member.ieee));
+        if (obj && obj.common.deactivated) {
+            this.debug(`omitting reading member state for deactivated device ${member.ieee}`);
+            return;
+        }
         const converter = mappedModel.toZigbee.find(c => c && (c.key.includes(item.state)));
         const canReadViaConverter = converter && converter.hasOwnProperty('convertGet');
         if (canReadViaConverter) {
             try {
                 await converter.convertGet(endpoint, item.state, {device:entity.device});
             } catch (error) {
-                this.warn(`reading ${item.state} from ${member.id}${member.ieee ? '/' + member.epid : ''} via convertGet failed with ${error && error.message ? error.message : 'no reason given'}`);
+                this.debug(`reading ${item.state} from ${member.id}${member.ieee ? '/' + member.epid : ''} via convertGet failed with ${error && error.message ? error.message : 'no reason given'}`);
                 return {unread:member.device};
             }
-            this.warn(`reading ${item.state} from ${member.ieee}${member.ep ? '/' + member.epid : ''} via convertGet succeeded` )
+            this.debug(`reading ${item.state} from ${member.ieee}${member.ep ? '/' + member.epid : ''} via convertGet succeeded` );
             return {read:member.device};
         }
         if (toRead.cluster) {
@@ -277,25 +278,23 @@ class Groups {
                 if (entity.endpoint.inputClusters.includes(toRead.cluster)) {
                     try {
                         const result = await endpoint.read(toRead.cluster, toRead.attributes,{disableDefaultResponse : true });
-                        this.warn(`readGroupMemberStatus for ${item.state} from ${member.ieee}${member.ep ? '/' + member.epid : ''} resulted in ${JSON.stringify(result)}`);
+                        this.debug(`readGroupMemberStatus for ${item.state} from ${member.ieee}${member.ep ? '/' + member.epid : ''} resulted in ${JSON.stringify(result)}`);
                     }
                     catch (error) {
-                        this.warn(`reading ${item.state} from ${member.ieee}${member.ep ? '/' + member.epid : ''} via endpoint.read with ${toRead.cluster}, ${JSON.stringify(toRead.attributes)} resulted in ${error && error.message ? error.message : 'an unspecified error'}`);
+                        this.debug(`reading ${item.state} from ${member.ieee}${member.ep ? '/' + member.epid : ''} via endpoint.read with ${toRead.cluster}, ${JSON.stringify(toRead.attributes)} resulted in ${error && error.message ? error.message : 'an unspecified error'}`);
                     }
-                    this.warn(`reading ${item.state} from ${member.ieee}${member.ep ? '/' + member.epid : ''} via endpoint.read with ${toRead.cluster}, ${JSON.stringify(toRead.attributes)} succeeded`);
+                    this.debug(`reading ${item.state} from ${member.ieee}${member.ep ? '/' + member.epid : ''} via endpoint.read with ${toRead.cluster}, ${JSON.stringify(toRead.attributes)} succeeded`);
                 }
-                else this.warn(`omitting cluster ${toRead.cluster} - not supported`);
+                else this.debug(`omitting cluster ${toRead.cluster} - not supported`);
             }
             else {
-                this.warn(`unable to read ${item.state} from ${member.id}${member.ep ? '/' + member.epid : ''} - unable to resolve the entity`);
+                this.debug(`unable to read ${item.state} from ${member.id}${member.ep ? '/' + member.epid : ''} - unable to resolve the entity`);
             }
             return;
         }
     }
 
     async readGroupMemberStatus(obj, item) {
-        obj.warn(`rgms with ${JSON.stringify(item)}`);
-
         const toRead = Groups.readables[item.state]
         if (toRead) {
             const members = await obj.zbController.getGroupMembersFromController(item.id);
@@ -465,11 +464,10 @@ class Groups {
 
     async renameGroup(from, command, message) {
         this.debug(`rename group called with ${from}, ${command}, ${JSON.stringify(message)}`);
-        // const groupsEntry = await this.adapter.getStateAsync('info.groups');
-        // const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
-        const name = message.name;
         const id = `group_${message.id}`;
-        let icon = this.stController.localConfig.IconForId(id, 'group', await this.stController.getDefaultGroupIcon(id));
+
+        this.stController.localConfig.updateDeviceName(id, message.name);
+
         try {
             const group = await this.zbController.verifyGroupExists(message.id);
             if (message.remove) {
@@ -478,16 +476,13 @@ class Groups {
                     this.debug('trying to remove ' + member.id + (member.ep ? '.'+member.ep : '') + ' ' + ' from group ' + message.id + ' response is '+JSON.stringify(response));
                 }
             }
-            if (icon.match(/img\/group_\d+\.png/g)) {
-                icon = await this.zbController.rebuildGroupIcon(group);
-            }
         } catch (e) {
             this.warn('renameGroup caught error ' + (e && e.message ? e.message : 'no message'));
             if (e && e.hasOwnProperty('code')) {
                 this.warn(`renameGroup caught error ${JSON.stringify(e.code)}`);
             }
         }
-        this.debug(`rename group name ${name}, id ${id}, icon ${icon} remove ${JSON.stringify(message.removeMembers)}`);
+        this.debug(`rename group name ${message.name}, id ${id}, remove ${JSON.stringify(message.removeMembers)}`);
         this.syncGroups([parseInt(message.id)]);
     }
 
@@ -601,10 +596,13 @@ class Groups {
         if (!this.GroupData.states[id]) return undefined;
         const val = this.GroupData.states[id].val;
         if (val == null || val == undefined) {
-            const obj = await this.adapter.getStateAsync(id);
-            if (obj) {
-                this.GroupData.states[id].val = obj.val;
-                return obj.val;
+            const ai = getAdId(this.adapter, id);
+            const obj = await this.adapter.getObjectAsync(ai);
+            if (obj && obj.common.deactivated) return undefined;
+            const state = await this.adapter.getStateAsync(id);
+            if (state) {
+                this.GroupData.states[id].val = state.val;
+                return state.val;
             }
             return undefined;
         }
@@ -617,7 +615,7 @@ class Groups {
         // get all group id's from the database and the respective names from the local overrides (if present)
         const groups = await this.getGroups();
         const chain = [];
-        const usedGroupsIds = Object.keys(groups);
+        const usedGroupsIds = numericGroupIdArray.length > 0 ? Object.keys(groups) : [];
         for (const j in groups) {
             if (numericGroupIdArray.length > 0 && !numericGroupIdArray.includes(Number(j))) continue; // skip groups we didnt ask for
             this.debug(`Analysing group_${JSON.stringify(j)}`);
@@ -659,7 +657,7 @@ class Groups {
                     this.rebuildGroupMemberStateList(j, memberInfo);
                 }
 
-                const name = groups[j];
+                const name = this.stController.localConfig.NameForId(id, 'group', groups[j]);
                 const icon = this.stController.localConfig.IconForId(id, 'group', await this.stController.getDefaultGroupIcon(id));
                 chain.push(new Promise(resolve => {
                     const isActive = false;
@@ -668,7 +666,7 @@ class Groups {
                         common: {name: name, type: 'group', icon: icon },
                         native: {id: j}
                     }, () => {
-                        this.adapter.extendObject(id, {common: {type: 'group', icon: icon}});
+                        this.adapter.extendObject(id, {common: {name: name, type: 'group', icon: icon}});
                         // create writable states for groups from their devices
                         for (const stateInd in statesMapping.groupStates) {
                             if (!statesMapping.groupStates.hasOwnProperty(stateInd)) {

package/lib/localConfig.js

@@ -1,10 +1,8 @@
 'use strict';
 
-/*eslint no-unused-vars: ['off']*/
 const fs = require('fs');
 const path = require('path');
 const utils = require('@iobroker/adapter-core'); // Get common adapter utils
-// const { src } = require('gulp');
 
 const EventEmitter = require('events').EventEmitter;
 
@@ -20,7 +18,6 @@ class localConfig extends EventEmitter {
         this.adapter.on('ready', () => this.onReady());
     }
 
-
     async onReady()
     {
     }
@@ -116,9 +113,12 @@ class localConfig extends EventEmitter {
             this.error(`update called with illegal id data:${JSON.stringify(target)}:${JSON.stringify(key)}`)
             return false;
         }
-        const base = global ? this.localData.by_model[target] || {} : this.localData.by_id[target] || {};
         const rv = {};
-        if (base.hasOwnProperty(key)) rv[key] = base[key];
+        if ((this.localData.byModel[target] || {}).hasOwnProperty(key))
+            rv[key] = this.localData.byModel[target] || {}[key];
+        if (global) return rv;
+        if ((this.localData.by_id[_target] || {}).hasOwnProperty(key))
+            rv[key] = this.localData.by_id[_target] || {}[key];
         return rv;
     }
 
@@ -285,7 +285,7 @@ class localConfig extends EventEmitter {
     }
 
     async retainData() {
-        //this.warn('retaining local config: ' + JSON.stringify(this.localData));
+        this.debug('retaining local config: ' + JSON.stringify(this.localData));
         try {
             fs.writeFileSync(this.filename, JSON.stringify(this.localData, null, 2))
             this.info('Saved local configuration data');
@@ -304,7 +304,6 @@ class localConfig extends EventEmitter {
                 const fn = path.join(item.parentPath, item.name);
                 rv.push({file: fn, name: item.name, data: fs.readFileSync(path.join(item.parentPath, item.name), 'base64'), isBase64:true});
             });
-            //this.warn('enumerateImages for  ' + _path + ' is ' + JSON.stringify(rv));
         }
         catch (error) {
             this.error(`error in enumerateImages : ${error.message ? error.message : 'undefined error'}`)
@@ -312,13 +311,14 @@ class localConfig extends EventEmitter {
         return rv;
     }
 
-    getOptions(dev_id, model_id) {
+    getOptions(_dev_id, model_id) {
         function extractOptions(target, options) {
             if (typeof target != 'object') target = {};
             if (typeof options != 'object') return target;
             Object.keys(options).forEach((option) => target[option] = options[option]);
             return target;
         }
+        const dev_id = _dev_id.startsWith('0x') ? _dev_id.substring(2) : _dev_id
 
         const ld = this.localData.by_id[dev_id];
         const gd = this.localData.by_model[model_id];

package/lib/networkmap.js

@@ -4,6 +4,7 @@ class NetworkMap {
     constructor(adapter) {
         this.adapter = adapter;
         this.adapter.on('message', this.onMessage.bind(this));
+        this.mapdata = undefined;
     }
 
     start(zbController, stController) {
@@ -37,16 +38,23 @@ class NetworkMap {
             switch (obj.command) {
                 case 'getMap':
                     if (obj && obj.message && typeof obj.message === 'object') {
-                        this.getMap(obj.from, obj.command, obj.callback);
+                        this.getMap(obj.from, obj.command, obj.message, obj.callback);
                     }
                     break;
             }
         }
     }
 
-    getMap(from, command, callback) {
+    getMap(from, command, message, callback) {
+        if (message.forcebuild) this.mapdata = undefined;
+        if (this.mapdata) {
+            this.mapdata.errors = {};
+            this.adapter.sendTo(from, command, this.mapdata, callback)
+            return;
+        }
         if (this.zbController) {
             this.zbController.getMap(networkmap => {
+                this.mapdata = networkmap;
                 this.adapter.log.debug(`getMap result: ${JSON.stringify(networkmap)}`);
                 this.adapter.sendTo(from, command, networkmap, callback);
             });