iobroker.zigbee 1.8.0 → 1.8.3

package/lib/devices.js

@@ -1,9 +1,9 @@
 'use strict';
 
-const states = require('./states.js').states;
-const utils = require('./utils.js');
-const rgb = require('./rgb.js');
-const applyExposes = require('./exposes.js').applyExposes;
+const states = require(__dirname + '/states.js').states;
+const utils = require(__dirname + '/utils.js');
+const rgb = require(__dirname + '/rgb.js');
+const applyExposes = require(__dirname + '/exposes.js').applyExposes;
 
 
 // return list of changing states when incoming state is changed
@@ -23,7 +23,7 @@ const comb = {
                         // index: -1, // before main change
                         // timeout: 0,
                         index: 1, // after main change
-                        timeout,
+                        timeout: timeout,
                     }];
                 }
             } else if (disableQueue || options.state) {
@@ -32,7 +32,7 @@ const comb = {
                     stateDesc: states.state,
                     value: false,
                     index: 1, // after main change
-                    timeout,
+                    timeout: timeout,
                 }];
             }
         }
@@ -42,22 +42,20 @@ const comb = {
         if (state.id === states.effect_json.id) {
             const effectjson = {};
             try {
-                if (options.hasOwnProperty('effect_speed')) {
+                if (options.hasOwnProperty('effect_speed'))
                     effectjson.speed = options.effect_speed;
-                }
-                if (options.hasOwnProperty('effect_type')) {
+                if (options.hasOwnProperty('effect_type'))
                     effectjson.effect = options.effect_type;
-                }
-                if (options.hasOwnProperty('effect_colors')) {
+
+                if (options.hasOwnProperty('effect_colors'))
                     effectjson.colors = rgb.colorsArrayFromString(options.effect_colors);
-                }
                 //               effectjson = JSON.parse(value);
             }
             catch {
                 const effectjson = {
-                    colors: [{r: 255, g: 0, b: 0}, {r: 0, g: 255, b: 0}, {r: 0, g: 0, b: 255}],
-                    speed: 10,
-                    effect: 'glow',
+                    colors:[{r: 255,g: 0,b: 0},{r: 0,g: 255,b: 0},{r: 0,g: 0,b: 255}],
+                    speed:10,
+                    effect:'glow',
                 };
                 if (options.hasOwnProperty('effect_speed'))
                     effectjson.speed = options.effect_speed;
@@ -133,30 +131,29 @@ const freepad_states = [states.battery];
 
 function getKey(object, value) {
     for (const key in object) {
-        if (object[key] == value) {
-            return key;
-        }
+        if (object[key]==value) return key;
     }
 }
 
 const unitLookup = {
     'temperature': 'C',
-    'humidity': '%',
-    'altitude': 'm',
-    'pressure': 'Pa',
-    'quality': 'ppm',
-    'particle_size': 'psize',
-    'voltage': 'V',
-    'current': 'A',
-    'energy': 'Wh',
-    'power': 'W',
-    'frequency': 'Hz',
-    'power_factor': 'pf',
-    'illuminance_lux': 'lx',
+    'humidity':'%',
+    'altitude':'m',
+    'pressure':'Pa',
+    'quality':'ppm',
+    'particle_size':'psize',
+    'voltage':'V',
+    'current':'A',
+    'energy':'Wh',
+    'power':'W',
+    'frequency':'Hz',
+    'power_factor':'pf',
+    'illuminance_lux':'lx',
+
 };
 
 const generator = {
-    gledopto: entity => {
+    gledopto: (entity) => {
         if (entity.mapped.model === 'GL-C-008-2ID') {
             return gl_lightStatesWithColor.concat(gl8_white_channel);
         } else if (entity.mapped.model === 'GL-C-007-2ID') {
@@ -165,75 +162,86 @@ const generator = {
             return lightStatesWithColor;
         }
     },
-    freepad: entity => {
+    freepad: (entity) => {
         const freepad_st = [];
         const ecount = entity.device.endpoints.length;
         for (let i = 1; i <= ecount; i++) {
-            freepad_st.push({
-                id: `btn${i}_single`,
-                prop: 'action',
-                name: `Button ${i} click event`,
-                icon: undefined,
-                role: 'button',
-                write: false,
-                read: true,
-                type: 'boolean',
-                isEvent: true,
-                getter: payload => (payload.action === `button_${i}_single`) ? true : undefined,
-            });
-            freepad_st.push({
-                id: `btn${i}_double`,
-                prop: 'action',
-                name: `Button ${i} double click event`,
-                icon: undefined,
-                role: 'button',
-                write: false,
-                read: true,
-                type: 'boolean',
-                isEvent: true,
-                getter: payload => (payload.action === `button_${i}_double`) ? true : undefined,
-            });
-            freepad_st.push({
-                id: `btn${i}_hold`,
-                prop: 'action',
-                name: `Button ${i} hold`,
-                icon: undefined,
-                role: 'button',
-                write: false,
-                read: true,
-                type: 'boolean',
-                getter: payload => (payload.action === `button_${i}_hold`) ? true : (payload.action === `button_${i}_release`) ? false : undefined,
-            });
-            freepad_st.push({
-                id: `btn${i}_triple`,
-                prop: 'action',
-                name: `Button ${i} triple click event`,
-                icon: undefined,
-                role: 'button',
-                write: false,
-                read: true,
-                type: 'boolean',
-                isEvent: true,
-                getter: payload => (payload.action === `button_${i}_triple`) ? true : undefined,
-                lazy: true,
-            });
-            freepad_st.push({
-                id: `btn${i}_quadruple`,
-                prop: 'action',
-                name: `Button ${i} quadruple click event`,
-                icon: undefined,
-                role: 'button',
-                write: false,
-                read: true,
-                type: 'boolean',
-                isEvent: true,
-                getter: payload => (payload.action === `button_${i}_quadruple`) ? true : undefined,
-                lazy: true,
-            });
+            freepad_st.push(
+                {
+                    id: `btn${i}_single`,
+                    prop: 'action',
+                    name: `Button ${i} click event`,
+                    icon: undefined,
+                    role: 'button',
+                    write: false,
+                    read: true,
+                    type: 'boolean',
+                    isEvent: true,
+                    getter: payload => (payload.action === `button_${i}_single`) ? true : undefined,
+                }
+            );
+            freepad_st.push(
+                {
+                    id: `btn${i}_double`,
+                    prop: 'action',
+                    name: `Button ${i} double click event`,
+                    icon: undefined,
+                    role: 'button',
+                    write: false,
+                    read: true,
+                    type: 'boolean',
+                    isEvent: true,
+                    getter: payload => (payload.action === `button_${i}_double`) ? true : undefined,
+                }
+            );
+            freepad_st.push(
+                {
+                    id: `btn${i}_hold`,
+                    prop: 'action',
+                    name: `Button ${i} hold`,
+                    icon: undefined,
+                    role: 'button',
+                    write: false,
+                    read: true,
+                    type: 'boolean',
+                    getter: payload => (payload.action === `button_${i}_hold`) ? true : (payload.action === `button_${i}_release`) ? false : undefined,
+                }
+            );
+            freepad_st.push(
+                {
+                    id: `btn${i}_triple`,
+                    prop: 'action',
+                    name: `Button ${i} triple click event`,
+                    icon: undefined,
+                    role: 'button',
+                    write: false,
+                    read: true,
+                    type: 'boolean',
+                    isEvent: true,
+                    getter: payload => (payload.action === `button_${i}_triple`) ? true : undefined,
+                    lazy: true,
+                }
+            );
+            freepad_st.push(
+                {
+                    id: `btn${i}_quadruple`,
+                    prop: 'action',
+                    name: `Button ${i} quadruple click event`,
+                    icon: undefined,
+                    role: 'button',
+                    write: false,
+                    read: true,
+                    type: 'boolean',
+                    isEvent: true,
+                    getter: payload => (payload.action === `button_${i}_quadruple`) ? true : undefined,
+                    lazy: true,
+                }
+            );
+
         }
         return freepad_states.concat(freepad_st);
     },
-    ptvo_switch_channels: entity =>{
+    ptvo_switch_channels: (entity) =>{
         const devstates = [states.ptvo_trigger,states.ptvo_interval];
         for (const endpoint of entity.device.endpoints) {
             const epID = endpoint.ID;
@@ -261,9 +269,7 @@ const generator = {
 
                     if (payload.hasOwnProperty(`device_${epName}`)) {
                         id = (typeof(payload[`device_${epName}`]) == 'string' ? payload[`device_${epName}`].replace(/[-. ]/g, ''):'unset');
-                    } else if (payload.hasOwnProperty(`voltage_${epName}`)) {
-                        id = 'voltage';
-                    }
+                    } else if (payload.hasOwnProperty(`voltage_${epName}`)) id = 'voltage';
                     let unit = undefined;
                     let measurement = undefined;
                     for (const item in payload) {
@@ -277,12 +283,12 @@ const generator = {
                             }
                         }
                     }
-                    if (measurement && id !== 'voltage')
-                        rv.stateid = `${id}_${measurement}`;
+                    if (measurement && id != 'voltage')
+                        rv.stateid = id + '_'+measurement;
                     else
                         rv.stateid = id;
                     rv.value = payload[epName];
-                    rv.name = measurement? `${measurement} 0x${id}`: `0x${id}`;
+                    rv.name = (measurement? measurement + ' 0x'+ id: '0x'+id);
                     rv.unit = unit;
                     rv.role = measurement;
 
@@ -300,8 +306,8 @@ const generator = {
                     write: true,
                     read: true,
                     type: 'boolean',
-                    getter: payload => payload[`state_${epName}`] === 'ON',
-                    setter: value => value ? 'ON' : 'OFF',
+                    getter: payload => (payload[`state_${epName}`] === 'ON'),
+                    setter: (value) => (value) ? 'ON' : 'OFF',
                     epname: epName,
                     setattr: 'state',
                 });
@@ -317,7 +323,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => payload.action === `single_${epName}` ? true : undefined,
+                    getter: payload => (payload.action === `single_${epName}`) ? true : undefined,
                 });
                 devstates.push({
                     id: `channel_${epID}.double`,
@@ -329,7 +335,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => payload.action === `double_${epName}` ? true : undefined,
+                    getter: payload => (payload.action === `double_${epName}`) ? true : undefined,
                 });
                 devstates.push({
                     id: `channel_${epID}.tripple`,
@@ -341,7 +347,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => payload.action === `tripple_${epName}` ? true : undefined,
+                    getter: payload => (payload.action === `tripple_${epName}`) ? true : undefined,
                 });
             }
             if (endpoint.supportsOutputCluster('genLevelCtrl')) {
@@ -356,8 +362,12 @@ const generator = {
                     unit: '',
                     min: 0,
                     max: 100,
-                    getter: payload => utils.bulbLevelToAdapterLevel(payload[`brightness_${epName}`]),
-                    setter: value => utils.adapterLevelToBulbLevel(value),
+                    getter: payload => {
+                        return utils.bulbLevelToAdapterLevel(payload[`brightness_${epName}`]);
+                    },
+                    setter: (value) => {
+                        return utils.adapterLevelToBulbLevel(value);
+                    },
                     epname: epName,
                     setattr: 'brightness',
                 });
@@ -376,7 +386,9 @@ const generator = {
                     getter: payload => { //l3=0  brightness_l3=0
                         return payload[`${epName}`];  //return payload[`brightness_${epName}`];
                     },
-                    setter: value => value,
+                    setter: (value) => {
+                        return value;
+                    },
                     epname: epName
                 });
             }
@@ -426,15 +438,9 @@ const generator = {
                 read: true,
                 type: 'boolean',
                 getter: payload => {
-                    if ((payload.action_group % ecount) != (epidx % ecount)) {
-                        return undefined;
-                    }
-                    if (payload.action === 'brightness_move_up') {
-                        return true;
-                    }
-                    if (payload.action === 'brightness_stop') {
-                        return false;
-                    }
+                    if ((payload.action_group % ecount) != (epidx % ecount)) return undefined;
+                    if (payload.action == 'brightness_move_up') return true;
+                    if (payload.action == 'brightness_stop') return false;
                     return undefined;
                 },
             });
@@ -448,15 +454,9 @@ const generator = {
                 read: true,
                 type: 'boolean',
                 getter: payload => {
-                    if ((payload.action_group % ecount) != (epidx % ecount)) {
-                        return undefined;
-                    }
-                    if (payload.action === 'brightness_move_down') {
-                        return true;
-                    }
-                    if (payload.action === 'brightness_stop') {
-                        return false;
-                    }
+                    if ((payload.action_group % ecount) != (epidx % ecount)) return undefined;
+                    if (payload.action == 'brightness_move_down') return true;
+                    if (payload.action == 'brightness_stop') return false;
                     return undefined;
                 },
             });
@@ -502,8 +502,8 @@ const generator = {
                     write: true,
                     read: true,
                     type: 'boolean',
-                    getter: payload => payload[`state_${epName}`] === 'ON',
-                    setter: value => value ? 'ON' : 'OFF',
+                    getter: payload => (payload[`state_${epName}`] === 'ON'),
+                    setter: (value) => (value) ? 'ON' : 'OFF',
                     epname: epName,
                     setattr: 'state',
                 });
