iobroker.poolcontrol 1.3.28 → 1.3.29

package/lib/helpers/consumptionHelper.js

@@ -15,6 +15,9 @@ const consumptionHelper = {
     price: 0,
     baselines: {},
     resetTimer: null,
+    weeklyResetTimer: null,
+    monthlyResetTimer: null,
+    yearlyResetTimer: null,
 
     lastKnownPrice: 0,
     baseTotalKwh: 0,
@@ -252,7 +255,12 @@ const consumptionHelper = {
         nextMidnight.setHours(24, 0, 0, 0);
         const msUntilMidnight = nextMidnight - now;
 
-        this.resetTimer = setTimeout(async () => {
+        if (this.resetTimer) {
+            this.adapter.clearTimeout(this.resetTimer);
+            this.resetTimer = null;
+        }
+
+        this.resetTimer = this.adapter.setTimeout(async () => {
             try {
                 this.adapter.log.info('[consumptionHelper] daily counter reset (midnight)');
                 await this.adapter.setStateAsync('consumption.day_kwh', { val: 0, ack: true });
@@ -261,6 +269,7 @@ const consumptionHelper = {
             } catch (err) {
                 this.adapter.log.warn(`[consumptionHelper] error during midnight reset: ${err.message}`);
             }
+            this.resetTimer = null;
             this._scheduleDailyReset(); // Timer erneut setzen
         }, msUntilMidnight);
     },
@@ -280,7 +289,12 @@ const consumptionHelper = {
 
         const delay = next - now;
 
-        setTimeout(async () => {
+        if (this.weeklyResetTimer) {
+            this.adapter.clearTimeout(this.weeklyResetTimer);
+            this.weeklyResetTimer = null;
+        }
+
+        this.weeklyResetTimer = this.adapter.setTimeout(async () => {
             try {
                 const nowCheck = new Date();
 
@@ -296,6 +310,7 @@ const consumptionHelper = {
             }
 
             // Morgen wieder planen
+            this.weeklyResetTimer = null;
             this._scheduleWeeklyReset();
         }, delay);
     },
@@ -315,7 +330,12 @@ const consumptionHelper = {
 
         const delay = next - now;
 
-        setTimeout(async () => {
+        if (this.monthlyResetTimer) {
+            this.adapter.clearTimeout(this.monthlyResetTimer);
+            this.monthlyResetTimer = null;
+        }
+
+        this.monthlyResetTimer = this.adapter.setTimeout(async () => {
             try {
                 const nowCheck = new Date();
 
@@ -331,6 +351,7 @@ const consumptionHelper = {
             }
 
             // Morgen wieder planen
+            this.monthlyResetTimer = null;
             this._scheduleMonthlyReset();
         }, delay);
     },
@@ -350,7 +371,12 @@ const consumptionHelper = {
 
         const delay = next - now;
 
-        setTimeout(async () => {
+        if (this.yearlyResetTimer) {
+            this.adapter.clearTimeout(this.yearlyResetTimer);
+            this.yearlyResetTimer = null;
+        }
+
+        this.yearlyResetTimer = this.adapter.setTimeout(async () => {
             try {
                 const nowCheck = new Date();
 
@@ -366,15 +392,31 @@ const consumptionHelper = {
             }
 
             // Morgen wieder prüfen
+            this.yearlyResetTimer = null;
             this._scheduleYearlyReset();
         }, delay);
     },
 
     cleanup() {
         if (this.resetTimer) {
-            clearTimeout(this.resetTimer);
+            this.adapter.clearTimeout(this.resetTimer);
             this.resetTimer = null;
         }
+
+        if (this.weeklyResetTimer) {
+            this.adapter.clearTimeout(this.weeklyResetTimer);
+            this.weeklyResetTimer = null;
+        }
+
+        if (this.monthlyResetTimer) {
+            this.adapter.clearTimeout(this.monthlyResetTimer);
+            this.monthlyResetTimer = null;
+        }
+
+        if (this.yearlyResetTimer) {
+            this.adapter.clearTimeout(this.yearlyResetTimer);
+            this.yearlyResetTimer = null;
+        }
     },
 };
 

package/lib/helpers/heatHelper.js

@@ -246,7 +246,7 @@ const heatHelper = {
 
             const holdMs = Math.round(prerunMin * 60 * 1000);
 
-            this._prerunTimer = setTimeout(async () => {
+            this._prerunTimer = this.adapter.setTimeout(async () => {
                 this._prerunTimer = null;
 
                 await this.adapter.setStateAsync('heat.prerun_active', { val: false, ack: true });
@@ -261,9 +261,8 @@ const heatHelper = {
 
         this._desiredHeat = true;
 
-        // Nachlauf ggf. abbrechen
         if (this._afterrunTimer) {
-            clearTimeout(this._afterrunTimer);
+            this.adapter.clearTimeout(this._afterrunTimer);
             this._afterrunTimer = null;
         }
 
@@ -323,7 +322,7 @@ const heatHelper = {
     async _applyBlockedState(mode, reason, afterrunMin) {
         // NEU: laufenden Prerun abbrechen
         if (this._prerunTimer) {
-            clearTimeout(this._prerunTimer);
+            this.adapter.clearTimeout(this._prerunTimer);
             this._prerunTimer = null;
             await this.adapter.setStateAsync('heat.prerun_active', { val: false, ack: true });
         }
@@ -347,7 +346,7 @@ const heatHelper = {
     async _applyOffState(mode, reason, afterrunMin) {
         // NEU: laufenden Prerun abbrechen
         if (this._prerunTimer) {
-            clearTimeout(this._prerunTimer);
+            this.adapter.clearTimeout(this._prerunTimer);
             this._prerunTimer = null;
             await this.adapter.setStateAsync('heat.prerun_active', { val: false, ack: true });
         }
@@ -401,7 +400,7 @@ const heatHelper = {
 
         // Timer neu starten
         if (this._afterrunTimer) {
-            clearTimeout(this._afterrunTimer);
+            this.adapter.clearTimeout(this._afterrunTimer);
             this._afterrunTimer = null;
         }
 
@@ -410,12 +409,15 @@ const heatHelper = {
         const holdMs = Math.round(afterrunMin * 60 * 1000);
         this.adapter.log.debug(`[heatHelper] Pump after-run started: ${afterrunMin} min (${reason})`);
 
-        this._afterrunTimer = setTimeout(async () => {
+        this._afterrunTimer = this.adapter.setTimeout(async () => {
+            this._afterrunTimer = null;
+
             // Wenn inzwischen wieder Heizbedarf aktiv ist -> Nachlauf abbrechen
             if (this._desiredHeat === true) {
                 this.adapter.log.debug('[heatHelper] After-run cancelled - heating is active again.');
                 return;
             }
+
             await this._stopPumpNow('afterrun_done');
         }, holdMs);
     },
@@ -497,11 +499,12 @@ const heatHelper = {
 
     cleanup() {
         if (this._afterrunTimer) {
-            clearTimeout(this._afterrunTimer);
+            this.adapter.clearTimeout(this._afterrunTimer);
             this._afterrunTimer = null;
         }
+
         if (this._prerunTimer) {
-            clearTimeout(this._prerunTimer);
+            this.adapter.clearTimeout(this._prerunTimer);
             this._prerunTimer = null;
         }
 

package/lib/helpers/infoHelper.js

@@ -121,6 +121,11 @@ const infoHelper = {
      * Startet den täglichen Update-Intervall (Update 00:01 Uhr)
      */
     _startDailyTimer() {
+        if (this.dailyTimer) {
+            this.adapter.clearTimeout(this.dailyTimer);
+            this.dailyTimer = null;
+        }
+
         // nächsten Trigger für morgen 00:01 berechnen
         const now = new Date();
         const next = new Date(now);
@@ -130,17 +135,13 @@ const infoHelper = {
 
         const delay = next.getTime() - now.getTime();
 
-        // einmaliger Timer bis 00:01
-        this.dailyTimer = setTimeout(() => {
+        this.dailyTimer = this.adapter.setTimeout(() => {
+            this.dailyTimer = null;
+
             this._updateDeveloperGreeting();
 
-            // danach täglich um 24h
-            this.dailyTimer = setInterval(
-                () => {
-                    this._updateDeveloperGreeting();
-                },
-                24 * 60 * 60 * 1000,
-            );
+            // Danach neu planen, damit kein dauerhaftes setInterval nötig ist.
+            this._startDailyTimer();
         }, delay);
     },
 
@@ -149,8 +150,7 @@ const infoHelper = {
      */
     cleanup() {
         if (this.dailyTimer) {
-            clearTimeout(this.dailyTimer);
-            clearInterval(this.dailyTimer);
+            this.adapter.clearTimeout(this.dailyTimer);
             this.dailyTimer = null;
         }
     },