Get hass object on update

custom-cards · Jul 23, 2020 · d385a4a · d385a4a
1 parent 9918b3b
commit d385a4a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/dist/spotify-card.js b/dist/spotify-card.js
diff --git a/dist/spotify-card.js.map b/dist/spotify-card.js.map
diff --git a/src/const.ts b/src/const.ts
@@ -1,2 +1,2 @@
-const CARD_VERSION = '2.0.0-beta.24';
+const CARD_VERSION = '2.0.0-beta.25';
 export default CARD_VERSION;
diff --git a/src/spotify-card.ts b/src/spotify-card.ts
@@ -6,6 +6,7 @@ import {
   internalProperty,
   CSSResult,
   TemplateResult,
+  PropertyValues,
   css,
 } from 'lit-element';
 
@@ -49,8 +50,7 @@ export class SpotifyCard extends LitElement {
     return {};
   }
 
-  @property({ type: Object })
-  public hass!: HomeAssistant;
+  @property() public hass!: HomeAssistant;
 
   @property({ type: Object })
   public config!: SpotifyCardConfig;
@@ -69,22 +69,27 @@ export class SpotifyCard extends LitElement {
 
   private unsubscribe_entitites?: any;
 
-  doSubscribeEntities() {
-    this.unsubscribe_entitites = subscribeEntities(this.hass.connection, (entities) => this.entitiesUpdated(entities));
+  doSubscribeEntities(): void {
+    if (this.hass?.connection && !this.unsubscribe_entitites && this.isConnected) {
+      this.unsubscribe_entitites = subscribeEntities(this.hass.connection, (entities) =>
+        this.entitiesUpdated(entities)
+      );
+    }
   }
 
   connectedCallback(): void {
     super.connectedCallback();
     this.spotcast_connector = new SpotcastConnector(this);
     //get all available entities and when they update
-    if (this.hass.connection) {
-      this.doSubscribeEntities();
-    } else {
-      setTimeout(() => this.doSubscribeEntities(), 1000);
-    }
+    this.doSubscribeEntities();
+  }
+
+  protected updated(changedProps: PropertyValues): void {
+    super.updated(changedProps);
+    this.doSubscribeEntities();
   }
 
-  public disconnectedCallback() {
+  public disconnectedCallback(): void {
     super.disconnectedCallback();
     this.unsubscribe_entitites && this.unsubscribe_entitites();
   }