iobroker.zigbee 1.8.0 → 1.8.3

package/lib/zigbeecontroller.js

@@ -118,12 +118,13 @@ class ZigbeeController extends EventEmitter {
             }
 
             this.debug(`Zigbee network parameters: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${extPanIDDebug}`);
+
         } catch (e) {
             this.sendError(e);
-            this.error(`Starting zigbee-herdsman problem : ${JSON.stringify(e.message)}`);
+            this.error('Starting zigbee-herdsman problem : ' + JSON.stringify(e.message));
             throw 'Error herdsman start';
         }
-        // Check if we have to turn off the LED
+        // Check if we have to turn off the led
         try {
             if (this.disableLed) {
                 this.info('Disable LED');
@@ -140,7 +141,7 @@ class ZigbeeController extends EventEmitter {
         let powerText = 'normal';
 
         if (this.transmitPower != '0') {
-            switch (this.transmitPower) {
+            switch(this.transmitPower) {
                 case '-22':
                     powerText = 'low';
                     break;
@@ -156,7 +157,7 @@ class ZigbeeController extends EventEmitter {
         }
 
 
-        this.info(`  --> transmitPower : ${powerText}`);
+        this.info('  --> transmitPower : ' + powerText);
         try {
             await this.herdsman.setTransmitPower(this.transmitPower);
         } catch (e) {
@@ -164,6 +165,7 @@ class ZigbeeController extends EventEmitter {
             this.info('Unable to set transmit power, unsupported function.');
         }
 
+
         // Call extensions
         this.callExtensionMethod('onZigbeeStarted', []);
 
@@ -174,21 +176,20 @@ class ZigbeeController extends EventEmitter {
         } else {
             this.info(`Currently no devices.`);
         }
-
         for (const device of devices) {
             const entity = await this.resolveEntity(device);
-            this.adapter.getObject(device.ieeeAddr.substr(2), (err, obj) => {
-                if (obj && obj.common && obj.common.deactivated) {
+            this.adapter.getObject(device.ieeeAddr.substr(2),(err, obj) => {
+                if (obj && obj.common && obj.common.deactivated)
+                {
                     this.callExtensionMethod('deregisterDevicePing', [device, entity]);
-                } else {
+                }
+                else {
                     this.callExtensionMethod('registerDevicePing', [device, entity]);
                 }
             });
             // ensure that objects for all found clients are present
 
-            if (entity.mapped) {
-                this.emit('new', entity);
-            }
+            if (entity.mapped) this.emit('new', entity);
             this.info(
                 (entity.device.ieeeAddr) +
                 ` (addr ${entity.device.networkAddress}): ` +
@@ -260,7 +261,8 @@ class ZigbeeController extends EventEmitter {
 
     async getGroups() {
         try {
-            return await this.herdsman.getGroups();
+            const rv = await this.herdsman.getGroups();
+            return rv;
         } catch (error) {
             this.sendError(error);
             this.error(JSON.stringify(error));
@@ -269,12 +271,12 @@ class ZigbeeController extends EventEmitter {
     }
 
     async removeGroupById(id) {
-        const group = await this.getGroupByID(id);
+        const group = await  this.getGroupByID(id);
         try {
-            group && group.removeFromDatabase();
+            if (group) group.removeFromDatabase();
         } catch (error) {
             this.sendError(error);
-            this.error(`error in removeGroupById: ${error}`);
+            this.error('error in removeGroupById: ' + error);
         }
     }
 
@@ -288,15 +290,16 @@ class ZigbeeController extends EventEmitter {
     }
 
     async verifyGroupExists(id) {
-        const nid = (typeof (id) === 'number' ? id : parseInt(id));
+      const nid = (typeof(id) === 'number' ? id:parseInt(id));
         let group = await this.herdsman.getGroupByID(nid);
         if (!group) {
             group = await this.herdsman.createGroup(nid);
             group.toZigbee = groupConverters;
             group.model = 'group';
-            this.debug(`verifyGroupExists: created group ${nid}`);
-        } else {
-            this.debug(`verifyGroupExists: group ${nid} exists`);
+            this.debug('verifyGroupExists: created group ' + nid);
+        }
+        else {
+            this.debug('verifyGroupExists: group ' + nid + ' exists');
         }
 
     }
@@ -313,17 +316,15 @@ class ZigbeeController extends EventEmitter {
                     const device = this.getDeviceByNetworkAddress(nwk);
                     if (device && device.ieeeAddr) members.push( { ieee:device.ieeeAddr, model:device.modelID, epid:epid, ep:member } );
                 }
-            } else {
+            }
+            else {
                 return undefined;
             }
 
         } catch (error) {
             this.sendError(error);
-            if (error) {
-                this.error(`getGroupMembersFromController: error is  ${JSON.stringify(error)} ${JSON.stringify(new Error().stack)}`);
-            } else {
-                this.error('unidentified error in getGroupMembersFromController');
-            }
+            if (error) this.error('getGroupMembersFromController: error is  ' + JSON.stringify(error) + ' ' + JSON.stringify(new Error().stack));
+            else this.error('unidentifed error in getGroupMembersFromController');
         }
         return members;
     }
@@ -403,7 +404,7 @@ class ZigbeeController extends EventEmitter {
         }
     }
 
-    async incMsgHandler(message) {
+    async incMsgHandler(message){
         this.debug('incoming msg', message);
         const device = await this.herdsman.getDeviceByIeeeAddr(message.srcaddr);
         if (!device) {
@@ -461,8 +462,8 @@ class ZigbeeController extends EventEmitter {
         } else {
             this.info('Zigbee: disabling joining new devices.');
         }
-
-        try {
+        try
+        {
             if (permitTime && !this.herdsman.getPermitJoin()) {
                 clearInterval(this._permitJoinInterval);
                 this._permitJoinTime = permitTime;
@@ -508,7 +509,6 @@ class ZigbeeController extends EventEmitter {
                         this.debug(`Force remove`);
                     }
                 }
-
                 try {
                     await device.removeFromDatabase();
                 } catch (error) {
@@ -518,7 +518,7 @@ class ZigbeeController extends EventEmitter {
                         this.debug(`Failed to remove from DB ${error.stack}`);
                 }
                 this.debug('Remove successful.');
-                callback && callback();
+                if (callback) callback();
                 this.callExtensionMethod(
                     'onDeviceRemove',
                     [device],
@@ -527,7 +527,7 @@ class ZigbeeController extends EventEmitter {
         } catch (error) {
             this.sendError(error);
             this.error(`Failed to remove ${error.stack}`);
-            callback && callback(`Failed to remove ${error.stack}`);
+            if (callback) callback(`Failed to remove ${error.stack}`);
         }
     }
 
@@ -536,7 +536,7 @@ class ZigbeeController extends EventEmitter {
         try {
             this.debug('handleDeviceLeave', message);
             const entity = await this.resolveEntity(message.device || message.ieeeAddr);
-            const friendlyName = entity ? entity.name : message.ieeeAddr;
+            const friendlyName = (entity) ? entity.name : message.ieeeAddr;
             this.debug(`Device '${friendlyName}' left the network`);
             this.emit('leave', message.ieeeAddr);
             // Call extensions
@@ -566,7 +566,7 @@ class ZigbeeController extends EventEmitter {
             this.sendError(error);
             this.error(`Failed to handleDeviceLeave ${error.stack}`);
         }
-
+        
         this.emit('pairing', `Device '${friendlyName}' announced itself`);
         if (!this.herdsman.getPermitJoin()) this.callExtensionMethod('registerDevicePing', [message.device, entity]);
         // if has modelID so can create device
@@ -650,11 +650,12 @@ class ZigbeeController extends EventEmitter {
 
     async getMap(callback) {
         try {
+
             const devices = this.herdsman.getDevices(true);
             const lqis = [];
             const routing = [];
 
-            for (const device of devices.filter((d) => d.type !== 'EndDevice')) {
+            for (const device of devices.filter((d) => d.type != 'EndDevice')) {
                 const resolved = await this.resolveEntity(device);
                 let result;
 
@@ -678,7 +679,7 @@ class ZigbeeController extends EventEmitter {
 
                 if (result !== undefined) {
                     for (const dev of result.neighbors) {
-                        if (dev !== undefined && dev.ieeeAddr !== '0xffffffffffffffff') {
+                        if (dev.ieeeAddr !== '0xffffffffffffffff' && dev !== undefined) {
                             lqis.push({
                                 parent: resolved.device.ieeeAddr,
                                 networkAddress: dev.networkAddress,
@@ -686,7 +687,7 @@ class ZigbeeController extends EventEmitter {
                                 lqi: dev.linkquality,
                                 relationship: dev.relationship,
                                 depth: dev.depth,
-                                status: dev.linkquality > 0 ? 'online' : 'offline',
+                                status: (dev.linkquality > 0) ? 'online' : 'offline',
                             });
                         }
                     }
@@ -717,10 +718,11 @@ class ZigbeeController extends EventEmitter {
                     }
                 }
                 this.debug(`Routing table succeeded for '${resolved.name}'`);
+
             }
             this.debug(`Get map succeeded ${safeJsonStringify(lqis)}`);
 
-            callback && callback({lqis, routing});
+            if (callback) callback({lqis: lqis, routing: routing});
         } catch (error) {
             this.sendError(error);
             this.debug(`Failed to get map: ${safeJsonStringify(error.stack)}`);
@@ -753,7 +755,7 @@ class ZigbeeController extends EventEmitter {
         if (type === 'foundation') {
             cfg.disableDefaultResponse = true;
             if (cmd === 'read' && !Array.isArray(zclData)) {
-                // needs to be iterable (string[] | number [])
+                // needs to be iterateable (string[] | number [])
                 zclData[Symbol.iterator] = function* () {
                     let k;
                     for (k in this) {
@@ -767,15 +769,17 @@ class ZigbeeController extends EventEmitter {
             } else {
                 result = await endpoint[cmd](cid, zclData, cfg);
             }
-            callback && callback(undefined, result);
-        } else if (type === 'functionalResp') {
-            cfg.disableDefaultResponse = false;
-            const result = await endpoint.commandResponse(cid, cmd, zclData, cfg, zclSeqNum);
-            callback && callback(undefined, result);
-        } else {
+            if (callback) callback(undefined, result);
+        }
+        else if(type === 'functionalResp'){
+              cfg.disableDefaultResponse = false;
+              const result = await endpoint.commandResponse(cid, cmd, zclData, cfg, zclSeqNum);
+              if (callback) callback(undefined, result);
+        }
+        else {
             cfg.disableDefaultResponse = false;
             const result = await endpoint.command(cid, cmd, zclData, cfg);
-            callback && callback(undefined, result);
+            if (callback) callback(undefined, result);
         }
     }
 
@@ -786,61 +790,66 @@ class ZigbeeController extends EventEmitter {
             this.debug(`addDevFromGroup - entity: ${safeJsonStringify(entity)}`);
             this.debug(`addDevFromGroup - group: ${safeJsonStringify(group)}`);
             if (epid != undefined) {
-                for (const ep of entity.endpoints) {
-                    if (ep.ID === epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))) {
-                        this.debug(`adding endpoint ${ep.ID} (${epid}) to group ${groupId}`);
-                        await (ep.addToGroup(group.mapped));
-                    }
+              for (const ep of entity.endpoints) {
+                if (ep.ID == epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)))
+                {
+                  this.debug(`adding endpoint ${ep.ID} (${epid}) to group ${groupId}`)
+                  await(ep.addToGroup(group.mapped));
                 }
+              }
 
-            } else {
-                if (entity.endpoint.inputClusters.includes(4)) {
-                    this.debug(`adding endpoint ${entity.endpoint.ID} to group`);
+            }
+            else
+            {
+                if (entity.endpoint.inputClusters.includes(4))
+                {
+                    this.debug(`adding endpoint ${entity.endpoint.ID} to group`)
                     await entity.endpoint.addToGroup(group.mapped);
-                } else {
+                }
+                else {
                     let added = false;
-                    for (const ep of entity.endpoints) {
-                        if (ep.inputClusters.includes(4)) {
-                            this.debug(`adding endpoint ${ep.ID} to group`);
+                    for (const ep of entity.endpoints)
+                    {
+                        if (ep.inputClusters.includes(4))
+                        {
+                            this.debug(`adding endpoint ${ep.ID} to group`)
                             await ep.addToGroup(group.mapped);
                             added = true;
                             break;
                         }
                     }
-                    if (!added) {
-                        throw ('cluster genGroups not supported');
-                    }
+                    if (!added) throw ('cluster genGroups not supported');
                 }
             }
         } catch (error) {
             this.sendError(error);
             this.error(`Exception when trying to Add ${devId}  to group ${groupId}`, error);
-            return {error: `Failed to add ${devId}  to group ${groupId}: ${JSON.stringify(error)}`};
+            return { error:`Failed to add ${devId}  to group ${groupId}: ${JSON.stringify(error)}` };
         }
         return {};
     }
 
     async removeDevFromGroup(devId, groupId, epid) {
-        let entity;
-        try {
-            entity = await this.resolveEntity(devId);
-            const group = await this.resolveEntity(groupId);
-            this.debug(`removeDevFromGroup - entity: ${safeJsonStringify(entity)}`);
-            this.debug(`removeDevFromGroup - group: ${safeJsonStringify(group)}`);
-            if (epid != undefined) {
-                for (const ep of entity.endpoints) {
-                    if (ep.ID === epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))) {
-                        this.debug(`removing endpoint ${ep.ID} (${epid}) group ${groupId}`);
-                        await ep.removeFromGroup(group.mapped);
-                    }
-                }
-            } else await entity.endpoint.removeFromGroup(group.mapped);
-        } catch (error) {
-            this.sendError(error);
-            this.error(`Exception when trying remove ${devId} (ep ${epid ? epid : (entity ? entity.endpoint.ID : '')}) from group ${devId}`, error);
-            return {error: `Failed to remove dev ${devId} (ep ${epid ? epid : (entity ? entity.endpoint.ID : '')}) from group ${devId}`};
-        }
-        return {};
+      try {
+          const entity = await this.resolveEntity(devId);
+          const group = await this.resolveEntity(groupId);
+          this.debug(`removeDevFromGroup - entity: ${safeJsonStringify(entity)}`);
+          this.debug(`removeDevFromGroup - group: ${safeJsonStringify(group)}`);
+          if (epid != undefined) {
+            for (const ep of entity.endpoints) {
+              if (ep.ID == epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)))
+              {
+                this.debug(`removing endpoint ${ep.ID} (${epid}) group ${groupId}`)
+                await(ep.removeFromGroup(group.mapped))
+              }
+            }
+          } else await entity.endpoint.removeFromGroup(group.mapped);
+      } catch (error) {
+          this.sendError(error);
+          this.error(`Exception when trying remove ${devId} (ep ${epid?epid:entity.endpoint.ID}) from group ${devId}`, error);
+          return { error: `Failed to remove dev ${devId} (ep ${epid?epid:entity.endpoint.ID}) from group ${devId}`};
+      }
+      return {};
     }
 
     async removeDevFromAllGroups(devId) {
@@ -848,15 +857,14 @@ class ZigbeeController extends EventEmitter {
             const entity = await this.resolveEntity(devId);
             this.debug(`entity: ${safeJsonStringify(entity)}`);
             for (const ep of entity.endpoints) {
-                if (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)) {
-                    await ep.removefromAllGroups();
-                }
+              if (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))
+                await ep.removefromAllGroups();
             }
             //await entity.endpoint.removeFromAllGroups();
         } catch (error) {
             this.sendError(error);
             this.error(`Exception when trying remove ${devId} from all groups`, error);
-            return {error: `Failed to remove dev ${devId} from all groups: ${error}`};
+            return { error: `Failed to remove dev ${devId} from all groups: ${error}`};
         }
         return {};
     }
@@ -866,7 +874,7 @@ class ZigbeeController extends EventEmitter {
         target = !target ? this.getCoordinator() : target;
 
         this.debug(`Binding ${log}`);
-        ep.bind(cluster, target, error => {
+        ep.bind(cluster, target, (error) => {
             if (error) {
                 this.sendError(error);
                 this.error(`Failed to bind ${log} - (${error})`);
@@ -897,11 +905,11 @@ class ZigbeeController extends EventEmitter {
     reset(mode, callback) {
         try {
             this.herdsman.reset(mode);
-            callback && callback();
+            if (callback) callback();
         } catch (error) {
             this.sendError(error);
             this.error(`Failed to reset ${error.stack}`);
-            callback && callback(error);
+            if (callback) callback(error);
         }
     }