iobroker.zigbee 2.0.4 → 3.0.0

package/lib/zigbeecontroller.js

@@ -12,11 +12,10 @@ const DeviceConfigureExt = require('./zbDeviceConfigure');
 const DeviceEventExt = require('./zbDeviceEvent');
 const DelayedActionExt = require('./zbDelayedAction');
 const Groups = require('./groups');
-
 const utils = require('./utils');
-const { waitForDebugger } = require('inspector');
-const { table } = require('console');
-const { extract } = require('tar');
+
+const { access, constants } =require('node:fs/promises');
+
 const groupConverters = [
     zigbeeHerdsmanConverters.toZigbee.light_onoff_brightness,
     zigbeeHerdsmanConverters.toZigbee.light_color_colortemp,
@@ -65,6 +64,7 @@ class ZigbeeController extends EventEmitter {
         super();
         this.adapter = adapter;
         this._permitJoinTime = 0;
+        this.transmitPower = 0;
         this.herdsmanStarted = false;
         this.extensions = [
             new DeviceAvailabilityExt(this, {}),
@@ -73,20 +73,53 @@ class ZigbeeController extends EventEmitter {
             new DelayedActionExt(this, {}),
         ];
         this.herdsmanTimeoutRegexp = new RegExp(/(\d+)ms/);
-        this.herdsmanLogSettings = {}
+        this.herdsmanLogSettings = {};
+        this.debugActive = true;
+
     }
 
 
-    ByteArrayToString(data) {
-        return data.map(function (x) {
-            x = x + 0x100 + 1;  // twos complement
-            x = x.toString(16); // to hex
-            x = ('00'+x).substr(-2); // zero-pad to 8-digits
-            return x
-        }).join('');
+
+    reverseIEEE(source) {
+        const rv = [];
+        for (let i=0;i<source.length;i+=2)
+            rv.push(source.slice(i,i+2))
+        return rv.reverse().join('');
+    }
+
+    async testConnectable(port) {
+        const netAddress = utils.getNetAddress(port);
+        if (netAddress && netAddress.strAddress) return netAddress.strAddress;
+        try {
+            const _port = port.trim();
+            await access(_port, constants.R_OK | constants.W_OK);
+            return _port;
+        }
+        catch (error) {
+            console.warn(`unable to access ${port}`)
+            return '';
+        }
     }
 
     configure(options) {
+
+        if (options.transmitPower != undefined) {
+            this.transmitPower = options.transmitPower;
+        }
+
+        this.powerText = '';
+        if (this.transmitPower !== '0') {
+            const powerLevels = {
+                '-22': 'low',
+                '19': 'high',
+                '20': 'high+'
+            };
+
+            this.powerText = powerLevels[this.transmitPower] || 'normal';
+        }
+
+        this.info(`  --> transmitPower : ${this.powerText}`);
+
         const herdsmanSettings = {
             network: {
                 panID: options.net.panId,
@@ -99,31 +132,34 @@ class ZigbeeController extends EventEmitter {
             serialPort: {
                 baudRate: options.sp.baudRate,
                 rtscts: options.sp.rtscts,
-                path: options.sp.port,
+                path: (typeof options.sp.port == 'string' ? options.sp.port.trim() : options.sp.port),
                 adapter: options.sp.adapter,
             },
+            transmitpower: this.transmitPower,
             adapter: {
                 forceStartWithInconsistentAdapterConfiguration: options.startWithInconsistent
             },
             legacy : false,
 
         };
+        // detect net port and rebuild
+        const tcpPort = utils.getNetAddress(herdsmanSettings.serialPort.path);
+        if (tcpPort && tcpPort.host)
+            herdsmanSettings.serialPort.path = `tcp://${tcpPort.host}:${tcpPort.port ? tcpPort.port : 80}`;
         // https://github.com/ioBroker/ioBroker.zigbee/issues/668
         if (!options.extPanIdFix) {
             delete herdsmanSettings.network.extendedPanID;
             herdsmanSettings.network.extenedPanID = options.net.extPanId;
         }
 
-        if (options.transmitPower == undefined) {
-            this.transmitPower = 0;
-        } else {
-            this.transmitPower = options.transmitPower;
+        if (options.transmitPower != undefined) {
+            herdsmanSettings.transmitPower = options.transmitPower;
         }
         this.disableLed = options.disableLed;
         this.warnOnDeviceAnnouncement = options.warnOnDeviceAnnouncement;
         this.herdsmanLogSettings.panID = herdsmanSettings.network.panID;
         this.herdsmanLogSettings.channel = herdsmanSettings.network.channelList[0];
-        this.herdsmanLogSettings.extendedPanID = this.ByteArrayToString(herdsmanSettings.network.extendedPanID);
+        this.herdsmanLogSettings.extendedPanID = utils.byteArrayToString(herdsmanSettings.network.extendedPanID);
         this.herdsman = new ZigbeeHerdsman.Controller(herdsmanSettings, this.adapter.log);
         this.callExtensionMethod('setOptions', [{
             disableActivePing: options.disablePing,
@@ -133,11 +169,23 @@ class ZigbeeController extends EventEmitter {
         }]);
     }
 
+    async stopHerdsman() {
+        try {
+            this.emit('pairing', 'stopping zigbee-herdsman');
+            await this.herdsman.stop();
+            this.emit('pairing', 'herdsman stopped !');
+            this.herdsmanStarted = false;
+        }
+        catch (error) {
+            this.emit('pairing', `error stopping zigbee-herdsman: ${error && error.message ? error.message : 'no reason given'}`);
+        }
+    }
+
     // Start controller
     async start() {
         try {
-            //this.debug(`Using zigbee-herdsman with settings2: ${JSON.stringify(this)}`);
-            this.debug(`Starting zigbee-herdsman...`);
+            this.emit('pairing',`Starting zigbee-herdsman...`);
+            if (this.debugActive) this.debug(`Starting zigbee-herdsman...`);
 
             // install event handlers before start
             this.herdsman.on('adapterDisconnected', this.handleDisconnected.bind(this));
@@ -151,44 +199,45 @@ class ZigbeeController extends EventEmitter {
             this.info('Starting Zigbee-Herdsman');
             await this.herdsman.start();
             this.herdsmanStarted = true;
-            this.info(`Zigbee-Herdsman started successfully with Coordinator firmware version: ${JSON.stringify(await this.herdsman.getCoordinatorVersion())}`);
+            const cv = await this.herdsman.getCoordinatorVersion();
+            const MetaSt = `${cv.meta.transportrev ? cv.meta.transportrev : 'X'}-${cv.meta.product ? cv.meta.product : 'X'}.${cv.meta.majorrel ? cv.meta.majorrel : 'X'}.${cv.meta.minorrel ? cv.meta.minorrel : 'X'}.${cv.meta.maintrel ? cv.meta.maintrel : 'X'}`;
+            const msg = `Zigbee-Herdsman started successfully with Coordinator firmware version: ${cv.type} : ${cv.meta.revision ? cv.meta.revision : ''} (${MetaSt})`;
+            this.emit('pairing',msg)
+            this.info(msg);
 
             // debug info from herdsman getNetworkParameters
             const debNetworkParam = JSON.parse(JSON.stringify(await this.herdsman.getNetworkParameters()));
             const extendedPanIDDebug = typeof debNetworkParam.extendedPanID === 'string' ? debNetworkParam.extendedPanID.replace('0x', '') : debNetworkParam.extendedPanID;
 
-            let extPanIDDebug = '';
-            for (let i = extendedPanIDDebug.length - 1; i >= 0; i--) {
-                extPanIDDebug += extendedPanIDDebug[i - 1];
-                extPanIDDebug += extendedPanIDDebug[i];
-                i--;
-            }
-            this.debug(`Network parameters: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${extPanIDDebug}`);
+            this.emit('pairing',`Network parameters: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${this.reverseIEEE(extendedPanIDDebug)}`);
+            if (this.debugActive) this.debug(`Network parameters: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${this.reverseIEEE(extendedPanIDDebug)}`);
         } catch (e) {
             try {
                 const debNetworkParam = JSON.parse(JSON.stringify(await this.herdsman.getNetworkParameters()));
                 const extendedPanIDDebug = typeof debNetworkParam.extendedPanID === 'string' ? debNetworkParam.extendedPanID.replace('0x', '') : debNetworkParam.extendedPanID;
 
-                let extPanIDDebug = '';
-                for (let i = extendedPanIDDebug.length - 1; i >= 0; i--) {
-                    extPanIDDebug += extendedPanIDDebug[i - 1];
-                    extPanIDDebug += extendedPanIDDebug[i];
-                    i--;
-                }
-                this.warn(`Network parameters in Config     : panID=${this.herdsmanLogSettings.panID} channel=${this.herdsmanLogSettings.channel} extendedPanID=${this.herdsmanLogSettings.extendedPanID}`)
-                this.warn(`Network parameters on Coordinator: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${extPanIDDebug}`);
+                const configParameters = `Network parameters in Config     : panID=${this.herdsmanLogSettings.panID} channel=${this.herdsmanLogSettings.channel} extendedPanID=${this.reverseIEEE(this.herdsmanLogSettings.extendedPanID)}`;
+                const networkParameters = `Network parameters on Coordinator: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${this.reverseIEEE(extendedPanIDDebug)}`;
+                this.emit('pairing',configParameters)
+                this.emit('pairing',networkParameters);
+                this.warn(configParameters)
+                this.warn(networkParameters);
             }
             catch (error) {
-                this.warn(`Unable to obtain herdsman settings`)
+                this.emit('pairing',`Unable to obtain herdsman settings`);
+                this.info(`Unable to obtain herdsman settings`)
             }
             try {
                 await this.herdsman.stop();
             }
             catch (error) {
+                this.emit('pairing','unable to stop zigbee-herdsman after failed startup');
                 this.warn('unable to stop zigbee-herdsman after failed startup');
             }
             this.sendError(e);
-            this.error(`Starting zigbee-herdsman problem : ${(e && e.message ? e.message : 'no error message')}`);
+            const msg = `Starting zigbee-herdsman problem : ${(e && e.message ? e.message : 'no error message')}`
+            this.error(msg);
+            this.emit('pairing', msg);
             throw 'Error herdsman start';
         }
         // Check if we have to turn off the LED
@@ -201,48 +250,20 @@ class ZigbeeController extends EventEmitter {
             }
         } catch (e) {
             this.info('Unable to disable LED, unsupported function.');
-            this.sendError(e);
-        }
-
-        // only for CC1352P and CC26X2R1 transmit power
-        let powerText = 'normal';
-
-        if (this.transmitPower != '0') {
-            switch (this.transmitPower) {
-                case '-22':
-                    powerText = 'low';
-                    break;
-                case '19':
-                    powerText = 'high';
-                    break;
-                case '20':
-                    powerText = 'high+';
-                    break;
-                default:
-                    powerText = 'normal';
-            }
-        }
-
-
-        this.info(`  --> transmitPower : ${powerText}`);
-        try {
-            await this.herdsman.setTransmitPower(this.transmitPower);
-        } catch (e) {
-            this.sendError(e);
-            this.info('Unable to set transmit power, unsupported function.');
+            this.emit('pairing','Unable to disable LED, unsupported function.');
         }
 
-        // Call extensions
-
         const deviceIterator = this.getClientIterator();
         let deviceCount = 0;
         try {
+            //this.emit('pairing','identifying connected devices')
             for (const device of deviceIterator) {
                 deviceCount++;
                 // get the model description for the known devices
                 const entity = await this.resolveEntity(device);
                 if (!entity) {
                     this.warn('failed to resolve Entity for ' + device.ieeeAddr);
+                    //this.emit('pairing','failed to resolve Entity for ' + device.ieeeAddr)
                     continue;
                 }
                 //await this.adapter.stController.AddModelFromHerdsman(device, entity.mapped.model);
@@ -259,33 +280,37 @@ class ZigbeeController extends EventEmitter {
                 if (entity.mapped) {
                     this.emit('new', entity);
                 }
-                this.info(
-                    (entity.device.ieeeAddr) +
+                const msg = (entity.device.ieeeAddr +
                     ` (addr ${entity.device.networkAddress}): ` +
-                    (entity.mapped ?
-                        `${entity.mapped.model} - ${entity.mapped.vendor} ${entity.mapped.description} ` :
-                        `Unsupported (model ${entity.device.modelID})`) +
-                    `(${entity.device.type})`
-                );
+                    (entity.mapped ? `${entity.mapped.model} - ${entity.mapped.vendor} ${entity.mapped.description} ` : `Unsupported (model ${entity.device.modelID})`) +
+                    `(${entity.device.type})`);
+                //this.emit('pairing',msg);
+                this.info(msg);
             }
 
             // Log zigbee clients on startup
             // const devices = await this.getClients();
             if (deviceCount > 0) {
                 this.info(`Currently ${deviceCount} devices are joined:`);
+                this.emit('pairing',`Currently ${deviceCount} devices are joined:`)
             } else {
-                this.info(`Currently no devices.`);
+                this.info(`No devices are currently joined.`);
+                this.emit('pairing',`No devices are currently joined.`);
             }
             this.callExtensionMethod('onZigbeeStarted', []);
         }
         catch (error) {
-            this.error('error iterating devices : '+ (error && error.message ? error.message: 'no reason given'));
+            const msg = 'error iterating devices : '+ (error && error.message ? error.message: 'no reason given');
+            this.error(msg);
+            this.emit('pairing',msg);
         }
         try {
             this.getGroups();
         }
         catch (error) {
-            this.error('error iterating groups : '+ (error && error.message ? error.message: 'no reason given'));
+            const msg = 'error iterating groups : '+ (error && error.message ? error.message: 'no reason given');
+            this.error(msg);
+            this.emit('pairing',msg);
         }
         this.emit('ready');
     }
@@ -409,9 +434,9 @@ class ZigbeeController extends EventEmitter {
                 group = await this.herdsman.createGroup(nid);
                 group.toZigbee = groupConverters;
                 group.model = 'group';
-                this.debug(`verifyGroupExists: created group ${nid}`);
+                if (this.debugActive) this.debug(`verifyGroupExists: created group ${nid}`);
             } else {
-                this.debug(`verifyGroupExists: group ${nid} exists`);
+                if (this.debugActive) this.debug(`verifyGroupExists: group ${nid} exists`);
             }
             return group
         }
@@ -431,7 +456,7 @@ class ZigbeeController extends EventEmitter {
     }
 
     async addPairingCode(code) {
-        this.debug(`calling addPairingCode with ${code}`);
+        if (this.debugActive) this.debug(`calling addPairingCode with ${code}`);
         if (code) {
             try {
                 await this.herdsman.addInstallCode(code);
@@ -575,6 +600,7 @@ class ZigbeeController extends EventEmitter {
             if (_key.kind === 'ieee') _key.key = await this.herdsman.getDeviceByIeeeAddr(_key.key);
             const device = _key.key;
             if (device) {
+                const t = Date.now();
                 const mapped = await zigbeeHerdsmanConverters.findByDevice(device);
                 const endpoints = mapped && mapped.endpoint ? mapped.endpoint(device) : null;
                 let endpoint;
@@ -609,15 +635,15 @@ class ZigbeeController extends EventEmitter {
 
     async incMsgHandler(message) {
         try {
-            this.debug('incoming msg', message);
+            if (this.debugActive) this.debug('incoming msg', message);
             const device = await this.herdsman.getDeviceByIeeeAddr(message.srcaddr);
             if (!device) {
-                this.debug('Message without device!');
+                if (this.debugActive) this.debug('Message without device!');
                 return;
             }
             // We can't handle devices without modelId.
             if (!device.modelId) {
-                this.debug('Message without modelId!');
+                if (this.debugActive) this.debug('Message without modelId!');
                 return;
             }
             this.event('msg', device.ieeeAddr, message, {
@@ -640,8 +666,9 @@ class ZigbeeController extends EventEmitter {
         }
 
         try {
-            await this.permitJoin(0);
+            if (this.HerdsmanStarted) await this.permitJoin(0);
             await this.herdsman.stop();
+            this.HerdsmanStarted = false;
         } catch (error) {
             this.sendError(error);
             if (this.herdsmanStarted) {
@@ -675,7 +702,7 @@ class ZigbeeController extends EventEmitter {
     async handlePermitJoinChanged(data)
     {
         try {
-            this.debug(`Event handlePermitJoinChanged received with ${JSON.stringify(data)}`);
+            if (this.debugActive) this.debug(`Event handlePermitJoinChanged received with ${JSON.stringify(data)}`);
             if (data.permitted) {
                 if (!this._permitJoinInterval) {
                     this.emit('pairing',`Pairing possible for ${this._permitJoinTime} seconds`)
@@ -710,12 +737,12 @@ class ZigbeeController extends EventEmitter {
                 } catch (error) {
                     this.sendError(error);
                     if (error)
-                        this.debug(`Failed to remove device. If device is remove is all fine, when not use Force remove`);
+                        if (this.debugActive) this.debug(`Failed to remove device. If device is remove is all fine, when not use Force remove`);
                     // skip error if force
                     if (!force) {
                         throw error;
                     } else {
-                        this.debug(`Force remove`);
+                        if (this.debugActive) this.debug(`Force remove`);
                     }
                 }
 
@@ -725,9 +752,9 @@ class ZigbeeController extends EventEmitter {
                     this.sendError(error);
                     // skip error
                     if (error)
-                        this.debug(`Failed to remove from DB ${error.stack}`);
+                        if (this.debugActive) this.debug(`Failed to remove from DB ${error.stack}`);
                 }
-                this.debug('Remove successful.');
+                if (this.debugActive) this.debug('Remove successful.');
                 callback && callback();
                 this.callExtensionMethod(
                     'onDeviceRemove',
@@ -744,10 +771,14 @@ class ZigbeeController extends EventEmitter {
     // Zigbee events
     async handleDeviceLeave(message) {
         try {
-            this.debug('handleDeviceLeave', message);
+            if (this.debugActive) this.debug('handleDeviceLeave', message);
             const entity = await this.resolveEntity(message.device || message.ieeeAddr);
             const friendlyName = entity ? entity.name : message.ieeeAddr;
-            this.debug(`Device '${friendlyName}' left the network`);
+            if (this.adapter.stController.checkDebugDevice(friendlyName)) {
+                this.emit('device_debug', {ID: Date.now(), data: {flag:'dl', states:[{id: '--', value:'--', payload:message}], IO:true},message:`Device '${friendlyName}' has left the network`});
+            }
+            else
+                this.info(`Device '${friendlyName}' left the network`);
             this.emit('leave', message.ieeeAddr);
             // Call extensions
             this.callExtensionMethod(
@@ -761,10 +792,13 @@ class ZigbeeController extends EventEmitter {
     }
 
     async handleDeviceAnnounce(message) {
-        this.debug('handleDeviceAnnounce', message);
+        if (this.debugActive) this.debug('handleDeviceAnnounce', message);
         const entity = await this.resolveEntity(message.device || message.ieeeAddr);
         const friendlyName = entity.name;
-        if (this.warnOnDeviceAnnouncement) {
+        if (this.adapter.stController.checkDebugDevice(friendlyName)) {
+            this.emit('device_debug', {ID: Date.now(), data: {flag:'da', states:[{id: '--', value:'--', payload:message}] , IO:true} ,message:`Device '${friendlyName}' announced itself`});
+        }
+        else if (this.warnOnDeviceAnnouncement) {
             this.warn(`Device '${friendlyName}' announced itself`);
         } else {
             this.info(`Device '${friendlyName}' announced itself`);
@@ -793,13 +827,13 @@ class ZigbeeController extends EventEmitter {
     }
 
     async handleDeviceJoined(message) {
-        this.debug('handleDeviceJoined', message);
+        if (this.debugActive) this.debug('handleDeviceJoined', message);
         //const entity = await this.resolveEntity(message.device || message.ieeeAddr);
         //this.emit('new', entity);
     }
 
     async handleDeviceInterview(message) {
-        this.debug('handleDeviceInterview', message);
+        if (this.debugActive) this.debug('handleDeviceInterview', message);
         // safeguard: We do not allow to start an interview if the network is not opened
         if (message.status === 'started' && !this.herdsman.getPermitJoin()) {
             this.warn(`Blocked interview for '${message.ieeeAddr}' because the network is closed`);
@@ -827,7 +861,7 @@ class ZigbeeController extends EventEmitter {
                         [message, entity ? entity.mapped : null],
                     );
                 } else {
-                    this.debug(
+                    if (this.debugActive) this.debug(
                         `Device '${friendlyName}' with Zigbee model '${message.device.modelID}' is NOT supported, ` +
                         `please follow https://www.zigbee2mqtt.io/how_tos/how_to_support_new_devices.html`
                     );
@@ -853,10 +887,10 @@ class ZigbeeController extends EventEmitter {
     }
 
     async handleMessage(data) {
-        this.debug(`handleMessage`, data);
+        if (this.debugActive) this.debug(`handleMessage`, data);
         const entity = await this.resolveEntity(data.device || data.ieeeAddr);
         const name = (entity && entity._modelID) ? entity._modelID : data.device.ieeeAddr;
-        this.debug(
+        if (this.debugActive) this.debug(
             `Received Zigbee message from '${name}', type '${data.type}', cluster '${data.cluster}'` +
             `, data '${JSON.stringify(data.data)}' from endpoint ${data.endpoint.ID}` +
             (data.hasOwnProperty('groupID') ? ` with groupID ${data.groupID}` : ``)
@@ -883,7 +917,7 @@ class ZigbeeController extends EventEmitter {
                 let resolved = await this.resolveEntity(device, 0);
                 if (!resolved) {
                     resolved = { name:'unresolved device', device:device }
-                    this.warn('resolve Entity failed for ' + device.ieeeAddr)
+                    if (this.debugActive) this.debug('resolve Entity failed for ' + device.ieeeAddr)
                 }
                 let result;
 
@@ -943,9 +977,9 @@ class ZigbeeController extends EventEmitter {
 
             callback && callback({lqis, routing, errors});
             if (errors.length) {
-                this.warn(`Map Data collection complete with ${errors.length} issues:`);
+                if (this.debugActive) this.debug(`Map Data collection complete with ${errors.length} issues:`);
                 for (const msg of errors)
-                    this.warn(msg);
+                    if (this.debugActive) this.debug(msg);
             }
             else
                 this.info('Map data collection complete');
@@ -973,7 +1007,7 @@ class ZigbeeController extends EventEmitter {
             return;
         }
 
-        this.debug(`Zigbee publish to '${deviceID}', ${cid} - cmd ${cmd} - payload ${JSON.stringify(zclData)} - cfg ${JSON.stringify(cfg)} - endpoint ${ep}`);
+        if (this.debugActive) this.debug(`Zigbee publish to '${deviceID}', ${cid} - cmd ${cmd} - payload ${JSON.stringify(zclData)} - cfg ${JSON.stringify(cfg)} - endpoint ${ep}`);
 
         if (cfg == null) {
             cfg = {};
@@ -1012,23 +1046,23 @@ class ZigbeeController extends EventEmitter {
 
     async addDevToGroup(devId, groupId, epid) {
         try {
-            this.debug(`called addDevToGroup with ${devId}, ${groupId}, ${epid}`);
+            if (this.debugActive) this.debug(`called addDevToGroup with ${devId}, ${groupId}, ${epid}`);
             const entity = await this.resolveEntity(devId);
             const group = await this.resolveEntity(groupId);
-            this.debug(`addDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
+            if (this.debugActive) this.debug(`addDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
             // generate group debug info and display it
             const members = await this.getGroupMembersFromController(groupId);
             const memberIDs = [];
             for (const member of members) {
                 memberIDs.push(member.ieee);
             }
-            this.debug(`addDevToGroup ${groupId} with ${memberIDs.length} members ${safeJsonStringify(memberIDs)}`);
+            if (this.debugActive) this.debug(`addDevToGroup ${groupId} with ${memberIDs.length} members ${safeJsonStringify(memberIDs)}`);
             if (epid != undefined) {
                 for (const ep of entity.endpoints) {
-                    this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`);
+                    if (this.debugActive) this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`);
                     if (ep.ID == epid) {
                         if (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)) {
-                            this.debug(`adding endpoint ${ep.ID} (${epid}) to group ${groupId}`);
+                            if (this.debugActive) this.debug(`adding endpoint ${ep.ID} (${epid}) to group ${groupId}`);
                             await (ep.addToGroup(group.mapped));
                         }
                         else this.error(`cluster genGroups not supported for endpoint ${epid} of ${devId}`);
@@ -1061,25 +1095,15 @@ class ZigbeeController extends EventEmitter {
     }
 
     async removeDevFromGroup(devId, groupId, epid) {
-        this.debug(`removeDevFromGroup with ${devId}, ${groupId}, ${epid}`);
+        if (this.debugActive) this.debug(`removeDevFromGroup with ${devId}, ${groupId}, ${epid}`);
         let entity;
         try {
             entity = await this.resolveEntity(devId);
             const group = await this.resolveEntity(groupId);
 
-            /*
-            const members = await this.getGroupMembersFromController(groupId);
-            const memberIDs = [];
-            for (const member of members) {
-                memberIDs.push(member.ieee);
-            }
-
-            this.debug(`removeDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
-            this.debug(`removeDevFromGroup ${groupId} with ${memberIDs.length} members ${safeJsonStringify(memberIDs)}`);
-            */
             if (epid != undefined) {
                 for (const ep of entity.endpoints) {
-                    this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`);
+                    if (this.debugActive) this.debug(`checking ep ${ep.ID} of ${devId} (${epid})`);
                     if (ep.ID == epid && (ep.inputClusters.includes(4) || ep.outputClusters.includes(4))) {
                         await ep.removeFromGroup(group.mapped);
                         this.info(`removing endpoint ${ep.ID} of ${devId} from group ${groupId}`);
@@ -1101,7 +1125,7 @@ class ZigbeeController extends EventEmitter {
     async removeDevFromAllGroups(devId) {
         try {
             const entity = await this.resolveEntity(devId);
-            this.debug(`entity: ${safeJsonStringify(entity)}`);
+            if (this.debugActive) this.debug(`entity: ${safeJsonStringify(entity)}`);
             for (const ep of entity.endpoints) {
                 if (ep.inputClusters.includes(4) || ep.outputClusters.includes(4)) {
                     await ep.removefromAllGroups();
@@ -1119,14 +1143,14 @@ class ZigbeeController extends EventEmitter {
         const log = ` ${ep.device.ieeeAddr} - ${cluster}`;
         target = !target ? this.getCoordinator() : target;
 
-        this.debug(`Binding ${log}`);
+        if (this.debugActive) this.debug(`Binding ${log}`);
         try {
             ep.bind(cluster, target, error => {
                 if (error) {
                     this.sendError(error);
                     this.error(`Failed to bind ${log} - (${error})`);
                 } else {
-                    this.debug(`Successfully bound ${log}`);
+                    if (this.debugActive) this.debug(`Successfully bound ${log}`);
                 }
 
                 callback(error);
@@ -1141,13 +1165,13 @@ class ZigbeeController extends EventEmitter {
         const log = ` ${ep.device.ieeeAddr} - ${cluster}`;
         target = !target ? this.getCoordinator() : target;
 
-        this.debug(`Unbinding ${log}`);
+        if (this.debugActive) this.debug(`Unbinding ${log}`);
         try {
             ep.unbind(cluster, target, (error) => {
                 if (error) {
                     this.error(`Failed to unbind ${log} - (${error})`);
                 } else {
-                    this.debug(`Successfully unbound ${log}`);
+                    if (this.debugActive) this.debug(`Successfully unbound ${log}`);
                 }
 
                 callback(error);
@@ -1186,9 +1210,9 @@ class ZigbeeController extends EventEmitter {
         {
             const payload = ZDO.Buffalo.buildRequest(false, clusterId, [11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26], 0x05, 1, 0, undefined);
             const scanresult = await this.herdsman.adapter.sendZdo(0x0, 0x0, clusterId , payload, false);
-            this.debug(`scanresult is  ${JSON.stringify(scanresult)}`)
+            if (this.debugActive) this.debug(`scanresult is  ${JSON.stringify(scanresult)}`)
             result.energyvalues = scanresult[1].entryList;
-            this.debug(`result is  ${JSON.stringify(result)}`)
+            if (this.debugActive) this.debug(`result is  ${JSON.stringify(result)}`)
         }
         catch (error) {
             this.sendError(error);