iobroker.zigbee 1.6.8 → 1.6.12

package/lib/groups.js

@@ -115,34 +115,44 @@ class Groups {
                 this.adapter.sendTo(obj.from, obj.command, response, obj.callback);
 
         }
+        return response.groups;
     }
 
     async updateGroupMembership(from, command, message, callback) {
         try {
-            const groups = (message && message.groups ? message.groups : []);
+            const groups = (message && message.groups ? message.groups : {});
             const devId = (message && message.id ? message.id : undefined);
             if (devId === undefined) {
                 this.adapter.sendTo(from, command, {error: 'No device specified'}, callback);
             }
             const sysid = devId.replace(this.adapter.namespace + '.', '0x');
-            const id = `${devId}.groups`;
+            // Keeping this for reference. State update or state removal needs to be decided upon
+            //const id = `${devId}.groups`;
+            // this.adapter.setState(id, JSON.stringify(groups), true);
 
-            this.adapter.setState(id, JSON.stringify(groups), true);
-            let response = await this.zbController.removeDevFromAllGroups(sysid);
-            if (response && response.error)
-            {
-                this.adapter.sendTo(from, command, response, callback);
-                return;
-            }
-            for (const groupId of groups) {
-                response = await this.zbController.addDevToGroup(sysid, parseInt(groupId));
-                if (response && response.error)
-                {
-                    this.adapter.sendTo(from, command, response, callback);
-                    return;
+            //const current = await this.zbController.getGroupMembersFromController(sysid);
+            const errors = []
+            for (const epid in groups) {
+                for (const gpid of groups[epid]) {
+                    const gpidn = parseInt(gpid);
+                    if (gpidn < 0) {
+                        let response = await this.zbController.removeDevFromGroup(sysid,(-gpidn), epid);
+                        if (response && response.error) {
+                            errors.push(response.error);
+                            this.error("remove dev from group Error: "+ JSON.stringify(response.error));
+                        }
+                    }
+                    else if (gpidn > 0){
+                        let response = await this.zbController.addDevToGroup(sysid,(gpidn), epid);
+                        if (response && response.error) {
+                            errors.push(response.error);
+                            this.error("add dev to group Error: "+ JSON.stringify(response.error));
+                        }
+
+                    }
+                    else this.warn('illegal group id 0');
                 }
             }
-
         } catch (e) {
             this.adapter.sendTo(from, command, {error: e}, callback);
             return;
@@ -177,7 +187,6 @@ class Groups {
             }
         }
         if (result.unsupported.length>0) {
-            // this.warn('unsupported ' + stateDesc.id + ' change for group members ' + JSON.stringify(result.unsupported));
             const error = {
                 code: 134,
                 message: `unsupported ${stateDesc.id} change for group members ${result.unsupported.join()}`
@@ -255,7 +264,8 @@ class Groups {
     }
 
 
-    syncGroups(groups) {
+    async syncGroups(adapterGroups) {
+        const groups = await this.getGroups();
         const chain = [];
         const usedGroupsIds = [];
         for (const j in groups) {

package/lib/rgb.js

@@ -212,14 +212,44 @@ function colorArrayFromString(value) {
     return [{r:0,g:128,b:255}];
 }
 
+function colorStringFromRGBArray(payload)
+{
+    let rv = []
+    payload.forEach(element => {
+        rv.push(rgb_to_rgbstring(element));
+    });
+    return rv.toString();
+}
+
 function hsv_to_cie(h,s,v){
     const rgb = hsvToRGB(h,s,v);
     return rgb_to_cie(rgb.r, rgb.g, rgb.b);
 }
 
+function rgb_to_rgbstring(element) {
+    let col = '#';
+    if (element && element.hasOwnProperty("r"))
+      col = col + element.r.toString(16).padStart(2, '0');
+    else col = col + '00';
+    if (element && element.hasOwnProperty("g"))
+      col = col + element.g.toString(16).padStart(2, '0');
+    else col = col + '00';
+    if (element && element.hasOwnProperty("b"))
+      col = col + element.b.toString(16).padStart(2, '0');
+    else col = col + '00';
+    return col;
+}
+
+
+function hsvToRGBString(h,s,v) {
+    return rgb_to_rgbstring(hsvToRGB(h,s,v))
+}
+
 exports.hsv_to_cie = hsv_to_cie;
 exports.rgb_to_cie = rgb_to_cie;
 exports.cie_to_rgb = cie_to_rgb;
 exports.hsvToRGB = hsvToRGB;
 exports.rgbToHSV = rgbToHSV;
 exports.colorArrayFromString = colorArrayFromString;
+exports.colorStringFromRGBArray = colorStringFromRGBArray;
+exports.hsvToRGBString = hsvToRGBString;

package/lib/states.js

@@ -4547,10 +4547,11 @@ const states = {
         name: 'Button ROW 2',
         icon: undefined,
         role: 'button',
-        write: false,
+        write: true,
         read: true,
         type: 'boolean',
         getter: payload => (payload.action === 'row_2_on') ? true : (payload.action === 'row_2_off') ? false : undefined,
+        setter: (value) => (value) ? 'row_2_on' : 'row_2_off',
     },
     rm01_row_3: {
         id: 'rm01_row_3',
@@ -4558,10 +4559,11 @@ const states = {
         name: 'Button ROW 3',
         icon: undefined,
         role: 'button',
-        write: false,
+        write: true,
         read: true,
         type: 'boolean',
         getter: payload => (payload.action === 'row_3_on') ? true : (payload.action === 'row_3_off') ? false : undefined,
+        setter: (value) => (value) ? 'row_3_on' : 'row_3_off',
     },
     rm01_row_4: {
         id: 'rm01_row_4',
@@ -4569,10 +4571,11 @@ const states = {
         name: 'Button ROW 4',
         icon: undefined,
         role: 'button',
-        write: false,
+        write: true,
         read: true,
         type: 'boolean',
         getter: payload => (payload.action === 'row_4_on') ? true : (payload.action === 'row_4_off') ? false : undefined,
+        setter: (value) => (value) ? 'row_4_on' : 'row_4_off',
     },
     left_top_click: {
         id: 'left_top_click',
@@ -5800,16 +5803,21 @@ const states = {
                 speed:10,
                 effect:'glow',
             };
-            if (options.hasOwnProperty('effect_speed'))
+            if (options && options.hasOwnProperty('effect_speed'))
                 effectjson.speed = options.effect_speed;
-            if (options.hasOwnProperty('effect_colors'))
+            if (options && options.hasOwnProperty('effect_colors'))
             {
                 effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
             }
             effectjson.effect = value;
             return effectjson;
+        },
+        getter: (payload) => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('effect')) return payload.effect.effect;
+            return "steady";
         }
-    },
+
+     },
     effect_json: {
         id: 'effect_json',
         name: 'Effect',
@@ -5829,11 +5837,11 @@ const states = {
                     speed:10,
                     effect:'glow',
                 };
-                if (options.hasOwnProperty('effect_speed'))
+                if (options && options.hasOwnProperty('effect_speed'))
                     effectjson.speed = options.effect_speed;
-                if (options.hasOwnProperty('effect_colors'))
+                if (options && options.hasOwnProperty('effect_colors'))
                     effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
-                if (options.hasOwnProperty('effect_type'))
+                if (options && options.hasOwnProperty('effect_type'))
                     effectjson.effect = options.effect_type;
                 value = JSON.stringify(effectjson);
                 return effectjson;
@@ -5859,12 +5867,16 @@ const states = {
                 speed:10,
                 effect:'snake',
             };
-            if (options.hasOwnProperty('effect_type'))
+            if (options && options.hasOwnProperty('effect_type'))
                 effectjson.effect = options.effect_type;
-            if (options.hasOwnProperty('effect_colors'))
+            if (options && options.hasOwnProperty('effect_colors'))
                 effectjson.colors = rgb.colorArrayFromString(options.effect_colors);
             effectjson.speed = value;
             return effectjson;
+        },
+        getter: (payload) => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('speed')) return payload.effect.speed;
+            return 1;
         }
     },
 
@@ -5885,12 +5897,16 @@ const states = {
                 effect:'sparkle',
             };
 
-            if (options.hasOwnProperty('effect_speed'))
+            if (options && options.hasOwnProperty('effect_speed'))
                 effectjson.speed = options.effect_speed;
-            if (options.hasOwnProperty('effect_type'))
+            if (options && options.hasOwnProperty('effect_type'))
                 effectjson.effect = options.effect_type;
             effectjson.colors = rgb.colorArrayFromString(value);
             return effectjson;
+        },
+        getter: (payload) => {
+            if (payload && payload.effect && payload.effect.hasOwnProperty('colors')) return rgb.colorStringFromRGBArray(payload.effect.colors);
+            return '#ffff00,#ff00ff,#00ffff,#0000ff,#00ff00,#ff0000';
         }
     },
 
@@ -5925,6 +5941,15 @@ const states = {
 
             };
         },
