iobroker.zigbee 3.0.5 → 3.1.4

package/lib/developer.js

@@ -106,13 +106,13 @@ class Developer {
         const cfg = obj.message.hasOwnProperty('cfg') ? obj.message.cfg : null;
         let publishTarget;
         try {
-            publishTarget = this.zbController.getDevice(devId) ? devId : this.zbController.getGroup(parseInt(devId));
+            publishTarget = await this.zbController.getDevice(devId) ? devId : await this.zbController.getGroup(parseInt(devId));
             if (!publishTarget) {
                 this.adapter.sendTo(obj.from, obj.command, {localErr: `Device or group ${devId} not found!`}, obj.callback);
                 return;
             }
         } catch (error) {
-            this.error(`SendToZigbee failed from publishTarget ${devId} (${error})`);
+            this.error(`SendToZigbee failed from publishTarget ${devId} (${error && error.message ? error.message : 'no details given'})`);
         }
 
         if (!cid || !cmd) {

package/lib/devices.js

@@ -3,7 +3,7 @@
 const states = require('./states.js').states;
 const utils = require('./utils.js');
 const rgb = require('./rgb.js');
-const {applyExposes, applyExposeForDevice} = require('./exposes.js');
+const { applyExposeForDevice} = require('./exposes.js');
 
 
 // return list of changing states when incoming state is changed
@@ -119,11 +119,12 @@ const sync = {
     },
 };
 
-const lightStatesWithColortemp = [states.state, states.brightness, states.colortemp, states.brightness_move, states.colortemp_move, states.transition_time];
-const lightStatesWithColor = [states.state, states.brightness, states.colortemp, states.color, states.brightness_move, states.colortemp_move, states.transition_time];
-const lightStatesWithColor_hue = [states.state, states.brightness, states.colortemp, states.color, states.brightness_move, states.colortemp_move, states.hue_move, states.transition_time, states.effect_type_hue];
-const lightStatesWithColorNoTemp = [states.state, states.brightness, states.color, states.brightness_move, states.transition_time];
-const lightStates = [states.state, states.brightness, states.brightness_move, states.transition_time];
+const lightStates = [states.state, states.brightness, states.brightness_move, states.transition_time, states.brightness_step];
+const lightStatesWithColortemp = [...lightStates, states.colortemp, states.colortemp_move];
+const lightStatesWithColor = [...lightStatesWithColortemp, states.color];
+const lightStatesWithColor_hue = [...lightStatesWithColor, states.hue_move, states.transition_time, states.effect_type_hue];
+const lightStatesWithColorNoTemp = [...lightStates, states.color];
+const onOffStates = [states.state];
 
 const gl_lightStatesWithColor = [states.gl_state, states.gl_brightness, states.gl_colortemp, states.gl_color, states.transition_time];
 const gl_white_channel = [states.white_brightness, states.white_state, states.white_colortemp];
@@ -3072,7 +3073,7 @@ const commonStates = [
 const DevicesByModel = new Map();
 const LegacyDevicesByModel = new Map();
 
-const groupStates = [states.brightness_step].concat(lightStatesWithColor);
+const groupStates = [states.groupstateupdate, states.groupmemberupdate, states.brightness_step].concat(lightStatesWithColor);
 
 function getByModel() {
     DevicesByModel.clear();
@@ -3104,7 +3105,7 @@ function fillStatesWithExposes(logger) {
 async function addExposeToDevices(device, logger, model) {
     const s = DevicesByModel.size;
     if (s < 1) getByModel();
-    const rv = await applyExposeForDevice(devices, DevicesByModel, device, logger, model);
+    const rv = await applyExposeForDevice(devices, DevicesByModel, device, { logger, model, newCompositeMethod:true });
     removeEmptyStates(devices);
     return rv;
 }
@@ -3171,8 +3172,11 @@ module.exports = {
     devices,
     legacy_devices,
     commonStates,
+    commonGroupStates: [...commonStates, states.groupmemberupdate, states.groupstateupdate],
     groupStates,
-    groupsState: states.groups,
+    lightStatesWithColor,
+    onOffStates,
+    lightStates,
     fillStatesWithExposes,
     addExposeToDevices,
     getByModel,

package/lib/exclude.js

@@ -91,7 +91,7 @@ class Exclude {
 
     async addExclude(from, command, params, callback) {
         try {
-            //this.warn('addExclude message: ' + JSON.stringify(params));
+            this.debug('addExclude message: ' + JSON.stringify(params));
             const exclude_mod = params.exclude_model.common.type;
             this.localConfig.updateLocalOverride(exclude_mod, exclude_mod, 'legacy', exclude_mod, true);
             callback({});

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) {
@@ -412,6 +412,8 @@ function createFromExposes(model, def, device, log) {
                             return {...options, transition: transitionTime};
                         },
                         getter: payload => {
+                            // Requires testing!
+
                             try {
                                 // JSON
                                 const colorJSON = JSON.parse(payload.replaceAll("'",'"'));
@@ -817,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
@@ -829,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);
                     }
@@ -892,6 +920,7 @@ function createFromExposes(model, def, device, log) {
                     }
                 }
                 break;
+            }
             case 'list':
                 // is not mapped
                 //     for (const prop of expose) {
@@ -907,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;