iobroker.zigbee 1.8.1 → 1.8.3

package/lib/exclude.js

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