Merge pull request #297 from tim-hellhake/fix-zigbee2mqtt-logs

Fix zigbee2mqtt logs

Author: tim-hellhake

src/zigbee2mqtt/zigbee2mqtt-adapter.ts

@@ -13,7 +13,9 @@ import mqtt from 'mqtt';
 import { Zigbee2MqttDevice } from './zigbee2mqtt-device';
 import DEBUG_FLAG from '../zb-debug';
 
-const debug = DEBUG_FLAG.DEBUG_zigbee2mqtt;
+function debug(): boolean {
+  return DEBUG_FLAG.DEBUG_zigbee2mqtt;
+}
 
 import manifest from '../manifest.json';
 
@@ -87,7 +89,7 @@ export class Zigbee2MqttAdapter extends Adapter {
     client.on('message', (topic, message) => {
       const raw = message.toString();
 
-      if (debug) {
+      if (debug()) {
         console.log(`Received on ${topic}: ${raw}`);
       }
 
@@ -179,7 +181,7 @@ export class Zigbee2MqttAdapter extends Adapter {
           if (!existingDevice) {
             const device = new Zigbee2MqttDevice(this, id, deviceDefinition, client, this.prefix);
             this.handleDeviceAdded(device);
-          } else if (debug) {
+          } else if (debug()) {
             console.log(`Device ${id} already exists`);
           }
         } else {
@@ -210,7 +212,7 @@ export class Zigbee2MqttAdapter extends Adapter {
   }
 
   private publish(topic: string, payload: string): void {
-    if (debug) {
+    if (debug()) {
       console.log(`Sending ${payload} to ${topic}`);
     }
 

src/zigbee2mqtt/zigbee2mqtt-device.ts

@@ -23,7 +23,9 @@ import {
 import mqtt from 'mqtt';
 import DEBUG_FLAG from '../zb-debug';
 
-const debug = DEBUG_FLAG.DEBUG_zigbee2mqtt;
+function debug(): boolean {
+  return DEBUG_FLAG.DEBUG_zigbee2mqtt;
+}
 
 const IGNORED_PROPERTIES = ['linkquality', 'local_temperature_calibration', 'running_state'];
 
@@ -371,7 +373,7 @@ export class Zigbee2MqttDevice extends Device {
         );
 
         if (!exists) {
-          if (debug) {
+          if (debug()) {
             console.log(`Event '${value}' does not exist on ${this.getTitle()} (${this.getId()})`);
           }
           continue;
@@ -384,7 +386,7 @@ export class Zigbee2MqttDevice extends Device {
 
         if (property) {
           property.update(value, update);
-        } else if (debug) {
+        } else if (debug()) {
           console.log(`Property '${key}' does not exist on ${this.getTitle()} (${this.getId()})`);
         }
       }
@@ -400,7 +402,7 @@ export class Zigbee2MqttDevice extends Device {
       const writeTopic = `${this.deviceTopic}/set`;
       const json = { [name]: input };
 
-      if (debug) {
+      if (debug()) {
         console.log(`Sending ${JSON.stringify(json)} to ${writeTopic}`);
       }
 

src/zigbee2mqtt/zigbee2mqtt-property.ts

@@ -19,7 +19,9 @@ import { Zigbee2MqttDevice } from './zigbee2mqtt-device';
 import mqtt from 'mqtt';
 import DEBUG_FLAG from '../zb-debug';
 
-const debug = DEBUG_FLAG.DEBUG_zigbee2mqtt;
+function debug(): boolean {
+  return DEBUG_FLAG.DEBUG_zigbee2mqtt;
+}
 
 export const WRITE_BIT = 0b010;
 export const READ_BIT = 0b100;
@@ -135,7 +137,7 @@ export class Zigbee2MqttProperty<T extends PropertyValue> extends Property<T> {
       const writeTopic = `${this.deviceTopic}/set`;
       const json = { [this.getName()]: value };
 
-      if (debug) {
+      if (debug()) {
         console.log(`Sending ${JSON.stringify(json)} to ${writeTopic}`);
       }