+        getter: (payload) => {
+            if (payload.color) {
+                const c = payload.color;
+                if (c.hasOwnProperty("h") && c.hasOwnProperty("s") && c.hasOwnProperty("b"))
+                  return rgb.hsvToRGBString(c.h, c.s, c.b * 100 / 255);
+                if (c.hasOwnProperty("h") && c.hasOwnProperty("s") && c.hasOwnProperty("v"))
+                  return rgb.hsvToRGBString(c.h, c.s, c.v * 100);
+            }
+        },
         setterOpt: (value, options) => {
             const hasTransitionTime = options && options.hasOwnProperty('transition_time');
             const transitionTime = hasTransitionTime ? options.transition_time : 0;

package/lib/statescontroller.js

@@ -4,6 +4,7 @@ const EventEmitter = require('events').EventEmitter;
 const statesMapping = require('./devices');
 const getAdId = require('./utils').getAdId;
 const getZbId = require('./utils').getZbId;
+var knownUndefinedDevices = {};
 
 
 class StatesController extends EventEmitter {
@@ -55,8 +56,20 @@ class StatesController extends EventEmitter {
                 });
             }
         });
-
+        this.adapter.setObject('info.undefinedDevices', {
+            'type': 'state',
+            'common': {
+                'name': 'Recorded undefined devices',
+                'role': '',
+                'type': 'string',
+                'read': true,
+                'write': false,
+            },
+            'native': {},
+        });
+        this.adapter.setStateAsync(`info.undefinedDevices`, JSON.stringify(knownUndefinedDevices), true);
     }
