fix: Handle resubscribing after a disconnect

Don't have the HA WS lib auto resubscribe on a reconnect
so that we can wait until the NR integration is loaded before sending
entity discovery information.

Fixes: #250

lib/events-ha-node.js

@@ -2,11 +2,7 @@ const Joi = require('@hapi/joi');
 const merge = require('lodash.merge');
 
 const EventsNode = require('./events-node');
-const {
-    INTEGRATION_LOADED,
-    INTEGRATION_UNLOADED,
-    INTEGRATION_NOT_LOADED,
-} = require('./const');
+const { INTEGRATION_UNLOADED, INTEGRATION_NOT_LOADED } = require('./const');
 
 const DEFAULT_NODE_OPTIONS = {
     debug: false,
@@ -67,17 +63,14 @@ class EventsHaNode extends EventsNode {
         this.removeSubscription();
     }
 
+    onHaEventsOpen() {
+        this.subscription = null;
+    }
+
     async onHaIntegration(type) {
         super.onHaIntegration(type);
 
         switch (type) {
-            case INTEGRATION_LOADED:
-                if (this.registered) {
-                    // Update the state of exposed nodes because when the HA client
-                    // resubscribes it registers the entity with the original state
-                    setTimeout(() => this.updateHomeAssistant(), 300);
-                }
-                break;
             case INTEGRATION_UNLOADED:
             case INTEGRATION_NOT_LOADED:
                 this.isEnabled = true;
@@ -103,7 +96,7 @@ class EventsHaNode extends EventsNode {
     }
 
     async registerEntity() {
-        if (this.subscription || super.registerEntity() === false) {
+        if (super.registerEntity() === false) {
             return;
         }
 
@@ -126,7 +119,8 @@ class EventsHaNode extends EventsNode {
         this.debug(`Registering with HA`);
         this.subscription = await this.websocketClient.client.subscribeMessage(
             this.onHaEventMessage.bind(this),
-            payload
+            payload,
+            { resubscribe: false }
         );
 
         this.setStatusSuccess('Registered');
@@ -275,8 +269,8 @@ class EventsHaNode extends EventsNode {
         if (this.subscription) {
             this.debug('Unregistering from HA');
             this.subscription().catch(() => {});
-            this.subscription = null;
         }
+        this.subscription = null;
     }
 }
 

lib/events-node.js

@@ -65,6 +65,7 @@ class EventsNode extends BaseNode {
     }
 
     onHaEventsClose() {
+        this.registered = false;
         this.updateConnectionStatus();
     }
 

nodes/webhook/webhook.js

@@ -93,7 +93,8 @@ module.exports = function (RED) {
                         webhook_id: this.nodeConfig.webhookId,
                         name: this.id,
                         server_id: this.nodeConfig.server.id,
-                    }
+                    },
+                    { resubscribe: false }
                 );
             }
             this.setStatusSuccess('Registered');