Bugfix - resource management in lifecycle

Author: llbbdd

dist/Predbat-Table-Card-Next.js

@@ -48,18 +48,7 @@ class PredbatTableCard extends HTMLElement {
 
     this._reactiveDataState.carCharging = this._configManager.carChargeSwitch;
 
-    if (this._predbatRestApiService) {
-      this._predbatRestApiService.disconnect();
-      this._predbatRestApiService = null;
-    }
-
-    PredbatRestApiService.restApiAvailable(restApiPort)
-      .then((restApiAvailable) => {
-        this._restApiAvailable = restApiAvailable;
-
-        if (restApiAvailable) this._predbatRestApiService = new PredbatRestApiService(restApiPort, this.setPlanData);
-      })
-      .catch(() => this._restApiAvailable = false);
+    this._initialiseRestApi();
   }
 
   // * New state received from Home Assistant
@@ -170,6 +159,7 @@ class PredbatTableCard extends HTMLElement {
       if (this._predbatRestApiService) this._render();
     };
 
+    this._initialiseRestApi();
     this._render();
   }
 
@@ -183,6 +173,9 @@ class PredbatTableCard extends HTMLElement {
       this._predbatRestApiService.disconnect();
       this._predbatRestApiService = null;
     }
+
+    this._lastPlanUpdated = null;
+    this._planData = null;
   }
 
   // * Register card with Home Assistant
@@ -206,6 +199,29 @@ class PredbatTableCard extends HTMLElement {
     this._render();
   };
 
+  private _initialiseRestApi(): void {
+    if (this._predbatRestApiService) {
+      this._predbatRestApiService.disconnect();
+      this._predbatRestApiService = null;
+    }
+
+    this._restApiAvailable = null;
+
+    PredbatRestApiService.restApiAvailable(restApiPort)
+      .then((restApiAvailable) => {
+        this._restApiAvailable = restApiAvailable;
+
+        if (restApiAvailable) this._predbatRestApiService = new PredbatRestApiService(restApiPort, this.setPlanData);
+
+        this._render();
+      })
+      .catch(() => {
+        this._restApiAvailable = false;
+
+        this._render();
+      });
+  }
+
   private _render(): void {
     if (
       this._restApiAvailable === null ||

src/predbat-card.ts

@@ -6,10 +6,10 @@ export class PredbatRestApiService {
   private _dataCallback: ((predbatData: PredbatData) => void) | null;
   private _port: number;
   private _updateInterval: ReturnType<typeof setInterval> | null = null;
-  private _retryTimeout: ReturnType<typeof setTimeout> | null = null;
+  private _retryTimeout: ReturnType<typeof setInterval> | null = null;
+  private _initialUpdateTimeout: ReturnType<typeof setTimeout> | null = null;
   private _isAvailable = false;
   private _fetchInProgress = false;
-  private _dataSource: 'REST_API' | 'HASS_STATES' | null = null;
 
   public constructor(port: number, dataCallback: (predbatData: PredbatData) => void) {
     this._port = port;
@@ -94,7 +94,8 @@ export class PredbatRestApiService {
     nextUpdate.setHours(nextHour, nextMinute, 0, 0);
     const delay = nextUpdate.getTime() - now.getTime() + 5000;
 
-    setTimeout(() => {
+    this._initialUpdateTimeout = setTimeout(() => {
+      this._initialUpdateTimeout = null;
       this._fetchData();
       this._updateInterval = setInterval(() => {
         this._fetchData();
@@ -145,6 +146,12 @@ export class PredbatRestApiService {
       this._updateInterval = null;
     }
 
+    if (this._initialUpdateTimeout) {
+      clearTimeout(this._initialUpdateTimeout);
+      this._initialUpdateTimeout = null;
+    }
+
+    this._dataCallback = null;
     this._isAvailable = false;
   }
 }

src/services/predbat-service.ts

@@ -156,6 +156,8 @@ export class WeatherService {
       await this._unsubscribeWeather();
       this._unsubscribeWeather = null;
     }
+
+    this._forecast = null;
   }
 
   public set connection(connection: Connection) {