@@ -519,7 +519,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => payload.action === `single_${epName}` ? true : undefined,
+                    getter: payload => (payload.action === `single_${epName}`) ? true : undefined,
                 });
                 devstates.push({
                     id: `btn_${epID}_double`,
@@ -531,7 +531,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => payload.action === `double_${epName}` ? true : undefined,
+                    getter: payload => (payload.action === `double_${epName}`) ? true : undefined,
                 });
                 devstates.push({
                     id: `btn_${epID}_tripple`,
@@ -543,7 +543,7 @@ const generator = {
                     read: true,
                     type: 'boolean',
                     isEvent: true,
-                    getter: payload => payload.action === `tripple_${epName}` ? true : undefined,
+                    getter: payload => (payload.action === `tripple_${epName}`) ? true : undefined,
                 });
             }
             if (endpoint.supportsOutputCluster('genLevelCtrl')) {
@@ -558,8 +558,12 @@ const generator = {
                     unit: '',
                     min: 0,
                     max: 100,
-                    getter: payload => utils.bulbLevelToAdapterLevel(payload[`brightness_${epName}`]),
-                    setter: value => utils.adapterLevelToBulbLevel(value),
+                    getter: payload => {
+                        return utils.bulbLevelToAdapterLevel(payload[`brightness_${epName}`]);
+                    },
+                    setter: (value) => {
+                        return utils.adapterLevelToBulbLevel(value);
+                    },
                     epname: epName,
                     setattr: 'brightness',
                 });
