cleanup event listeners, increase log verbosity (rdmtc/RedMatic#287)

nodes/command.js

@@ -11,10 +11,6 @@ module.exports = function (RED) {
             }
 
             let nodeStatus = {text: ''};
-            shepherdNode.proxy.on('nodeStatus', status => {
-                nodeStatus = status;
-                this.status(status);
-            });
 
             this.shepherd = shepherdNode.herdsman;
 
@@ -96,6 +92,19 @@ module.exports = function (RED) {
                     this.status({fill: 'red', shape: 'dot', text: err.message});
                 });
             });
+
+            const nodeStatusHandler = status => {
+                nodeStatus = status;
+                this.status(status);
+            };
+
+            this.debug('adding event listeners');
+            shepherdNode.proxy.on('nodeStatus', nodeStatusHandler);
+
+            this.on('close', () => {
+                this.debug('removing event listeners');
+                shepherdNode.proxy.removeListener('nodeStatus', nodeStatusHandler);
+            });
         }
     }
 

nodes/controller.js

@@ -11,17 +11,6 @@ module.exports = function (RED) {
             }
 
             let nodeStatus = {text: ''};
-            herdsmanNode.proxy.on('nodeStatus', status => {
-                nodeStatus = status;
-                this.status(status);
-            });
-            herdsmanNode.proxy.on('permitJoin', status => {
-                if (status) {
-                    this.status({shape: 'ring', fill: 'blue', text: 'join permitted'});
-                } else {
-                    this.status(nodeStatus);
-                }
-            });
 
             this.herdsman = herdsmanNode.herdsman;
 
@@ -80,6 +69,29 @@ module.exports = function (RED) {
                         done(new Error(`Unknown command ${msg.payload}`));
                 }
             });
+
+            const nodeStatusHandler = status => {
+                nodeStatus = status;
+                this.status(status);
+            };
+
+            const permitJoinHandler = status => {
+                if (status) {
+                    this.status({shape: 'ring', fill: 'blue', text: 'join permitted'});
+                } else {
+                    this.status(nodeStatus);
+                }
+            };
+
+            this.debug('adding event listeners');
+            herdsmanNode.proxy.on('nodeStatus', nodeStatusHandler);
+            herdsmanNode.proxy.on('permitJoin', permitJoinHandler);
+
+            this.on('close', () => {
+                this.debug('removing event listeners');
+                herdsmanNode.proxy.removeListener('nodeStatus', nodeStatusHandler);
+                herdsmanNode.proxy.removeListener('permitJoin', permitJoinHandler);
+            });
         }
     }
 

nodes/converter.js

@@ -335,16 +335,16 @@ module.exports = function (RED) {
                 this.status(status);
             };
 
+            this.debug('adding event listeners');
             shepherdNode.proxy.on('nodeStatus', nodeStatusHandler);
             shepherdNode.proxy.on('message', messageHandler);
-            shepherdNode.proxy.on('nodeStatus', nodeStatusHandler);
             shepherdNode.proxy.on('ready', devicesHandler);
             shepherdNode.proxy.on('devices', devicesHandler);
 
             this.on('close', () => {
+                this.debug('removing event listeners');
                 shepherdNode.proxy.removeListener('nodeStatus', nodeStatusHandler);
                 shepherdNode.proxy.removeListener('message', messageHandler);
-                shepherdNode.proxy.removeListener('nodeStatus', nodeStatusHandler);
                 shepherdNode.proxy.removeListener('ready', devicesHandler);
                 shepherdNode.proxy.removeListener('devices', devicesHandler);
             });

nodes/event.js

@@ -10,7 +10,7 @@ module.exports = function (RED) {
                 return;
             }
 
-            this.shepherd = shepherdNode.proxy;
+            this.proxy = shepherdNode.proxy;
 
             const nodeStatusHandler = status => {
                 this.status(status);
@@ -70,12 +70,14 @@ module.exports = function (RED) {
                 }
             };
 
-            shepherdNode.proxy.on('nodeStatus', nodeStatusHandler);
-            shepherdNode.proxy.on('message', messageHandler);
+            this.debug('adding event listeners');
+            this.proxy.on('nodeStatus', nodeStatusHandler);
+            this.proxy.on('message', messageHandler);
 
             this.on('close', () => {
-                shepherdNode.proxy.removeListener('nodeStatus', nodeStatusHandler);
-                shepherdNode.proxy.removeListener('message', messageHandler);
+                this.debug('removing event listeners');
+                this.proxy.removeListener('nodeStatus', nodeStatusHandler);
+                this.proxy.removeListener('message', messageHandler);
             });
         }
 

nodes/hue-light.js

@@ -18,9 +18,9 @@ module.exports = function (RED) {
             this.proxy = shepherdNode.proxy;
             this.config = config;
 
-            shepherdNode.proxy.on('nodeStatus', status => {
+            const nodeStatusHandler = status => {
                 this.status(status);
-            });
+            };
 
             this.lastState = {};
 
@@ -112,16 +112,20 @@ module.exports = function (RED) {
                 }
             };
 
+            this.debug('adding event listeners');
             this.proxy.on('ready', readyHandler);
             this.proxy.on('devices', readyHandler);
             this.proxy.on('message', messageHandler);
             this.proxy.on('offline', offlineHandler);
+            this.proxy.on('nodeStatus', nodeStatusHandler);
 
             this.on('close', () => {
+                this.debug('removing event listeners');
                 this.proxy.removeListener('ready', readyHandler);
                 this.proxy.removeListener('devices', readyHandler);
                 this.proxy.removeListener('message', messageHandler);
                 this.proxy.removeListener('offline', offlineHandler);
+                this.proxy.removeListener('nodeStatus', nodeStatusHandler);
             });
 
             this.on('input', (msg, send, done) => {

nodes/offline.js

@@ -45,11 +45,13 @@ module.exports = function (RED) {
                 this.shepherdNode.herdsman.getDevices().forEach(sendMessage);
             };
 
+            this.debug('adding event listeners');
             shepherdNode.proxy.on('nodeStatus', nodeStatusHandler);
             shepherdNode.proxy.on('offline', sendMessage);
             shepherdNode.proxy.on('ready', readyHandler);
 
             this.on('close', () => {
+                this.debug('removing event listeners');
                 shepherdNode.proxy.removeListener('nodeStatus', nodeStatusHandler);
                 shepherdNode.proxy.removeListener('offline', sendMessage);
                 shepherdNode.proxy.removeListener('ready', readyHandler);

nodes/shepherd.js

@@ -504,8 +504,13 @@ module.exports = function (RED) {
                     this.status = '';
                     this.proxy.emit('nodeStatus', {});
                     setTimeout(() => {
+                        this.debug('remaining proxy listeners for event nodeStatus ' + this.proxy.listenerCount('nodeStatus'));
+                        this.debug('remaining proxy listeners for event ready ' + this.proxy.listenerCount('ready'));
+                        this.debug('remaining proxy listeners for event devices ' + this.proxy.listenerCount('devices'));
+                        this.debug('remaining proxy listeners for event permitJoin ' + this.proxy.listenerCount('permitJoin'));
+                        this.debug('remaining proxy listeners for event message ' + this.proxy.listenerCount('message'));
                         this.proxy.removeAllListeners();
-                        this.debug('removed proxy event listeners');
+                        this.debug('remaining proxy listeners removed');
                         done();
                     }, 100);
                 });