iobroker.zigbee 1.8.3 → 1.8.5

package/lib/commands.js

@@ -5,13 +5,13 @@ const statesMapping = require('./devices');
 const disallowedDashStates = [
     'link_quality', 'available', 'battery', 'groups', 'device_query',
     'hue_move', 'color_temp_move', 'satuation_move', 'brightness_move', 'brightness_step', 'hue_calibration',
-    'msg_from_zigbee','send_payload'
+    'msg_from_zigbee', 'send_payload',
 ];
 
 class Commands {
     constructor(adapter) {
         this.adapter = adapter;
-        this.adapter.on('message', this.onMessage.bind(this));
+        this.adapter.on('message', obj => this.onMessage(obj));
     }
 
     start(zbController, stController) {
@@ -112,7 +112,6 @@ class Commands {
         }
     }
 
-
     letsPairing(from, command, message, callback) {
         if (this.zbController) {
             let devId = '';
@@ -123,11 +122,11 @@ class Commands {
             this.adapter.logToPairing('Pairing started ' + devId, true);
 
             let cTimer = Number(this.adapter.config.countDown);
-            if (!this.adapter.config.countDown || cTimer == 0) {
+            if (!this.adapter.config.countDown || !cTimer) {
                 cTimer = 60;
             }
 
-            this.zbController.permitJoin(cTimer, devId, (err) => {
+            this.zbController.permitJoin(cTimer, devId, err => {
                 if (!err) {
                     // set pairing mode on
                     this.adapter.setState('info.pairingMode', true);
@@ -149,7 +148,7 @@ class Commands {
             this.adapter.logToPairing('Touchlink reset started ', true);
 
             let cTimer = Number(this.adapter.config.countDown);
-            if (!this.adapter.config.countDown || cTimer == 0) {
+            if (!this.adapter.config.countDown || !cTimer) {
                 cTimer = 60;
             }
 
@@ -170,53 +169,51 @@ class Commands {
             const groups = {};
             let rooms;
             this.adapter.getEnumsAsync('enum.rooms')
-                .then((enums) => {
+                .then(enums => {
                     // rooms
                     rooms = enums['enum.rooms'];
                 })
-                .then(() => {
-                    // get all adapter devices
-                    return this.adapter.getDevicesAsync();
-                })
-                .then(async (result) => {
-                    const alls = (id) ? await this.adapter.getStatesAsync(id+'.*') : await this.adapter.getStatesAsync('*');
-                    const allst = (id) ? await this.adapter.getStatesOfAsync(id) : await this.adapter.getStatesOfAsync();
-                    result = result.filter((item)=>!id || id == item._id);
+                // get all adapter devices
+                .then(() => this.adapter.getDevicesAsync())
+                .then(async result => {
+                    const alls = id ? await this.adapter.getStatesAsync(id + '.*') : await this.adapter.getStatesAsync('*');
+                    const allst = id ? await this.adapter.getStatesOfAsync(id) : await this.adapter.getStatesOfAsync();
+                    result = result.filter(item => !id || id === item._id);
                     // get device states and groups
-                    result.forEach(async (devInfo) => {
+                    result.forEach(async devInfo => {
                         if (devInfo._id) {
                             // groups
-//                            const grState = alls[`${devInfo._id}.groups`];
-//                            if (grState && grState.val) {
-//                                groups[devInfo._id] = JSON.parse(grState.val);
-//                            }
+                            // const grState = alls[`${devInfo._id}.groups`];
+                            // if (grState && grState.val) {
+                            //     groups[devInfo._id] = JSON.parse(grState.val);
+                            // }
                             // battery and link_quality
                             const lqState = alls[`${devInfo._id}.link_quality`];
-                            devInfo.link_quality = (lqState) ? lqState.val: undefined;
-                            devInfo.link_quality_lc = (lqState) ? lqState.lc: undefined;
+                            devInfo.link_quality = lqState ? lqState.val : undefined;
+                            devInfo.link_quality_lc = lqState ? lqState.lc : undefined;
                             const batState = alls[`${devInfo._id}.battery`];
-                            devInfo.battery = (batState) ? batState.val: undefined;
+                            devInfo.battery = batState ? batState.val : undefined;
                             // devInfo.states = states || {};
 
-                            const states = allst.filter((item)=>item._id.startsWith(devInfo._id));
+                            const states = allst.filter(item => item._id.startsWith(devInfo._id));
 
                             // put only allowed states
-                            devInfo.statesDef = (states || []).filter((stateDef)=>{
+                            devInfo.statesDef = (states || []).filter(stateDef => {
                                 const sid = stateDef._id;
                                 const name = sid.split('.').pop();
-                                if (disallowedDashStates.includes(name)) return false;
-                                return true;
-                            }).map((stateDef)=>{
+                                return !disallowedDashStates.includes(name);
+
+                            }).map(stateDef => {
                                 const name = stateDef.common.name;
                                 const devname = devInfo.common.name;
                                 // replace state
                                 return {
                                     id: stateDef._id,
-                                    name: (typeof name === 'string') ? name.replace(devname, '') : name,
+                                    name: typeof name === 'string' ? name.replace(devname, '') : name,
                                     type: stateDef.common.type,
                                     read: stateDef.common.read,
                                     write: stateDef.common.write,
-                                    val: (alls[stateDef._id]) ? alls[stateDef._id].val : undefined,
+                                    val: alls[stateDef._id] ? alls[stateDef._id].val : undefined,
                                     role: stateDef.common.role,
                                     unit: stateDef.common.unit,
                                     states: stateDef.common.states,
@@ -226,7 +223,7 @@ class Commands {
                     });
                     return result;
                 })
-                .then(async (result) => {
+                .then(async result => {
                     // combine info
                     const devices = [];
                     for (const devInfo of result) {
@@ -237,40 +234,38 @@ class Commands {
                             const match = /zigbee.\d.group_([0-9]+)/.exec(devInfo._id);
                             if (match && match.length > 1) {
                                 const groupmembers = await this.zbController.getGroupMembersFromController(match[1]);
-                                this.debug('group members: ' + JSON.stringify(groupmembers));
+                                this.debug(`group members: ${JSON.stringify(groupmembers)}`);
                                 if (groupmembers && groupmembers.length > 0) {
                                     const memberinfo = [];
                                     for (const member of groupmembers) {
                                         if (groups) {
                                             const grouparray = groups[member.ieee];
-                                            if (grouparray)
-                                            {
-                                                if (!grouparray.includes(match[1]))  {
-                                                    groups[member.ieee].push(match[1])
+                                            if (grouparray) {
+                                                if (!grouparray.includes(match[1])) {
+                                                    groups[member.ieee].push(match[1]);
                                                 }
+                                            } else {
+                                                groups[member.ieee] = [match[1]];
                                             }
-                                            else groups[member.ieee] = [match[1]];
                                         }
-                                        const device = await this.adapter.getObjectAsync(this.adapter.namespace + '.' +  member.ieee.substr(2));
+                                        const device = await this.adapter.getObjectAsync(`${this.adapter.namespace}.${member.ieee.substr(2)}`);
                                         if (device) {
                                             member.device = device.common.name;
-                                        }
-                                        else {
+                                        } else {
                                             member.device = 'unknown';
                                         }
                                         memberinfo.push(member);
                                     }
                                     devInfo.memberinfo = memberinfo;
-                                    this.debug('memberinfo: ' + JSON.stringify(devInfo.memberinfo));
+                                    this.debug(`memberinfo: ${JSON.stringify(devInfo.memberinfo)}`);
                                 }
                             }
-                        }
-                        else
-                        {
+                        } else {
                             const modelDesc = statesMapping.findModel(devInfo.common.type);
                             devInfo.icon = (modelDesc && modelDesc.icon) ? modelDesc.icon : 'img/unknown.png';
-                            devInfo.vendor = (modelDesc) ? modelDesc.vendor : '';
+                            devInfo.vendor = modelDesc ? modelDesc.vendor : '';
                         }
+
                         const id = getZbId(devInfo._id);
                         devInfo.info = await this.zbController.resolveEntity(id);
 
@@ -279,10 +274,11 @@ class Commands {
                             if (!rooms.hasOwnProperty(room) ||
                                 !rooms[room] ||
                                 !rooms[room].common ||
-                                !rooms[room].common.members) {
+                                !rooms[room].common.members
+                            ) {
                                 continue;
                             }
-                            if (rooms[room].common.members.indexOf(devInfo._id) !== -1) {
+                            if (rooms[room].common.members.includes(devInfo._id)) {
                                 devInfo.rooms.push(rooms[room].common.name);
                             }
                         }
@@ -295,18 +291,20 @@ class Commands {
                 .then(async (devices) => {
                     // fill group info
                     for (const groupdev in groups) {
-                      this.debug('GetDevices scanning group ' + groupdev + ' ' + JSON.stringify(groups[groupdev]))
-                        const device = devices.find((dev) =>( groupdev === getZbId(dev._id) ))
+                        this.debug(`GetDevices scanning group ${groupdev} ${JSON.stringify(groups[groupdev])}`);
+                        const device = devices.find(dev => (groupdev === getZbId(dev._id)));
                         if (device) {
-                            device.groups = groups[groupdev]
-                            this.debug('adding group info to device ' + groupdev);
+                            device.groups = groups[groupdev];
+                            this.debug(`adding group info to device ${groupdev}`);
                         }
                     }
                     // append devices that paired but not created
                     if (!id) {
                         for (const d of pairedDevices) {
                             const device = await this.zbController.resolveEntity(d.ieeeAddr);
-                            if (!device) continue;
+                            if (!device) {
+                                continue;
+                            }
                             const exists = devices.find((dev) => (dev._id && device.device.ieeeAddr === getZbId(dev._id)));
                             if (!exists) {
                                 devices.push({
@@ -325,13 +323,11 @@ class Commands {
                     }
                     return devices;
                 })
-                .then((devices) => {
-                    this.debug('getDevices result: ' + JSON.stringify(devices));
+                .then(devices => {
+                    this.debug(`getDevices result: ${JSON.stringify(devices)}`);
                     this.adapter.sendTo(from, command, devices, callback);
                 })
-                .catch((err) => {
-                    this.error('getDevices error: ' + err.stack);
-                });
+                .catch(err => this.error(`getDevices error: ${err.stack}`));
         } else {
             this.adapter.sendTo(from, command, {error: 'You need save and run adapter before pairing!'}, callback);
         }
@@ -352,17 +348,16 @@ class Commands {
 
             const coordinatorVersion = await this.adapter.zbController.herdsman.getCoordinatorVersion();
 
-            await this.adapter.getForeignObject('system.adapter.' + this.adapter.namespace, (err, obj) => {
+            await this.adapter.getForeignObject(`system.adapter.${this.adapter.namespace}`, (err, obj) => {
                 if (!err && obj) {
                     if (obj.common.installedFrom && obj.common.installedFrom.includes('://')) {
                         const instFrom = obj.common.installedFrom;
-                        coordinatorinfo.installSource = instFrom.replace('tarball','commit');
+                        coordinatorinfo.installSource = instFrom.replace('tarball', 'commit');
                     } else {
                         coordinatorinfo.installSource = obj.common.installedFrom;
                     }
                 }
-                try
-                {
+                try {
                     coordinatorinfo.port = obj.native.port;
                     coordinatorinfo.channel = obj.native.channel;
                     coordinatorinfo.installedVersion = obj.native.version;
@@ -370,24 +365,41 @@ class Commands {
                         coordinatorinfo.type = coordinatorVersion.type;
                         const meta = coordinatorVersion.meta;
                         if (meta) {
-                            if (meta.hasOwnProperty('revision')) coordinatorinfo.revision = meta.revision;
+                            if (meta.hasOwnProperty('revision')) {
+                                coordinatorinfo.revision = meta.revision;
+                            }
                             let vt = 'x-';
-                            if (meta.hasOwnProperty('transportrev')) vt = meta.transportrev + '-';
-                            if (meta.hasOwnProperty('product')) vt = vt + meta.product + '.';
-                            else vt = vt + 'x.';
-                            if (meta.hasOwnProperty('majorrel')) vt = vt + meta.majorrel + '.';
-                            else vt = vt + 'x.';
-                            if (meta.hasOwnProperty('minorrel')) vt = vt + meta.minorrel + '.';
-                            else vt = vt + 'x.';
-                            if (meta.hasOwnProperty('maintrel')) vt = vt + meta.maintrel + '.';
-                            else vt = vt + 'x.';
+                            if (meta.hasOwnProperty('transportrev')) {
+                                vt = meta.transportrev + '-';
+                            }
+                            if (meta.hasOwnProperty('product')) {
+                                vt = vt + meta.product + '.';
+                            } else {
+                                vt = vt + 'x.';
+                            }
+                            if (meta.hasOwnProperty('majorrel')) {
+                                vt = vt + meta.majorrel + '.';
+                            } else {
+                                vt = vt + 'x.';
+                            }
+                            if (meta.hasOwnProperty('minorrel')) {
+                                vt = vt + meta.minorrel + '.';
+                            } else {
+                                vt = vt + 'x.';
+                            }
+                            if (meta.hasOwnProperty('maintrel')) {
+                                vt = vt + meta.maintrel + '.';
+                            } else {
+                                vt = vt + 'x.';
+                            }
                             coordinatorinfo.version = vt;
                         }
                     }
+                } catch {
+                    this.warn('exception raised in getCoordinatorInfo');
                 }
-                catch { this.warn('exception raised in getCoordinatorInfo');}
 
-                this.debug('getCoorinatorInfo result: ' + JSON.stringify(coordinatorinfo));
+                this.debug(`getCoordinatorInfo result: ${JSON.stringify(coordinatorinfo)}`);
                 this.adapter.sendTo(from, command, coordinatorinfo, callback);
             });
         } else {
@@ -407,28 +419,26 @@ class Commands {
 
     deleteDevice(from, command, msg, callback) {
         if (this.zbController && this.stController) {
-            this.debug('deleteDevice message: ' + JSON.stringify(msg));
+            this.debug(`deleteDevice message: ${JSON.stringify(msg)}`);
             const id = msg.id;
             const force = msg.force;
             const sysid = id.replace(this.adapter.namespace + '.', '0x');
             const devId = id.replace(this.adapter.namespace + '.', '');
-            this.debug('deleteDevice sysid: ' + sysid);
+            this.debug(`deleteDevice sysid: ${sysid}`);
             const dev = this.zbController.getDevice(sysid);
             if (!dev) {
                 this.debug('Not found!');
-                this.debug('Try delete dev ' + devId + ' from iobroker.');
-                this.stController.deleteDeviceStates(devId, () => {
-                    this.adapter.sendTo(from, command, {}, callback);
-                });
+                this.debug(`Try delete dev ${devId} from iobroker.`);
+                this.stController.deleteDeviceStates(devId, () =>
+                    this.adapter.sendTo(from, command, {}, callback));
                 return;
             }
-            this.zbController.remove(sysid, force, (err) => {
+            this.zbController.remove(sysid, force, err => {
                 if (!err) {
-                    this.stController.deleteDeviceStates(devId, () => {
-                        this.adapter.sendTo(from, command, {}, callback);
-                    });
+                    this.stController.deleteDeviceStates(devId, () =>
+                        this.adapter.sendTo(from, command, {}, callback));
                 } else {
-                    this.debug('Error on remove! ' + err);
+                    this.debug(`Error on remove! ${err}`);
                     this.adapter.sendTo(from, command, {error: err}, callback);
                 }
             });
@@ -453,7 +463,7 @@ class Commands {
     async getChannels(from, command, message, callback) {
         if (this.zbController) {
             const result = await this.zbController.getChannelsEnergy();
-            this.debug('getChannels result: ' + JSON.stringify(result));
+            this.debug(`getChannels result: ${JSON.stringify(result)}`);
             this.adapter.sendTo(from, command, result, callback);
         } else {
             this.adapter.sendTo(
@@ -466,10 +476,10 @@ class Commands {
 
     async setDeviceActivated(from, command, msg, callback) {
         if (this.stController) {
-          const id = msg.id;
-          const targetstate = msg.deactivated;
-          this.stController.setDeviceActivated(id, targetstate);
-          this.adapter.sendTo(from, command, {}, callback);
+            const id = msg.id;
+            const targetstate = msg.deactivated;
+            this.stController.setDeviceActivated(id, targetstate);
+            this.adapter.sendTo(from, command, {}, callback);
         }
     }
 
@@ -486,8 +496,7 @@ class Commands {
                     );
                     this.adapter.sendTo(from, command, {}, callback);
                 } catch (error) {
-                    const errmsg = `Reconfigure failed ${entity.device.ieeeAddr} ${entity.device.modelID}, ` +
-                    `(${error.stack})`;
+                    const errmsg = `Reconfigure failed ${entity.device.ieeeAddr} ${entity.device.modelID}, (${error.stack})`;
                     this.error(errmsg);
                     this.adapter.sendTo(from, command, {error: errmsg}, callback);
                 }

package/lib/developer.js

@@ -38,9 +38,8 @@ class Developer {
         if (typeof obj === 'object' && obj.command) {
             switch (obj.command) {
                 case 'reset':
-                    this.zbController.reset(obj.message.mode, function (err) {
-                        this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
-                    }.bind(this));
+                    this.zbController.reset(obj.message.mode, err =>
+                        this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
                     break;
                 case 'sendToZigbee':
                     this.sendToZigbee(obj);
@@ -92,11 +91,9 @@ class Developer {
         const zclData = obj.message.zclData;
         if (cmdType === 'functional') {
             cmd = zcl.Utils.getCluster(cid).getCommand(obj.message.cmd);
-        }
-        else if (cmdType === 'functionalResp') {
-            cmd = zcl.Utils.getCluster(cid).getCommandResponse(obj.message.cmd); 
-        }
-        else if (cmdType === 'foundation') {
+        } else if (cmdType === 'functionalResp') {
+            cmd = zcl.Utils.getCluster(cid).getCommandResponse(obj.message.cmd);
+        } else if (cmdType === 'foundation') {
             cmd = zcl.Utils.getGlobalCommand((obj.message.cmd));
         } else {
             this.adapter.sendTo(obj.from, obj.command, {localErr: 'Invalid cmdType'}, obj.callback);
@@ -106,7 +103,7 @@ class Developer {
 
         const publishTarget = this.zbController.getDevice(devId) ? devId : this.zbController.getGroup(parseInt(devId));
         if (!publishTarget) {
-            this.adapter.sendTo(obj.from, obj.command, {localErr: 'Device or group ' + devId + ' not found!'}, obj.callback);
+            this.adapter.sendTo(obj.from, obj.command, {localErr: `Device or group ${devId} not found!`}, obj.callback);
             return;
         }
         if (!cid || !cmd) {
@@ -125,7 +122,7 @@ class Developer {
                 }
                 result.statusCode = 0;
                 this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
-            },obj.message.zclSeqNum);
+            }, obj.message.zclSeqNum);
         } catch (exception) {
             // report exceptions
             // happens for example if user tries to send write command but did not provide value/type
@@ -137,8 +134,8 @@ class Developer {
                 result.statusCode = exception.code;
                 this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
             } else {
-                this.error('SendToZigbee failed! (' + exception + ')');
-                // exception (Error class) cannot be send to adapter, send string message instead!
+                this.error(`SendToZigbee failed! (${exception})`);
+                // exception (Error class) cannot be sent to adapter, send string message instead!
                 this.adapter.sendTo(obj.from, obj.command, {msg: exception.message}, obj.callback);
             }
         }