@@ -820,7 +824,7 @@ const devices = [
         models: ['ZNCLDJ11LM'],
         icon: 'img/aqara_curtain.png',
         states: [states.curtain_position, states.curtain_running, states.curtain_stop, states.curtain_xiaomi_reverse_direction,
-            states.curtain_xiaomi_reset_limits, states.curtain_xiaomi_hand_open],
+        states.curtain_xiaomi_reset_limits, states.curtain_xiaomi_hand_open],
     },
     {
         models: ['WXCJKG11LM'],
@@ -3040,7 +3044,7 @@ const devices = [
         states: generator.icasa_remote,
     },
 
-    /* ------------ images only for admin ------------------- */
+ /*    images only for admin                */
     {
         models: ['E1812'],
         icon: 'img/ikea_E1812.png',
@@ -3071,12 +3075,13 @@ const devices = [
     },
     {
         models: ['TI0001-cover'],
-        icon: 'img/TI0001-cover.png',
+		icon: 'img/TI0001-cover.png',
     },
     {
         models: ['E1603/E1702/E1708'],
         icon: 'img/ikea_control_outlet.png',
     },
+
 ];
 
 const commonStates = [
@@ -3089,11 +3094,12 @@ const commonStates = [
 
 const groupStates = [states.brightness_step].concat(lightStatesWithColor);
 
+
 function getByModel() {
     const byModel = new Map();
     for (const device of devices) {
         for (const model of device.models) {
-            const stripModel = model.replace(/0.*$/g, '').trim();
+            const stripModel = model.replace(/\0.*$/g, '').trim();
             byModel.set(stripModel, device);
         }
     }
@@ -3115,22 +3121,25 @@ function fillStatesWithExposes(allExcludesObj) {
 function removeEmptyStates(devices) {
     for (const device of devices) {
         if (Array.isArray(device.states)) {
-            device.states = device.states.filter(el => el !== undefined);
+            device.states = device.states.filter((el) => el !== undefined);
         }
     }
 }
 
+
 function findModel(model) {
     const byModel = getByModel();
-    const stripModel = (model) ? model.replace(/0.*$/g, '').trim() : '';
+    const stripModel = (model) ? model.replace(/\0.*$/g, '').trim() : '';
     return byModel.get(stripModel);
 }
 
+
+
 module.exports = {
-    devices,
-    commonStates,
-    groupStates,
+    devices: devices,
+    commonStates: commonStates,
+    groupStates: groupStates,
     groupsState: states.groups,
-    fillStatesWithExposes,
-    findModel,
+    fillStatesWithExposes: fillStatesWithExposes,
+    findModel: findModel
 };

package/lib/exclude.js

@@ -27,12 +27,13 @@ class Exclude {
     debug(msg) {
         this.adapter.log.debug(msg);
     }
-
+    
     warn(msg) {
         this.adapter.log.warn(msg);
     }
 
 
+
     /**
      * @param {ioBroker.Message} obj
      */
@@ -41,21 +42,24 @@ class Exclude {
             switch (obj.command) {
                 case 'addExclude':
                     if (obj && obj.message && typeof obj.message === 'object') {
-                        this.addExclude(obj.from, obj.command, obj.message, err =>
-                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
+                        this.addExclude(obj.from, obj.command, obj.message, (err)=>{
+                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
+                        });
                     }
                     break;
 
                 case 'getExclude':
                     if (obj && obj.message && typeof obj.message === 'object') {
-                        this.getExclude(exclude =>
-                            this.adapter.sendTo(obj.from, obj.command, exclude, obj.callback));
+                        this.getExclude((exclude)=>{
+                            this.adapter.sendTo(obj.from, obj.command, exclude, obj.callback);
+                        });
                     }
                     break;
                 case 'delExclude':
                     if (obj && obj.message) {
-                        this.delExclude(obj.from, obj.command, obj.message, err =>
-                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
+                        this.delExclude(obj.from, obj.command, obj.message, (err)=>{
+                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
+                        });
                     }
                     break;
             }
@@ -65,14 +69,13 @@ class Exclude {
     getExcludeId(exclude_target) {
         return `${this.extractDeviceId(exclude_target)}`;
     }
-
+    
     extractDeviceId(stateId) {
-        if (stateId) {
+        if (stateId)
             return stateId.replace(`${this.adapter.namespace}.`, '');
-        }
         return '';
     }
-
+    
     extractExcludeId(stateId) {
         return stateId.replace(`${this.adapter.namespace}.exclude.`, '');
     }
@@ -91,25 +94,27 @@ class Exclude {
                 {
                     type: 'state',
                     common: {name: exclude_mod},
-                },
-                () => this.adapter.setState(stateId, exclude_mod, true, () =>
-                    callback()),
+                }, () => {
+                    this.adapter.setState(stateId, exclude_mod, true, () => {
+                        callback();
+                    });
+                }
             );
         } catch (error) {
             this.error(`Failed to addExclude ${error.stack}`);
             throw new Error(`Failed to addExclude ${error.stack}`);
         }
     }
-
     async delExclude(from, command, exclude_id, callback) {
         try {
-            this.debug(`delExclude message: ${JSON.stringify(exclude_id)}`);
+            this.debug('delExclude message: ' + JSON.stringify(exclude_id));
             const stateId = `exclude.${exclude_id}`;
             this.adapter.getStateAsync(stateId)
                 .then(async (stateV) => {
-                    this.debug(`found state: ${JSON.stringify(stateV)}`);
-                    this.adapter.deleteState(null, 'exclude', exclude_id, async () =>
-                        callback());
+                    this.debug('found state: ' + JSON.stringify(stateV));
+                    this.adapter.deleteState(null, 'exclude', exclude_id, async () => {
+                        callback();
+                    });
                 });
         } catch (error) {
             this.error(`Failed to delExclude ${error.stack}`);
@@ -125,31 +130,32 @@ class Exclude {
                     const exc = [];
                     states.forEach(state => {
                         if (state._id.startsWith(`${this.adapter.namespace}.exclude`)) {
-                            exc.push(new Promise(resolve =>
-                                this.adapter.getStateAsync(state._id)
+                            exc.push(new Promise(resolve => {
+                                return this.adapter.getStateAsync(state._id)
                                     .then(stateVa => {
                                         if (stateVa !== null) {
                                             const val = {
                                                 id: this.extractExcludeId(state._id),
-                                                name: stateVa.val
+                                                name : stateVa.val
                                             };
                                             if (this.extractExcludeId(state._id) !== 'all') {
                                                 exclude.push(val);
                                             }
                                         }
                                         resolve();
-                                    })));
+                                    });
+                            }));
                         }
                     });
-                    return Promise.all(exc)
-                        .then(() => {
-                            const arrExclude = JSON.stringify(exclude);
-                            this.debug(`getExclude result: ${arrExclude}`);
-                            this.adapter.setState('exclude.all', arrExclude, true, () =>
-                                callback(exclude));
+                    return Promise.all(exc).then(() => {
+                        const arrExclude = JSON.stringify(exclude);
+                        this.debug('getExclude result: ' + arrExclude);
+                        this.adapter.setState('exclude.all', arrExclude, true, () => {
+                            callback(exclude);
                         });
+                    });
                 } else {
-                    this.debug(`getExclude result: ${JSON.stringify(exclude)}`);
+                    this.debug('getExclude result: ' + JSON.stringify(exclude));
                     callback(exclude);
                 }
             });