iobroker.zigbee 1.8.1 → 1.8.3

package/lib/groups.js

@@ -2,6 +2,7 @@
 
 const statesMapping = require('./devices');
 
+
 class Groups {
     constructor(adapter) {
         this.adapter = adapter;
@@ -12,12 +13,12 @@ class Groups {
         this.zbController = zbController;
         this.stController = stController;
         this.adapter.getStateAsync('info.groups')
-            .then(groupsState => {
+            .then((groupsState) => {
                 const groups = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
                 for (const gid in groups) {
                     stController.storeDeviceName(`group_${gid}`, groups[gid]);
                 }
-                // this.Adapter.deleteState('info.groups');
+//                this.Adapter.deleteState('info.groups');
                 this.syncGroups();
             });
     }
@@ -76,53 +77,56 @@ class Groups {
                 for (const member of groupmembers) {
                     const nwk = member.deviceNetworkAddress;
                     const device = this.zbController.getDeviceByNetworkAddress(nwk);
-                    if (device && device.ieeeAddr) {
-                        members.push({device: device.ieeeAddr});
-                    }
+                    if (device && device.ieeeAddr) members.push( { device:device.ieeeAddr } );
                 }
-            } else {
+            }
+            else {
                 return undefined;
             }
 
         } catch (error) {
-            if (error) this.error(`getGroupMembersFromController: error is  ${JSON.stringify(error)} ${JSON.stringify(new Error().stack)}`);
+            if (error) this.error('getGroupMembersFromController: error is  ' + JSON.stringify(error) + ' ' + JSON.stringify(new Error().stack));
             else this.error('unidentifed error in getGroupMembersFromController');
         }
         return members;
     }
 
     async getGroups(obj) {
-        const response = {groups: {}};
+        const response = { groups: {} };
         try {
-            // const groupsState = await this.adapter.getStateAsync('info.groups');
+//            const groupsState = await this.adapter.getStateAsync('info.groups');
             const herdsmanGroups = await this.zbController.getGroups();
 
-            // const groups = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
+//            const groups = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
 
             const groups = {};
             if (typeof herdsmanGroups === 'object') {
                 for (const group of herdsmanGroups) {
                     const gid = group.groupID;
                     if (gid) {
-                        groups[gid] = this.stController.verifyDeviceName(`group_${gid}`, `Group ${gid}`);
+                        groups[gid]=this.stController.verifyDeviceName(`group_${gid}`,`Group ${gid}`);
                     }
                 }
             }
-            this.debug(`getGroups result: ${JSON.stringify(groups)}`);
+            this.debug('getGroups result: ' + JSON.stringify(groups));
             response.groups = groups;
-        } catch (error) {
+        }
+        catch (error) {
             response.error = `getGroups: caught error: ${error}`;
             this.error(`getGroups: caught error: ${error}`);
-        } finally {
-            obj && this.adapter.sendTo(obj.from, obj.command, response, obj.callback);
+        }
+        finally {
+            if (obj)
+                this.adapter.sendTo(obj.from, obj.command, response, obj.callback);
+
         }
         return response.groups;
     }
 
     async updateGroupMembership(from, command, message, callback) {
         try {
-            const groups = message && message.groups ? message.groups : {};
-            const devId = message && message.id ? message.id : undefined;
+            const groups = (message && message.groups ? message.groups : {});
+            const devId = (message && message.id ? message.id : undefined);
             if (devId === undefined) {
                 this.adapter.sendTo(from, command, {error: 'No device specified'}, callback);
             }
@@ -132,32 +136,33 @@ class Groups {
             // this.adapter.setState(id, JSON.stringify(groups), true);
 
             //const current = await this.zbController.getGroupMembersFromController(sysid);
-            const errors = [];
+            const errors = []
             for (const epid in groups) {
                 for (const gpid of groups[epid]) {
                     const gpidn = parseInt(gpid);
                     if (gpidn < 0) {
-                        const response = await this.zbController.removeDevFromGroup(sysid, (-gpidn), epid);
+                        let response = await this.zbController.removeDevFromGroup(sysid,(-gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
-                            this.error(`remove dev from group Error: ${JSON.stringify(response.error)}`);
+                            this.error("remove dev from group Error: "+ JSON.stringify(response.error));
                         }
-                    } else if (gpidn > 0) {
-                        const response = await this.zbController.addDevToGroup(sysid, (gpidn), epid);
+                    }
+                    else if (gpidn > 0){
+                        let response = await this.zbController.addDevToGroup(sysid,(gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
-                            this.error(`add dev to group Error: ${JSON.stringify(response.error)}`);
+                            this.error("add dev to group Error: "+ JSON.stringify(response.error));
                         }
-                    } else {
-                        this.warn('illegal group id 0');
+
                     }
+                    else this.warn('illegal group id 0');
                 }
             }
         } catch (e) {
             this.adapter.sendTo(from, command, {error: e}, callback);
             return;
         }
-        this.adapter.sendTo(from, command, {}, callback);
+        this.adapter.sendTo(from, command, { }, callback);
     }
 
 
@@ -169,13 +174,11 @@ class Groups {
         };
         for (const member of members) {
             const entity = await this.zbController.resolveEntity(member.device);
-            if (!entity) {
-                return false;
-            }
+            if (!entity) return false;
             this.debug(`entity: ${JSON.stringify(entity)}`);
             const mappedModel = entity.mapped;
-            this.debug(`Mapped Model: ${JSON.stringify(mappedModel)}`);
-            const converter = mappedModel.toZigbee.find(c => c && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
+            this.debug('Mapped Model: ' +  JSON.stringify(mappedModel));
+            const converter = mappedModel.toZigbee.find((c) => c && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
             if (!converter) {
                 result.unsupported.push(member.device);
                 continue;
@@ -188,62 +191,63 @@ class Groups {
                 }
             }
         }
-        if (result.unsupported.length > 0) {
+        if (result.unsupported.length>0) {
             const error = {
                 code: 134,
                 message: `unsupported ${stateDesc.id} change for group members ${result.unsupported.join()}`
             };
             throw error;
         }
-        if (result.unread.length > 0) {
-            this.warn(`unread ${stateDesc.id} change for group members ${JSON.stringify(result.unread)}`);
+        if (result.unread.length>0) {
+            this.warn('unread ' + stateDesc.id + ' change for group members ' + JSON.stringify(result.unread));
         }
     }
 
     async deleteGroup(from, command, message) {
-        /*
-            const members = await this.getGroupMembersFromController(parseInt(message));
-            if (members && members.length) {
-                for (const member of members) {
-                    const devName = member.device.substring(2);
-                    const groupEntry = this.adapter.getStateAsync(`${devName}.groups`);
-                    const memberarray = (groupEntry && groupEntry.val) ? JSON.parse(groupEntry.val) : [];
-                    const index = memberarray.indexOf(message.toString());
-                    if (index > -1) {
-                        memberarray.splice(index, 1);
-                    }
-                    if (memberarray.length > 0) {
-                        await this.adapter.setStateAsync(`${devName}.groups`, JSON.stringify(memberarray), true);
-                    }
-                    else {
-                        await this.adapter.setStateAsync(`${devName}.groups`, '', true);
-                    }
+/*
+        const members = await this.getGroupMembersFromController(parseInt(message));
+        if (members && members.length) {
+            for (const member of members) {
+                const devName = member.device.substring(2);
+                const groupEntry = this.adapter.getStateAsync(`${devName}.groups`);
+                const memberarray = (groupEntry && groupEntry.val) ? JSON.parse(groupEntry.val) : [];
+                const index = memberarray.indexOf(message.toString());
+                if (index > -1) {
+                    memberarray.splice(index, 1);
+                }
+                if (memberarray.length > 0) {
+                    await this.adapter.setStateAsync(`${devName}.groups`, JSON.stringify(memberarray), true);
+                }
+                else {
+                    await this.adapter.setStateAsync(`${devName}.groups`, '', true);
                 }
             }
-            const groupsEntry = await this.adapter.getStateAsync('info.groups');
-            const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
-            delete objGroups[message.toString()];
-            await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
-        */
+        }
+        const groupsEntry = await this.adapter.getStateAsync('info.groups');
+        const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
+        delete objGroups[message.toString()];
+        await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
+*/
         await this.zbController.removeGroupById(message);
         await this.stController.deleteDeviceStatesAsync(`group_${parseInt(message)}`);
     }
 
     async renameGroup(from, command, message) {
-        // const groupsEntry = await this.adapter.getStateAsync('info.groups');
-        // const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
+
+//        const groupsEntry = await this.adapter.getStateAsync('info.groups');
+//        const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
         const name = message.name;
         const id = `group_${message.id}`;
         this.stController.storeDeviceName(id, name);
         try {
-            await this.zbController.verifyGroupExists(message.id);
-        } catch (e) {
-            if (e && e.hasOwnProperty('code')) {
-                this.warn(`renameGroup caught error ${JSON.stringify(e.code)}`);
-            }
+          await this.zbController.verifyGroupExists(message.id);
+        }
+        catch (e)
+        {
+          if (e && e.hasOwnProperty('code')) this.warn('renameGroup caught error ' + JSON.stringify(e.code));
         }
-        // objGroups[message.id.toString()] = message.name;
-        // await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
+//        objGroups[message.id.toString()] = message.name;
+//        await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
 
         const group = await this.adapter.getStateAsync(id);
         if (!group) {
@@ -251,14 +255,12 @@ class Groups {
             this.adapter.setObjectNotExists(id, {
                 type: 'device',
                 common: {name: name, type: 'group'},
-                native: {id}
+                native: {id: id}
             }, () => {
-                this.adapter.extendObject(id, {common: {name, type: 'group'}});
+                this.adapter.extendObject(id , {common: {name: name, type: 'group'}});
                 // create writable states for groups from their devices
                 for (const stateInd in statesMapping.groupStates) {
-                    if (!statesMapping.groupStates.hasOwnProperty(stateInd)) {
-                        continue;
-                    }
+                    if (!statesMapping.groupStates.hasOwnProperty(stateInd)) continue;
                     const statedesc = statesMapping.groupStates[stateInd];
                     const common = {
                         name: statedesc.name,
@@ -277,15 +279,16 @@ class Groups {
         }
     }
 
+
     async syncGroups() {
         const groups = await this.getGroups();
         const chain = [];
         const usedGroupsIds = [];
         for (const j in groups) {
             if (groups.hasOwnProperty(j)) {
-                const id = `group_${j}`;
-                const name = groups[j];
-                chain.push(new Promise(resolve => {
+                const id = `group_${j}`,
+                    name = groups[j];
+                chain.push(new Promise((resolve) => {
                     this.adapter.setObjectNotExists(id, {
                         type: 'device',
                         common: {name: name, type: 'group'},
@@ -294,9 +297,7 @@ class Groups {
                         this.adapter.extendObject(id, {common: {type: 'group'}});
                         // create writable states for groups from their devices
                         for (const stateInd in statesMapping.groupStates) {
-                            if (!statesMapping.groupStates.hasOwnProperty(stateInd)) {
-                                continue;
-                            }
+                            if (!statesMapping.groupStates.hasOwnProperty(stateInd)) continue;
                             const statedesc = statesMapping.groupStates[stateInd];
                             const common = {
                                 name: statedesc.name,
@@ -317,8 +318,8 @@ class Groups {
                 usedGroupsIds.push(parseInt(j));
             }
         }
-        chain.push(new Promise(resolve =>
-            // remove unused adapter groups
+        chain.push(new Promise((resolve) => {
+            // remove unused adpter groups
             this.adapter.getDevices((err, devices) => {
                 if (!err) {
                     devices.forEach((dev) => {
@@ -331,10 +332,11 @@ class Groups {
                     });
                 }
                 resolve();
-            })));
-
-        await Promise.all(chain);
+            });
+        }));
+        Promise.all(chain);
     }
+
 }
 
 module.exports = Groups;

package/lib/json.js

@@ -3,14 +3,15 @@
 const hasProp = Object.prototype.hasOwnProperty;
 
 function throwsMessage(err) {
-    return `[Throws: ${err ? err.message : '?'}]`;
+    return '[Throws: ' + (err ? err.message : '?') + ']';
 }
 
 function safeGetValueFromPropertyOnObject(obj, property) {
     if (hasProp.call(obj, property)) {
         try {
             return obj[property];
-        } catch (err) {
+        }
+        catch (err) {
             return throwsMessage(err);
         }
     }
@@ -19,14 +20,14 @@ function safeGetValueFromPropertyOnObject(obj, property) {
 }
 
 function ensureProperties(obj) {
-    const seen = []; // store references to objects we have seen before
+    const seen = [ ]; // store references to objects we have seen before
 
     function visit(obj) {
         if (obj === null || typeof obj !== 'object') {
             return obj;
         }
 
-        if (seen.includes(obj)) {
+        if (seen.indexOf(obj) !== -1) {
             return '[Circular]';
         }
         seen.push(obj);
@@ -34,7 +35,7 @@ function ensureProperties(obj) {
         if (typeof obj.toJSON === 'function') {
             try {
                 return visit(obj.toJSON());
-            } catch (err) {
+            } catch(err) {
                 return throwsMessage(err);
             }
         }

package/lib/networkmap.js

@@ -1,5 +1,6 @@
 'use strict';
 
+
 class NetworkMap {
     constructor(adapter) {
         this.adapter = adapter;
@@ -45,8 +46,8 @@ class NetworkMap {
 
     getMap(from, command, callback) {
         if (this.zbController) {
-            this.zbController.getMap(networkmap => {
-                this.adapter.log.debug(`getMap result: ${JSON.stringify(networkmap)}`);
+            this.zbController.getMap((networkmap) => {
+                this.adapter.log.debug('getMap result: ' + JSON.stringify(networkmap));
                 this.adapter.sendTo(from, command, networkmap, callback);
             });
         }

package/lib/ota.js

@@ -55,11 +55,7 @@ class Ota {
         const device = await this.getDeviceForMessage(obj);
         if (!device) {
             this.debug(`Device ${obj.message.devId} is unavailable`);
-            this.adapter.sendTo(obj.from, obj.command, {
-                status: 'fail',
-                device: getZbId(obj.message.devId),
-                msg: 'Device is unavailable'
-            }, obj.callback);
+            this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is unavailable'}, obj.callback);
             return;
         }
         if (this.inProgress.has(device.device.ieeeAddr)) {
@@ -69,24 +65,16 @@ class Ota {
         // do not attempt update for a device which has been deactivated or is unavailable
         const stateObj = await this.adapter.getObjectAsync(obj.message.devId);
         if (stateObj && stateObj.common && stateObj.common.deactivated) {
-            this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
-            this.adapter.sendTo(obj.from, obj.command, {
-                status: 'fail',
-                device: getZbId(obj.message.devId),
-                msg: 'Device is deactivated'
-            }, obj.callback);
-            return;
+          this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
+          this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is deactivated'}, obj.callback);
+          return;
         }
-        const availablestate = await this.adapter.getStateAsync(`${obj.message.devId.replace(this.namespace + '.', '')}.available`);
-        const lqi = await this.adapter.getStateAsync(`${obj.message.devId.replace(this.namespace + '.', '')}.link_quality`);
+        const availablestate = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.available');
+        const lqi = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.link_quality');
         if ((availablestate && (!availablestate.val)) || (lqi && lqi.val < 1)) {
-            this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
-            this.adapter.sendTo(obj.from, obj.command, {
-                status: 'fail',
-                device: getZbId(obj.message.devId),
-                msg: 'Device is marked unavailable'
-            }, obj.callback);
-            return;
+          this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
+          this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is marked unavailable'}, obj.callback);
+          return;
         }
         this.inProgress.add(device.device.ieeeAddr);
         const result = {status: 'unknown', device: device ? device.name : null};
@@ -115,11 +103,7 @@ class Ota {
         const device = await this.getDeviceForMessage(obj);
         if (!device) {
             this.debug(`Device ${obj.message.devId} is unavailable`);
-            this.adapter.sendTo(obj.from, obj.command, {
-                status: 'fail',
-                device: getZbId(obj.message.devId),
-                msg: 'Device is unavailable'
-            }, obj.callback);
+            this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is unavailable'}, obj.callback);
             return;
         }
         if (this.inProgress.has(device.device.ieeeAddr)) {
@@ -129,19 +113,19 @@ class Ota {
         // do not attempt update for a device which has been deactivated or is unavailable
         const stateObj = await this.adapter.getObjectAsync(obj.message.devId);
         if (stateObj && stateObj.common && stateObj.common.deactivated) {
-            this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
-            return;
+          this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
+          return;
         }
-        const availablestate = await this.adapter.getStateAsync(`${obj.message.devId.replace(this.namespace + '.', '')}.available`);
-        const lqi = await this.adapter.getStateAsync(`${obj.message.devId.replace(this.namespace + '.', '')}.link_quality`);
+        const availablestate = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.available');
+        const lqi = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.link_quality');
         if ((availablestate && (!availablestate.val)) || (lqi && lqi.val < 1)) {
-            this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
-            return;
+          this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
+          return;
         }
         this.inProgress.add(device.device.ieeeAddr);
         const result = {status: 'unknown', device: device ? device.name : null};
         try {
-            this.info('Start firmware update for ' + device.name);
+            this.info('Start firmware update for '+device.name);
 
             const onProgress = (progress, remaining) => {
                 let message = `Update of '${device.name}' at ${progress}%`;
@@ -156,7 +140,7 @@ class Ota {
             const to = await this.readSoftwareBuildIDAndDateCode(device.device, true);
             const [fromS, toS] = [JSON.stringify(from_), JSON.stringify(to)];
             result.status = 'success';
-            result.msg = `Finished update of '${device.name}'${to ? `, from '${fromS}' to '${toS}'` : ``}`;
+            result.msg = `Finished update of '${device.name}'` + (to ? `, from '${fromS}' to '${toS}'` : ``);
             this.info(result.msg);
             this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
         } catch (error) {