iobroker.zigbee 1.8.0 → 1.8.3

package/lib/backup.js

@@ -49,7 +49,7 @@ class Backup {
         }
     }
 
-    async configure(zigbeeOptions) {
+    async configure (zigbeeOptions) {
         this.zigbeeOptions = zigbeeOptions;
         this.backup(zigbeeOptions);
         const allBackupFiles = this.listBackupsFiles(zigbeeOptions);
@@ -121,7 +121,7 @@ class Backup {
     delBackupsFiles(options, files) {
         const arr = files.length;
         if (arr > 10) {
-            this.info('delete old Backup files. keep only last 10');
+            this.info('delete old Backup files. keep only last 10')
         }
 
         for (let i = 10; i < files.length; i++) {

package/lib/binding.js

@@ -34,7 +34,7 @@ class Binding {
     debug(msg) {
         this.adapter.log.debug(msg);
     }
-
+    
     warn(msg) {
         this.adapter.log.warn(msg);
     }
@@ -86,23 +86,21 @@ class Binding {
     }
 
     extractDeviceId(stateId) {
-        if (stateId) {
+        if (stateId)
             return stateId.replace(`${this.adapter.namespace}.`, '');
-        }
         return '';
     }
 
     getBindEp(ep) {
-        if (ep) {
+        if (ep)
             return parseInt(ep.split('_')[0]);
-        }
 
         this.warn(`getBindEp called with illegal ep: ${safeJsonStringify(ep)}`);
         return 0;
     }
 
     getBindCl(ep) {
-        return ep.indexOf('_') > 0 ? ep.split('_')[1] : null;
+        return (ep.indexOf('_') > 0) ? ep.split('_')[1] : null;
     }
 
     async doBindUnbind(type, bind_source, bind_source_ep, bind_target, bind_target_ep, callback) {
@@ -125,7 +123,8 @@ class Binding {
 
             if (!source || !target) {
                 this.error('Devices not found');
-                return callback && callback('Devices not found');
+                if (callback) callback('Devices not found');
+                return;
             }
             const sourceName = source.name;
             const targetName = target.name;
@@ -145,7 +144,8 @@ class Binding {
             }
             if (!found) {
                 this.debug(`No bind clusters`);
-                return callback && callback(`No bind clusters`);
+                if (callback) callback(`No bind clusters`);
+                return;
             } else {
                 let ok = true;
                 for (const clID of clusters) {
@@ -171,23 +171,23 @@ class Binding {
                                 `Failed to ${type} cluster '${cluster}' from '${sourceName}' to ` +
                                 `'${targetName}' (${error})`,
                             );
-                            callback && callback(`Failed to ${type} cluster '${cluster}' from '${sourceName}' to '${targetName}' (${error})`);
+                            if (callback) callback(`Failed to ${type} cluster '${cluster}' from '${sourceName}' to '${targetName}' (${error})`);
                             ok = false;
                             break;
                         }
                     }
                 }
-                ok && callback && callback(undefined, id);
+                if (ok && callback) callback(undefined, id);
             }
         } catch (error) {
             this.error(`Failed to doBindUnbind ${error.stack}`);
-            callback && callback(`Failed to doBindUnbind ${error.stack}`);
+            if (callback) callback(`Failed to doBindUnbind ${error.stack}`);
         }
     }
 
     async addBinding(from, command, params, callback) {
         try {
-            this.debug(`addBinding message: ${JSON.stringify(params)}`);
+            this.debug('addBinding message: ' + JSON.stringify(params));
             const bind_source = params.bind_source,
                 bind_source_ep = params.bind_source_ep,
                 bind_target = params.bind_target,
@@ -207,8 +207,9 @@ class Binding {
                         type: 'state',
                         common: {name: id},
                     }, () => {
-                        this.adapter.setState(stateId, JSON.stringify(params), true, () =>
-                            callback());
+                        this.adapter.setState(stateId, JSON.stringify(params), true, () => {
+                            callback();
+                        });
                     });
                 }
             });
@@ -220,7 +221,7 @@ class Binding {
 
     async editBinding(from, command, params, callback) {
         try {
-            this.debug(`editBinding message: ${JSON.stringify(params)}`);
+            this.debug('editBinding message: ' + JSON.stringify(params));
             const old_id = params.id,
                 bind_source = params.bind_source,
                 bind_source_ep = params.bind_source_ep,
@@ -228,7 +229,7 @@ class Binding {
                 bind_target_ep = params.bind_target_ep,
                 id = this.getBindingId(bind_source, bind_source_ep, bind_target, bind_target_ep);
             if (old_id !== id) {
-                await this.delBinding(from, command, old_id, async err => {
+                await this.delBinding(from, command, old_id, async (err)=>{
                     if (err) {
                         callback(err);
                     } else {
@@ -241,7 +242,7 @@ class Binding {
                     await this.doBindUnbind(type , bind_source, bind_source_ep, 'coordinator', '1');
                     this.debug('Successfully ' + (type === 'bind' ? 'bound' : 'unbound') + ' Coordinator from ' + bind_source);
                 } catch (e) {
-                    this.error(`Could not ${type} Coordinator from ${bind_source}: ${JSON.stringify(e)}`);
+                    this.error('Could not ' + type + ' Coordinator from ' + bind_source + ': ' + JSON.stringify(e));
                 }
             }
         } catch (error) {
@@ -251,17 +252,17 @@ class Binding {
 
     async delBinding(from, command, bind_id, callback) {
         try {
-            this.debug(`delBinding message: ${JSON.stringify(bind_id)}`);
+            this.debug('delBinding message: ' + JSON.stringify(bind_id));
             const stateId = `info.${bind_id}`;
             this.adapter.getStateAsync(stateId)
-                .then(async stateV => {
-                    this.debug(`found state: ${JSON.stringify(stateV)}`);
+                .then(async (stateV) => {
+                    this.debug('found state: ' + JSON.stringify(stateV));
                     const params = JSON.parse(stateV.val);
                     const bind_source = params.bind_source,
                         bind_source_ep = params.bind_source_ep,
                         bind_target = params.bind_target,
                         bind_target_ep = params.bind_target_ep;
-                    await this.doBindUnbind('unbind', bind_source, bind_source_ep, bind_target, bind_target_ep, async err => {
+                    await this.doBindUnbind('unbind', bind_source, bind_source_ep, bind_target, bind_target_ep, async (err) => {
                         if (err) {
                             callback({error: err});
                         } else {
@@ -307,11 +308,11 @@ class Binding {
                         }
                     });
                     return Promise.all(chain).then(() => {
-                        this.debug(`getBinding result: ${JSON.stringify(binding)}`);
+                        this.debug('getBinding result: ' + JSON.stringify(binding));
                         callback(binding);
                     });
                 } else {
-                    this.debug(`getBinding result: ${JSON.stringify(binding)}`);
+                    this.debug('getBinding result: ' + JSON.stringify(binding));
                     callback(binding);
                 }
             });

package/lib/colors.js

@@ -1,5 +1,6 @@
 'use strict';
 
+
 const namedColors = {
     mediumvioletred: {
         rgb:  '#c71585',
@@ -423,15 +424,15 @@ const namedColors = {
     },
 };
 
-function namedColorToRGBstring(name) {
+function NamedColorToRGBstring(name)
+{
     const lowerName = name.toLowerCase();
-    if (namedColors.hasOwnProperty(lowerName)) {
-        return namedColors[lowerName].rgb;
-    }
+    if (namedColors.hasOwnProperty(lowerName)) return namedColors[lowerName].rgb;
     return '#0088FF';
 }
 
-function parseColor(rgbstring) {
+function ParseColor(rgbstring)
+{
     if (typeof(rgbstring) === 'string') {
         const lowerName = rgbstring.toLowerCase();
         if (namedColors.hasOwnProperty(lowerName))
@@ -445,18 +446,15 @@ function parseColor(rgbstring) {
         oneColor.b = val % 256;
         return oneColor;
     }
-
-    return {r: 0,g: 128,b: 255};
+    return {r:0,g:128,b:255};
 }
 
-function namedColorToRGB(name) {
-    if (namedColors.hasOwnProperty(name)) {
-        return parseColor(namedColors[name].rgb);
-    }
-
-    return {r: 0, g: 128, b: 255};
+function NamedColorToRGB(name)
+{
+    if (namedColors.hasOwnProperty(name)) return ParseColor(namedColors[name].rgb);
+    return {r:0,g:128,b:255};
 }
 
-exports.NamedColorToRGB = namedColorToRGB;
-exports.NamedCOlorToRGBString = namedColorToRGBstring;
-exports.ParseColor = parseColor;
+exports.NamedColorToRGB = NamedColorToRGB;
+exports.NamedCOlorToRGBString = NamedColorToRGBstring;
+exports.ParseColor = ParseColor;

package/lib/commands.js

@@ -112,6 +112,7 @@ class Commands {
         }
     }
 
+
     letsPairing(from, command, message, callback) {
         if (this.zbController) {
             let devId = '';
@@ -122,11 +123,11 @@ class Commands {
             this.adapter.logToPairing('Pairing started ' + devId, true);
 
             let cTimer = Number(this.adapter.config.countDown);
-            if (!this.adapter.config.countDown || !cTimer) {
+            if (!this.adapter.config.countDown || cTimer == 0) {
                 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);
@@ -148,7 +149,7 @@ class Commands {
             this.adapter.logToPairing('Touchlink reset started ', true);
 
             let cTimer = Number(this.adapter.config.countDown);
-            if (!this.adapter.config.countDown || !cTimer) {
+            if (!this.adapter.config.countDown || cTimer == 0) {
                 cTimer = 60;
             }
 
@@ -169,18 +170,20 @@ class Commands {
             const groups = {};
             let rooms;
             this.adapter.getEnumsAsync('enum.rooms')
-                .then(enums => {
+                .then((enums) => {
                     // rooms
                     rooms = enums['enum.rooms'];
                 })
-                // 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);
+                .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 device states and groups
-                    result.forEach(async devInfo => {
+                    result.forEach(async (devInfo) => {
                         if (devInfo._id) {
                             // groups
 //                            const grState = alls[`${devInfo._id}.groups`];
@@ -189,31 +192,31 @@ class Commands {
 //                            }
                             // 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();
-                                return !disallowedDashStates.includes(name);
-
-                            }).map(stateDef => {
+                                if (disallowedDashStates.includes(name)) return false;
+                                return true;
+                            }).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,
@@ -223,7 +226,7 @@ class Commands {
                     });
                     return result;
                 })
-                .then(async result => {
+                .then(async (result) => {
                     // combine info
                     const devices = [];
                     for (const devInfo of result) {
@@ -234,37 +237,40 @@ 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)
+                                            {
                                                 if (!grouparray.includes(match[1]))  {
-                                                    groups[member.ieee].push(match[1]);
+                                                    groups[member.ieee].push(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);
 
@@ -273,11 +279,10 @@ 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.includes(devInfo._id)) {
+                            if (rooms[room].common.members.indexOf(devInfo._id) !== -1) {
                                 devInfo.rooms.push(rooms[room].common.name);
                             }
                         }
@@ -290,20 +295,18 @@ 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({
@@ -322,11 +325,13 @@ 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);
         }
@@ -347,16 +352,17 @@ 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;
@@ -364,40 +370,24 @@ 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');}
 
-                this.debug(`getCoorinatorInfo result: ${JSON.stringify(coordinatorinfo)}`);
+                this.debug('getCoorinatorInfo result: ' + JSON.stringify(coordinatorinfo));
                 this.adapter.sendTo(from, command, coordinatorinfo, callback);
             });
         } else {
@@ -417,26 +407,28 @@ 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);
                 }
             });
@@ -461,7 +453,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(
@@ -474,10 +466,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);
         }
     }
 
@@ -494,7 +486,8 @@ 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,8 +38,9 @@ class Developer {
         if (typeof obj === 'object' && obj.command) {
             switch (obj.command) {
                 case 'reset':
-                    this.zbController.reset(obj.message.mode, err =>
-                        this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
+                    this.zbController.reset(obj.message.mode, function (err) {
+                        this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
+                    }.bind(this));
                     break;
                 case 'sendToZigbee':
                     this.sendToZigbee(obj);
@@ -93,7 +94,7 @@ class Developer {
             cmd = zcl.Utils.getCluster(cid).getCommand(obj.message.cmd);
         }
         else if (cmdType === 'functionalResp') {
-            cmd = zcl.Utils.getCluster(cid).getCommandResponse(obj.message.cmd);
+            cmd = zcl.Utils.getCluster(cid).getCommandResponse(obj.message.cmd); 
         }
         else if (cmdType === 'foundation') {
             cmd = zcl.Utils.getGlobalCommand((obj.message.cmd));
@@ -105,7 +106,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) {
@@ -136,8 +137,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 sent to adapter, send string message instead!
+                this.error('SendToZigbee failed! (' + exception + ')');
+                // exception (Error class) cannot be send to adapter, send string message instead!
                 this.adapter.sendTo(obj.from, obj.command, {msg: exception.message}, obj.callback);
             }
         }