+
     onStateChange(id, state){
         if (!this.adapter.zbController || !this.adapter.zbController.connected()) return;
         if (this.debugDevices === undefined) this.getDebugDevices();
@@ -116,20 +129,25 @@ class StatesController extends EventEmitter {
             return;
         }
         let cnt = 0;
-        const len = states.length;
-        states.forEach(statedesc => {
-            const id = this.adapter.namespace + '.' + devId + '.' + statedesc.id;
-            this.adapter.getState(id, (err, state) => {
-                cnt = cnt + 1;
-                if (!err && state) {
-                    result[statedesc.id] = state.val;
-                }
-                if (cnt === len) {
-                    callback(result);
-                }
+        try {
+            const len = states.length;
+            states.forEach(statedesc => {
+                const id = this.adapter.namespace + '.' + devId + '.' + statedesc.id;
+                this.adapter.getState(id, (err, state) => {
+                    cnt = cnt + 1;
+                    if (!err && state) {
+                        result[statedesc.id] = state.val;
+                    }
+                    if (cnt === len) {
+                        callback(result);
+                    }
+                });
             });
-        });
-        if (!len) callback(result);
+            if (!len) callback(result);
+         } catch (error) {
+            this.sendError(error);
+            this.error(`Error collectOptions for ${devId}. Error: ${error.stack}`);
+         }
     }
 
     async getDevStates(deviceId, model) {
@@ -141,7 +159,15 @@ class StatesController extends EventEmitter {
             } else {
                 stateModel = statesMapping.findModel(model);
                 if (!stateModel) {
-                    this.error('Device ' + deviceId + ' "' + model + '" not described in statesMapping.');
+                    if (knownUndefinedDevices[deviceId])
+                    {
+                        knownUndefinedDevices[deviceId]++;
+                    }
+                    else {
+                        knownUndefinedDevices[deviceId] = 1;
+                        this.error('Device ' + deviceId + ' "' + model + '" not described in statesMapping.');
+                    }
+                    this.adapter.setStateAsync(`info.undefinedDevices`, JSON.stringify(knownUndefinedDevices), true);
                     states = statesMapping.commonStates;
                 } else {
                     states = stateModel.states;
@@ -343,13 +369,10 @@ class StatesController extends EventEmitter {
                     // only change object when any common property has changed
                     if (hasChanges) {
                         this.adapter.extendObject(id, {type: 'state', common: new_common, native: {} }, () => {
-                            value !== undefined && this.adapter.setState(id, value, true);
+                            value !== undefined && this.setState_typed(id, value, true, (stobj) ? stobj.common.type : new_common.type);
                         });
                     } else if (value !== undefined) {
-                        if (typeof(value) !== 'object') {
-                            this.adapter.setState(id, value, true);
-                        } else this.warn('set state with object for id :' + JSON.stringify(id) + ' '+ JSON.stringify(value));
-
+                        this.setState_typed(id, value, true, stobj.common.type);
                     }
 
                 });
@@ -359,6 +382,44 @@ class StatesController extends EventEmitter {
         });
     }
 
+    setState_typed(id, value, ack, type, callback)
+    {
+        // never set a null or undefined value
+        if (value === null || value === undefined) return;
+        if (!type) {
+            this.debug("SetState_typed called without type");
+            // identify datatype, recursively call this function with set datatype
+            this.adapter.getObject(id, (err, obj) => {
+                if (obj && obj.common)
+                   this.setState_typed(id, value, ack, obj.common.type, callback);
+                else {
+                    this.setState_typed(id, value, ack, 'noobj', callback);
+                }
+            });
+            return;
+        }
+        if (typeof value != type) {
+            this.debug("SetState_typed : converting " + JSON.stringify(value) + " for " + id + " from " + typeof value + " to " + type);
+            switch (type) {
+                case 'number':
+                    value = parseFloat(value);
+                    if (isNaN (value)) value = 0;
+                    break;
+                case 'string':
+                case 'text': value = JSON.stringify(value); break;
+                case 'boolean':
+                    if (typeof value == 'number') {
+                        value = (value != 0);
+                        break;
+                    }
+                    const sval = JSON.stringify(value).toLowerCase().trim();
+                    value = (sval == 'true' || sval == 'yes' || sval == 'on');
+                    break;
+            }
+        }
+        this.adapter.setState(id, value, ack, callback);
+    }
+
     updateDev(dev_id, dev_name, model, callback) {
         const id = '' + dev_id;
         const modelDesc = statesMapping.findModel(model);
@@ -432,6 +493,7 @@ class StatesController extends EventEmitter {
         for (const addressPart of this.debugDevices) {
             if (typeof(devId) == 'string' && devId.indexOf(addressPart) > -1)
             {
+                if (payload.hasOwnProperty('msg_from_zigbee')) break;
                 this.warn(`ELEVATED publishToState: message received '${JSON.stringify(payload)}' from device ${devId} type '${model}'`);
                 has_debug = true;
                 break;
@@ -454,10 +516,10 @@ class StatesController extends EventEmitter {
                     value = payload[statedesc.prop || statedesc.id];
                 }
                 // checking value
-                if (value === undefined) continue;
+                if (value === undefined || value === null) continue;
                 let stateID = statedesc.id;
 
-                if (has_debug) {
+                if (has_debug && statedesc.id != 'msg_from_zigbee') {
                     this.warn(`ELEVATED publishToState: value generated '${JSON.stringify(value)}' from device ${devId} for '${statedesc.name}'`);
                 }
 

package/lib/zbBaseExtension.js

@@ -5,6 +5,7 @@
 class BaseExtension {
     constructor(zigbee, options) {
         this.zigbee = zigbee;
+        this.name = 'BaseExtension';
     }
 
     info(message, data) {
@@ -12,15 +13,15 @@ class BaseExtension {
     }
 
     error(message, data) {
-        this.zigbee.error(message, data);
+        this.zigbee.error(this.name + ':' + message, data);
     }
 
     warn(message, data) {
-        this.zigbee.warn(message, data);
+        this.zigbee.warn(this.name + ':' + message, data);
     }
 
     debug(message, data) {
-        this.zigbee.debug(message, data);
+        this.zigbee.debug(this.name + ':' + message, data);
     }
 
     sendError(error, message) {

package/lib/zbDelayedAction.js

@@ -8,6 +8,7 @@ class DelayedAction extends BaseExtension {
 
         this.actions = {};
         this.zigbee.delayAction = this.delayAction.bind(this);
+        this.name = "DelayedAction";
     }
 
     setOptions(options) {

package/lib/zbDeviceAvailability.js

@@ -50,6 +50,7 @@ class DeviceAvailability extends BaseExtension {
         this.startDevicePingQueue = []; // simple fifo array for starting device pings
         this.startDevicePingTimeout = null; // handle for the timeout which empties the queue
         this.startDevicePingDelay = 200; // 200 ms delay between starting the ping timeout
+        this.name = "DeviceAvailability";
     }
 
     setOptions(options) {
@@ -265,7 +266,7 @@ class DeviceAvailability extends BaseExtension {
         //    }
         }
     }
-    
+
     onZigbeeEvent(data) {
         const device = data.device;
         if (!device) {

package/lib/zbDeviceConfigure.js

@@ -18,6 +18,7 @@ class DeviceConfigure extends BaseExtension {
 
         this.configuring = new Set();
         this.attempts = {};
+        this.name = "DeviceConfigure";
     }
 
     setOptions(options) {
@@ -119,13 +120,8 @@ class DeviceConfigure extends BaseExtension {
             if (!this.attempts.hasOwnProperty(device.ieeeAddr)) {
                 this.attempts[device.ieeeAddr] = 0;
             }
-
-            this.info(`Configuring ${device.ieeeAddr} ${device.modelID}`);
             try {
-                await mappedDevice.configure(device, this.coordinatorEndpoint);
-                this.info(`DeviceConfigure successful ${device.ieeeAddr} ${device.modelID}`);
-                device.meta.configured = zigbeeHerdsmanConverters.getConfigureKey(mappedDevice);
-                device.save();
+                await this.doConfigure(device, mappedDevice);
             } catch (error) {
                 this.sendError(error);
                 this.warn(
@@ -134,7 +130,6 @@ class DeviceConfigure extends BaseExtension {
                 );
                 this.attempts[device.ieeeAddr]++;
             }
-
             this.configuring.delete(device.ieeeAddr);
         } catch (error) {
             this.sendError(error);
@@ -143,6 +138,15 @@ class DeviceConfigure extends BaseExtension {
             );
         }
     }
+
+    async doConfigure(device, mappedDevice) {
+        this.info(`Configuring ${device.ieeeAddr} ${device.modelID}`);
+        const coordinatorEndpoint = await this.zigbee.getDevicesByType('Coordinator')[0].endpoints[0];
+        await mappedDevice.configure(device, coordinatorEndpoint);
+        device.meta.configured = zigbeeHerdsmanConverters.getConfigureKey(mappedDevice);
+        device.save();
+        this.info(`DeviceConfigure successful ${device.ieeeAddr} ${device.modelID}`);
+    }
 }
 
 module.exports = DeviceConfigure;

package/lib/zbDeviceEvent.js

@@ -4,6 +4,12 @@ const BaseExtension = require('./zbBaseExtension');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 
 class DeviceEvent extends BaseExtension {
+    constructor(zigbee, options) {
+        super(zigbee, options);
+        this.name = "DeviceEvent";
+    }
+
+
     async onZigbeeStarted() {
         for (const device of await this.zigbee.getClients()) {
             this.callOnEvent(device, 'start', {});