iobroker.zigbee 1.8.1 → 1.8.3

package/lib/binding.js

@@ -34,7 +34,7 @@ class Binding {
     debug(msg) {
         this.adapter.log.debug(msg);
     }
-
+    
     warn(msg) {
         this.adapter.log.warn(msg);
     }
@@ -47,26 +47,30 @@ class Binding {
             switch (obj.command) {
                 case 'addBinding':
                     if (obj && obj.message && typeof obj.message === 'object') {
-                        this.addBinding(obj.from, obj.command, obj.message, err =>
-                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
+                        this.addBinding(obj.from, obj.command, obj.message, (err)=>{
+                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
+                        });
                     }
                     break;
                 case 'editBinding':
                     if (obj && obj.message && typeof obj.message === 'object') {
-                        this.editBinding(obj.from, obj.command, obj.message, err =>
-                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
+                        this.editBinding(obj.from, obj.command, obj.message, (err)=>{
+                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
+                        });
                     }
                     break;
                 case 'getBinding':
                     if (obj && obj.message && typeof obj.message === 'object') {
-                        this.getBinding(binding =>
-                            this.adapter.sendTo(obj.from, obj.command, binding, obj.callback));
+                        this.getBinding((binding)=>{
+                            this.adapter.sendTo(obj.from, obj.command, binding, obj.callback);
+                        });
                     }
                     break;
                 case 'delBinding':
                     if (obj && obj.message) {
-                        this.delBinding(obj.from, obj.command, obj.message, err =>
-                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
+                        this.delBinding(obj.from, obj.command, obj.message, (err)=>{
+                            this.adapter.sendTo(obj.from, obj.command, err, obj.callback);
+                        });
                     }
                     break;
             }
@@ -82,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) {
@@ -121,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;
@@ -141,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) {
@@ -167,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,
@@ -203,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();
+                        });
                     });
                 }
             });
@@ -216,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,
@@ -224,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 {
@@ -234,10 +239,10 @@ class Binding {
             } else {
                 const type = params.unbind_from_coordinator ? 'unbind' : 'bind';
                 try {
-                    await this.doBindUnbind(type, bind_source, bind_source_ep, 'coordinator', '1');
+                    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) {
@@ -247,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 {
@@ -303,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);
                 }
             });