fix: check for WS client before listening for events

Closes #158
zachowj · Oct 19, 2019 · 8d72dbc · 8d72dbc
1 parent 2a84866
commit 8d72dbc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 27 deletions.
diff --git a/lib/base-node.js b/lib/base-node.js
@@ -186,28 +186,29 @@ class BaseNode {
     }
 
     setConnectionStatus(state, additionalText) {
-        let connectionStatus;
-        switch (state) {
-            case this.websocketClient.CONNECTING:
-                connectionStatus = {
-                    shape: 'ring',
-                    fill: 'yellow',
-                    text: 'connecting'
-                };
-                break;
-            case this.websocketClient.CONNECTED:
-                connectionStatus = {
-                    shape: 'dot',
-                    fill: 'green',
-                    text: 'connected'
-                };
-                break;
-            default:
-                connectionStatus = {
-                    shape: 'ring',
-                    fill: 'red',
-                    text: 'disconnected'
-                };
+        let connectionStatus = {
+            shape: 'ring',
+            fill: 'red',
+            text: 'disconnected'
+        };
+
+        if (this.websocketClient) {
+            switch (state) {
+                case this.websocketClient.CONNECTING:
+                    connectionStatus = {
+                        shape: 'ring',
+                        fill: 'yellow',
+                        text: 'connecting'
+                    };
+                    break;
+                case this.websocketClient.CONNECTED:
+                    connectionStatus = {
+                        shape: 'dot',
+                        fill: 'green',
+                        text: 'connected'
+                    };
+                    break;
+            }
         }
         if (
             Object.prototype.hasOwnProperty.call(this, 'isenabled') &&

diff --git a/lib/events-node.js b/lib/events-node.js
@@ -38,8 +38,10 @@ class EventsNode extends BaseNode {
     }
 
     addEventClientListener({ event, handler }) {
-        this.listeners[event] = handler;
-        this.websocketClient.addListener(event, handler);
+        if (this.websocketClient) {
+            this.listeners[event] = handler;
+            this.websocketClient.addListener(event, handler);
+        }
     }
 
     removeEventClientListeners() {

diff --git a/nodes/events-all/events-all.js b/nodes/events-all/events-all.js
@@ -10,6 +10,7 @@ module.exports = function(RED) {
     class ServerEventsNode extends EventsNode {
         constructor(nodeDefinition) {
             super(nodeDefinition, RED, nodeOptions);
+
             this.addEventClientListener({
                 event: 'ha_events:' + (this.nodeConfig.event_type || 'all'),
                 handler: this.onHaEventsAll.bind(this)
@@ -29,9 +30,11 @@ module.exports = function(RED) {
             }
 
             // Registering only needed event types
-            this.nodeConfig.server.homeAssistant.eventsList[this.id] =
-                this.nodeConfig.event_type || '__ALL__';
-            this.updateEventList();
+            if (this.utils.selectn('nodeConfig.server.homeAssistant', this)) {
+                this.nodeConfig.server.homeAssistant.eventsList[this.id] =
+                    this.nodeConfig.event_type || '__ALL__';
+                this.updateEventList();
+            }
         }
 
         onHaEventsAll(evt) {