iobroker.pv-notifications 1.2.32 → 1.2.33

package/README.md

@@ -324,6 +324,19 @@ sadam6752@gmail.com
 	### **WORK IN PROGRESS**
 -->
 
+### 1.2.33 (2026-10-08)
+* (FIX) Telegram messages were sent to **all** users of the bot instead of only the configured users (`user` instead of the ignored `users` parameter)
+* (FIX) Bold text was shown with literal asterisks - messages are now sent with HTML formatting (values from other adapters are escaped)
+* (CHANGE) Full/empty thresholds and intermediate steps are detected when reached or crossed (e.g. SOC jumps from 39 to 41, decimal SOC values, battery stopping at 99 % with a 98 % threshold); a jump over several steps sends one message
+* (FIX) Statistics were not saved when the adapter was stopped (unload handler was not registered)
+* (FIX) Last week/month values were overwritten with 0 on the first adapter start of a day
+* (FIX) Daily statistics reset now happens at midnight; before it only ran if the daily stats time was a multiple of 5 minutes
+* (FIX) Min/max SOC of the day are written immediately
+* (FIX) Weekly/monthly auto-save runs once in the window 23:55-23:59, so a delayed timer tick no longer skips it; monthly cycles roll over even when monthly statistics are disabled
+* (FIX) Sunset object may also contain a timestamp or ISO date; missing time settings no longer crash the scheduler
+* (FIX) 0 °C was not shown; numeric weather values no longer break the weather block
+* (FIX) Errors while processing state changes no longer stop the adapter; test button cannot get stuck
+
 ### 1.2.32 (2026-10-08)
 * (FIX) Daily, weekly and monthly statistics (cycles, min/max SOC) are no longer reset on every adapter restart
 * (FIX) Monthly statistics reported the daily cycle counters; there are now real monthly counters (`statistics.fullCyclesMonth`, `statistics.emptyCyclesMonth`)

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "pv-notifications",
-    "version": "1.2.32",
+    "version": "1.2.33",
     "titleLang": {
       "en": "PV Notifications",
       "de": "PV-Benachrichtigungen",
@@ -29,6 +29,19 @@
       "zh-cn": "发送 Telegram 通知用于 PV 电池状态"
     },
     "news": {
+      "1.2.33": {
+        "en": "Fix: Telegram messages were sent to all users of the bot instead of only the configured users. Fix: bold text was shown with literal asterisks (messages now use HTML formatting). Thresholds and intermediate steps are now detected when reached or crossed (e.g. SOC jumps 39 -> 41 or decimal values). Fix: statistics were not saved on adapter stop; last week/month values were reset on the first start of a day; daily reset now happens at midnight; weekly/monthly saving is more robust. Fix: 0 °C was not shown.",
+        "de": "Fix: Telegram-Nachrichten gingen an alle Benutzer des Bots statt nur an die konfigurierten Benutzer. Fix: Fettschrift wurde mit sichtbaren Sternchen angezeigt (Nachrichten nutzen jetzt HTML-Formatierung). Schwellwerte und Zwischenstufen werden jetzt erkannt, wenn sie erreicht oder ueberschritten werden (z. B. SOC springt von 39 auf 41 oder Dezimalwerte). Fix: Statistik wurde beim Stoppen nicht gespeichert; Werte der letzten Woche/des letzten Monats wurden beim ersten Start eines Tages zurueckgesetzt; Tagesreset jetzt um Mitternacht; Wochen-/Monatsspeicherung robuster. Fix: 0 °C wurde nicht angezeigt.",
+        "ru": "Исправлено: сообщения Telegram отправлялись всем пользователям бота, а не только настроенным. Исправлено: жирный текст отображался с видимыми звёздочками (теперь используется HTML-форматирование). Пороги и промежуточные ступени теперь срабатывают при достижении или пересечении (например, скачок SOC с 39 на 41 или дробные значения). Исправлено: статистика не сохранялась при остановке адаптера; значения прошлой недели/месяца сбрасывались при первом запуске за день; дневной сброс теперь в полночь; сохранение недели/месяца надёжнее. Исправлено: 0 °C не отображался.",
+        "fr": "Correction : les messages Telegram etaient envoyes a tous les utilisateurs du bot au lieu des seuls utilisateurs configures. Correction : le texte en gras s'affichait avec des asterisques visibles (les messages utilisent maintenant le format HTML). Les seuils et paliers intermediaires sont detectes lorsqu'ils sont atteints ou franchis (p. ex. SOC passant de 39 a 41 ou valeurs decimales). Correction : statistiques non enregistrees a l'arret ; valeurs de la semaine/du mois precedent reinitialisees au premier demarrage du jour ; remise a zero quotidienne a minuit ; enregistrement hebdomadaire/mensuel plus robuste. Correction : 0 °C n'etait pas affiche.",
+        "it": "Correzione: i messaggi Telegram venivano inviati a tutti gli utenti del bot invece che solo agli utenti configurati. Correzione: il grassetto veniva mostrato con asterischi visibili (ora i messaggi usano la formattazione HTML). Soglie e livelli intermedi vengono ora rilevati quando raggiunti o superati (ad es. SOC che salta da 39 a 41 o valori decimali). Correzione: statistiche non salvate all'arresto; valori della settimana/mese precedente azzerati al primo avvio del giorno; azzeramento giornaliero ora a mezzanotte; salvataggio settimanale/mensile piu robusto. Correzione: 0 °C non veniva mostrato.",
+        "es": "Correccion: los mensajes de Telegram se enviaban a todos los usuarios del bot en lugar de solo a los usuarios configurados. Correccion: la negrita se mostraba con asteriscos visibles (los mensajes ahora usan formato HTML). Los umbrales y niveles intermedios ahora se detectan al alcanzarse o superarse (p. ej. SOC que salta de 39 a 41 o valores decimales). Correccion: las estadisticas no se guardaban al detener el adaptador; los valores de la semana/mes anterior se reiniciaban en el primer inicio del dia; reinicio diario ahora a medianoche; guardado semanal/mensual mas robusto. Correccion: 0 °C no se mostraba.",
+        "pl": "Poprawka: wiadomosci Telegram byly wysylane do wszystkich uzytkownikow bota zamiast tylko do skonfigurowanych. Poprawka: pogrubienie wyswietlalo sie z widocznymi gwiazdkami (wiadomosci uzywaja teraz formatowania HTML). Progi i stopnie posrednie sa teraz wykrywane po osiagnieciu lub przekroczeniu (np. skok SOC z 39 na 41 lub wartosci dziesietne). Poprawka: statystyki nie byly zapisywane przy zatrzymaniu adaptera; wartosci z poprzedniego tygodnia/miesiaca byly zerowane przy pierwszym uruchomieniu w danym dniu; dzienny reset teraz o polnocy; zapis tygodniowy/miesieczny bardziej niezawodny. Poprawka: 0 °C nie bylo wyswietlane.",
+        "pt": "Correcao: as mensagens do Telegram eram enviadas a todos os utilizadores do bot em vez de apenas aos utilizadores configurados. Correcao: o negrito aparecia com asteriscos visiveis (as mensagens usam agora formatacao HTML). Os limites e niveis intermedios sao agora detetados quando atingidos ou ultrapassados (p. ex. SOC a saltar de 39 para 41 ou valores decimais). Correcao: as estatisticas nao eram guardadas ao parar o adaptador; os valores da semana/mes anterior eram repostos no primeiro arranque do dia; reposicao diaria agora a meia-noite; gravacao semanal/mensal mais robusta. Correcao: 0 °C nao era mostrado.",
+        "nl": "Fix: Telegram-berichten werden naar alle gebruikers van de bot gestuurd in plaats van alleen naar de geconfigureerde gebruikers. Fix: vetgedrukte tekst werd met zichtbare sterretjes getoond (berichten gebruiken nu HTML-opmaak). Drempels en tussenstappen worden nu herkend wanneer ze bereikt of overschreden worden (bijv. SOC springt van 39 naar 41 of decimale waarden). Fix: statistieken werden niet opgeslagen bij het stoppen van de adapter; waarden van vorige week/maand werden bij de eerste start van een dag gereset; dagelijkse reset nu om middernacht; week-/maandopslag robuuster. Fix: 0 °C werd niet getoond.",
+        "uk": "Виправлено: повідомлення Telegram надсилалися всім користувачам бота, а не лише налаштованим. Виправлено: жирний текст показувався з видимими зірочками (тепер використовується HTML-форматування). Пороги та проміжні рівні тепер спрацьовують при досягненні або перетині (наприклад, стрибок SOC з 39 на 41 або дробові значення). Виправлено: статистика не зберігалася під час зупинки адаптера; значення минулого тижня/місяця скидалися під час першого запуску за день; щоденне скидання тепер опівночі; збереження тижня/місяця надійніше. Виправлено: 0 °C не відображався.",
+        "zh-cn": "修复：Telegram 消息会发送给机器人的所有用户，而不仅是已配置的用户。修复：粗体文字显示为可见的星号（消息现在使用 HTML 格式）。阈值和中间级别现在在达到或越过时触发（例如 SOC 从 39 跳到 41 或小数值）。修复：停止适配器时未保存统计数据；上周/上月数值在当天首次启动时被重置；每日重置改为午夜；周/月保存更可靠。修复：0 °C 未显示。"
+      },
       "1.2.32": {
         "en": "Fix: daily, weekly and monthly statistics are no longer lost on adapter restart. Fix: monthly statistics now report real monthly cycle counts. Fix: weekly/monthly saving no longer fails with empty data points. Fix: SOC delivered as text is accepted. Fix: test message with partially configured weather. Added unit tests and README badges.",
         "de": "Fix: Tages-, Wochen- und Monatsstatistik gehen beim Neustart des Adapters nicht mehr verloren. Fix: Die Monatsstatistik zeigt jetzt die echten Monatszyklen. Fix: Wochen-/Monatsspeicherung schlaegt bei leeren Datenpunkten nicht mehr fehl. Fix: SOC als Text wird akzeptiert. Fix: Testnachricht bei teilweise konfiguriertem Wetter. Unit-Tests und README-Badges hinzugefuegt.",
@@ -106,19 +119,6 @@
         "nl": "Fix CI: package-lock.json bijgewerkt om alle eslint peer dependencies op te nemen",
         "uk": "Виправлено CI: оновлено package-lock.json для включення всіх peer-залежностей eslint",
         "zh-cn": "修复CI：更新package-lock.json以包含所有eslint对等依赖项"
-      },
-      "1.2.26": {
-        "en": "Fix W5604: add missing i18n keys for sunset stats in 8 languages; move old changelog to CHANGELOG_OLD.md; fix README structure",
-        "de": "W5604: fehlende i18n-Schluessel fuer Sonnenuntergangs-Statistik in 8 Sprachen ergaenzt; alten Changelog in CHANGELOG_OLD.md verschoben; README-Struktur korrigiert",
-        "ru": "W5604: добавлены отсутствующие i18n ключи для статистики заката в 8 языках; старый changelog перенесён в CHANGELOG_OLD.md; исправлена структура README",
-        "fr": "W5604: clés i18n manquantes pour stats coucher du soleil ajoutées dans 8 langues; ancien changelog déplacé dans CHANGELOG_OLD.md; structure README corrigée",
-        "it": "W5604: chiavi i18n mancanti per stats tramonto aggiunte in 8 lingue; vecchio changelog spostato in CHANGELOG_OLD.md; struttura README corretta",
-        "es": "W5604: claves i18n faltantes para stats atardecer añadidas en 8 idiomas; changelog antiguo movido a CHANGELOG_OLD.md; estructura README corregida",
-        "pl": "W5604: brakujące klucze i18n dla statystyk zachodu słońca dodane w 8 językach; stary changelog przeniesiony do CHANGELOG_OLD.md; poprawiona struktura README",
-        "pt": "W5604: chaves i18n em falta para stats pôr do sol adicionadas em 8 idiomas; changelog antigo movido para CHANGELOG_OLD.md; estrutura README corrigida",
-        "nl": "W5604: ontbrekende i18n-sleutels voor zonsondergang-statistieken in 8 talen toegevoegd; oud changelog verplaatst naar CHANGELOG_OLD.md; README-structuur gecorrigeerd",
-        "uk": "W5604: додано відсутні i18n ключі для статистики заходу сонця у 8 мовах; старий changelog перенесено до CHANGELOG_OLD.md; виправлено структуру README",
-        "zh-cn": "修复W5604：在8种语言中添加日落统计缺失的i18n键；将旧changelog移至CHANGELOG_OLD.md；修复README结构"
       }
     },
     "authors": [

package/main.js

@@ -75,6 +75,9 @@ class PvNotifications extends utils.Adapter {
 
         // StateChange-Handler registrieren (für js-controller 7+)
         this.on('stateChange', this.onStateChange);
+
+        // Unload handler (saves statistics, resets connection state)
+        this.on('unload', this.onUnload);
     }
 
     /**
@@ -564,14 +567,15 @@ class PvNotifications extends utils.Adapter {
                 this.stats.maxSOC = max && typeof max.val === 'number' ? max.val : 0;
                 this.stats.minSOC = min && typeof min.val === 'number' ? min.val : 100;
                 this.stats.lastStatsReset = today;
-            } else {
-                // New day - reset statistics
+            }
+            const isNewDay = !(lastReset && lastReset.val === today);
+            if (isNewDay) {
+                // New day - reset statistics (saved below, after last week/month values are loaded)
                 this.stats.fullCycles = 0;
                 this.stats.emptyCycles = 0;
                 this.stats.maxSOC = 0;
                 this.stats.minSOC = 100;
                 this.stats.lastStatsReset = today;
-                await this.saveStatistics();
             }
 
             // Load saved last week data from states
@@ -614,6 +618,11 @@ class PvNotifications extends utils.Adapter {
             this.stats.lastMonthEmptyCycles =
                 lastMonthEmptyCycles && lastMonthEmptyCycles.val !== null ? lastMonthEmptyCycles.val : 0;
 
+            if (isNewDay) {
+                // Must run after loading last week/month values, otherwise they are overwritten with 0
+                await this.saveStatistics();
+            }
+
             this.log.debug('Statistics loaded from states');
         } catch (e) {
             this.log.error(`Error loading statistics: ${e.message}`);
@@ -723,6 +732,21 @@ class PvNotifications extends utils.Adapter {
      * @param {ioBroker.State | null | undefined} state - State object
      */
     async onStateChange(id, state) {
+        // Errors in an async event handler would become unhandled rejections and stop the adapter
+        try {
+            await this.handleStateChange(id, state);
+        } catch (e) {
+            this.log.error(`Error processing state change of ${id}: ${e.message}`);
+        }
+    }
+
+    /**
+     * Process a state change (called by onStateChange)
+     *
+     * @param {string} id - State ID
+     * @param {ioBroker.State | null | undefined} state - State object
+     */
+    async handleStateChange(id, state) {
         if (state) {
             // Process test button (all states in own namespace)
             if (id.startsWith(`${this.namespace}.testButton`)) {
@@ -731,10 +755,13 @@ class PvNotifications extends utils.Adapter {
                     this.status.testMessageRunning = true; // Set flag
                     this.log.debug(`Test button state received: ${id}, val=${state.val}`);
                     this.log.debug('Test button was pressed');
-                    await this.sendTestMessage();
-                    // Reset state
-                    await this.setStateAsync('testButton', false, true);
-                    this.status.testMessageRunning = false; // Reset flag
+                    try {
+                        await this.sendTestMessage();
+                    } finally {
+                        // Reset state and flag even if sending failed
+                        this.status.testMessageRunning = false;
+                        await this.setStateAsync('testButton', false, true);
+                    }
                 }
                 return;
             }
@@ -794,12 +821,14 @@ class PvNotifications extends utils.Adapter {
         const currentKWh = this.round(((soc / 100) * this.config.batteryCapacityWh) / 1000, 1);
         await this.setStateAsync('statistics.currentEnergyKWh', currentKWh, true);
 
-        // Update statistics
+        // Update statistics (persist immediately, otherwise the states stay stale until the next full/empty event)
         if (soc > this.stats.maxSOC) {
             this.stats.maxSOC = soc;
+            await this.setStateAsync('statistics.maxSOCToday', soc, true);
         }
         if (soc < this.stats.minSOC) {
             this.stats.minSOC = soc;
+            await this.setStateAsync('statistics.minSOCToday', soc, true);
         }
 
         this.log.debug(`Battery SOC: ${soc}% | Status: full=${this.status.full}, empty=${this.status.empty}`);
@@ -813,8 +842,14 @@ class PvNotifications extends utils.Adapter {
                   : 'up';
 
         // Store previous SOC for next update
+        const previousSOC = this.status.previousSOC;
         this.status.previousSOC = soc;
 
+        // Thresholds are compared as "reached or crossed" - the SOC can jump (39 -> 41), be a decimal (40.3)
+        // or stop just below 100, so an exact comparison would miss notifications
+        const thresholdFull = Number(this.config.thresholdFull);
+        const thresholdEmpty = Number(this.config.thresholdEmpty);
+
         // === NIGHT-TIME check with configurable time ===
         const nightTime = this.isNightTime();
         const nightModeActive = this.config.nightModeEnabled !== false;
@@ -825,7 +860,7 @@ class PvNotifications extends utils.Adapter {
         const quietModeActive = this.config.quietModeEnabled !== false;
 
         // === Batterie VOLL (100%) - Nicht nachts (wenn Nachtmodus aktiv) und nicht in Ruhezeit ===
-        if (soc === this.config.thresholdFull) {
+        if (soc >= thresholdFull) {
             // Prüfen ob Benachrichtigung erlaubt ist (nicht in Nachtzeit oder Ruhezeit)
             const allowNotification = (!nightTime || !nightModeActive) && (!quietTime || !quietModeActive);
 
@@ -852,7 +887,7 @@ class PvNotifications extends utils.Adapter {
         }
 
         // === Battery EMPTY (0%) - Always allow if nightModeIgnoreEmpty is active ===
-        if (soc === this.config.thresholdEmpty) {
+        if (soc <= thresholdEmpty) {
             if (!this.status.empty && this.canNotify('empty')) {
                 // Always notify at 0% if nightModeIgnoreEmpty is active
                 // But still respect quiet time (unless nightModeIgnoreEmpty is active)
@@ -879,7 +914,7 @@ class PvNotifications extends utils.Adapter {
             }
         }
         // === Intermediate-Stufen (nur wenn nicht voll/leer und nicht nachts und nicht in Ruhezeit) ===
-        if (soc !== this.config.thresholdFull && soc !== this.config.thresholdEmpty) {
+        if (soc < thresholdFull && soc > thresholdEmpty) {
             const intermediateSteps = (this.config.intermediateSteps || '20,40,60,80')
                 .split(',')
                 .map(s => parseInt(s.trim()))
@@ -889,22 +924,10 @@ class PvNotifications extends utils.Adapter {
             const allowIntermediate = (!nightTime || !nightModeActive) && (!quietTime || !quietModeActive);
 
             if (allowIntermediate) {
+                // Reset Intermediate-Flags wenn Stufe verlassen (±2% Toleranz) - vor der Prüfung, damit eine
+                // gerade überschrittene Stufe ihr Flag bis zum nächsten Wert behält (verhindert Flattern um die Stufe)
                 for (const step of intermediateSteps) {
-                    if (soc === step && !this.status.intermediateNotified.includes(step)) {
-                        if (this.canNotify('intermediate')) {
-                            const message = await this.buildIntermediateMessage(soc, direction);
-                            this.sendTelegram(message);
-                            this.status.intermediateNotified.push(step);
-                            this.status.lastNotification.intermediate = Date.now();
-                            this.log.info(`Intermediate ${step}% - Telegram sent`);
-                        }
-                        break;
-                    }
-                }
-
-                // Reset Intermediate-Flags wenn Stufe verlassen (±2% Toleranz)
-                for (const step of intermediateSteps) {
-                    if (soc !== step && Math.abs(soc - step) >= 2) {
+                    if (Math.abs(soc - step) >= 2) {
                         const idx = this.status.intermediateNotified.indexOf(step);
                         if (idx > -1) {
                             this.status.intermediateNotified.splice(idx, 1);
@@ -912,6 +935,26 @@ class PvNotifications extends utils.Adapter {
                         }
                     }
                 }
+
+                // Steps reached or crossed since the last value; the step closest to the current SOC comes first.
+                // Without a previous value (adapter start) only an exact hit counts, to avoid messages on every restart.
+                const crossed = intermediateSteps
+                    .filter(step => this.isStepCrossed(previousSOC, soc, step))
+                    .filter(step => !this.status.intermediateNotified.includes(step))
+                    .sort((a, b) => Math.abs(soc - a) - Math.abs(soc - b));
+
+                if (crossed.length > 0) {
+                    if (this.canNotify('intermediate')) {
+                        const message = await this.buildIntermediateMessage(soc, direction);
+                        this.sendTelegram(message);
+                        // A jump over several steps sends one message only
+                        this.status.intermediateNotified.push(...crossed);
+                        this.status.lastNotification.intermediate = Date.now();
+                        this.log.info(`Intermediate ${crossed[0]}% (SOC ${soc}%) - Telegram sent`);
+                    } else {
+                        this.log.debug(`Intermediate ${crossed[0]}% reached, but interval not yet elapsed`);
+                    }
+                }
             } else {
                 this.log.debug('Night/quiet time - intermediate notifications suppressed');
             }
@@ -930,6 +973,26 @@ class PvNotifications extends utils.Adapter {
         }
     }
 
+    /**
+     * Prüfe ob eine Stufe seit dem letzten Wert erreicht oder überschritten wurde (in beide Richtungen)
+     *
+     * @param {number | null} previousSOC - Previous SOC (null after adapter start)
+     * @param {number} soc - Current SOC
+     * @param {number} step - Intermediate step in percent
+     */
+    isStepCrossed(previousSOC, soc, step) {
+        if (previousSOC === null || previousSOC === undefined) {
+            return soc === step;
+        }
+        if (soc > previousSOC) {
+            return previousSOC < step && step <= soc;
+        }
+        if (soc < previousSOC) {
+            return previousSOC > step && step >= soc;
+        }
+        return false;
+    }
+
     /**
      * Prüfe ob Mindestintervall eingehalten
      *
@@ -993,6 +1056,22 @@ class PvNotifications extends utils.Adapter {
         return currentTime >= startTime && currentTime < endTime;
     }
 
+    /**
+     * Nachricht für Telegram parse_mode HTML aufbereiten
+     *
+     * @param {string} message - Nachrichtentext mit *fett*-Markierungen
+     * @returns {string} HTML-Text für Telegram
+     */
+    formatTelegramHtml(message) {
+        // Escape HTML first, so values from foreign states (weather texts etc.) can never break the message,
+        // then turn the *bold* markers of the message templates into <b> tags (per line, always balanced)
+        return String(message)
+            .replace(/&/g, '&amp;')
+            .replace(/</g, '&lt;')
+            .replace(/>/g, '&gt;')
+            .replace(/\*([^*\n]+)\*/g, '<b>$1</b>');
+    }
+
     /**
      * Sende Telegram-Nachricht mit Zeitstempel
      *
@@ -1015,8 +1094,12 @@ class PvNotifications extends utils.Adapter {
                     this.config.telegramInstance,
                     'send',
                     {
-                        text: fullMessage,
-                        users: usersList.join(', '),
+                        text: this.formatTelegramHtml(fullMessage),
+                        // Without parse_mode Telegram shows the *bold* markers literally
+                        parse_mode: 'HTML',
+                        // The telegram adapter reads "user" (comma separated list) - without it the
+                        // message is broadcast to every user known to the bot
+                        user: usersList.join(','),
                     },
                     result => {
                         if (result && result.error) {
@@ -1114,9 +1197,9 @@ ${consumptionPowerLine}
                         weatherTodayTextState && weatherTodayTextState.val !== null ? weatherTodayTextState.val : null;
                     const weatherTodayTemp =
                         weatherTodayTempState && weatherTodayTempState.val !== null ? weatherTodayTempState.val : null;
-                    const todayTempText = weatherTodayTemp ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
+                    const todayTempText = weatherTodayTemp !== null ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
 
-                    if (weatherTodayText || weatherTodayTemp) {
+                    if (weatherTodayText || weatherTodayTemp !== null) {
                         const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
                         message += `\n🌤️ Heute: ${weatherDesc}${todayTempText}`;
                     }
@@ -1142,7 +1225,7 @@ ${consumptionPowerLine}
                         weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
                     const tempTomorrow =
                         tempTomorrowState && tempTomorrowState.val !== null ? tempTomorrowState.val : null;
-                    const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
+                    const tempText = tempTomorrow !== null ? ` ${this.round(tempTomorrow, 1)}°C` : '';
 
                     const weatherText = weatherTomorrowText || weatherTomorrow;
                     if (weatherText) {
@@ -1211,9 +1294,9 @@ ${consumptionPowerLine}${separator}`;
                         weatherTodayTextState && weatherTodayTextState.val !== null ? weatherTodayTextState.val : null;
                     const weatherTodayTemp =
                         weatherTodayTempState && weatherTodayTempState.val !== null ? weatherTodayTempState.val : null;
-                    const todayTempText = weatherTodayTemp ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
+                    const todayTempText = weatherTodayTemp !== null ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
 
-                    if (weatherTodayText || weatherTodayTemp) {
+                    if (weatherTodayText || weatherTodayTemp !== null) {
                         const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
                         message += `\n🌤️ Heute: ${weatherDesc}${todayTempText}`;
                     }
@@ -1239,7 +1322,7 @@ ${consumptionPowerLine}${separator}`;
                         weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
                     const tempTomorrow =
                         tempTomorrowState && tempTomorrowState.val !== null ? tempTomorrowState.val : null;
-                    const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
+                    const tempText = tempTomorrow !== null ? ` ${this.round(tempTomorrow, 1)}°C` : '';
 
                     const weatherText = weatherTomorrowText || weatherTomorrow;
                     if (weatherText) {
@@ -1336,9 +1419,9 @@ ${statusText}
                         weatherTodayTextState && weatherTodayTextState.val !== null ? weatherTodayTextState.val : null;
                     const weatherTodayTemp =
                         weatherTodayTempState && weatherTodayTempState.val !== null ? weatherTodayTempState.val : null;
-                    const todayTempText = weatherTodayTemp ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
+                    const todayTempText = weatherTodayTemp !== null ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
 
-                    if (weatherTodayText || weatherTodayTemp) {
+                    if (weatherTodayText || weatherTodayTemp !== null) {
                         const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
                         message += `\n🌤️ ${this.translate('Weather today')}: ${weatherDesc}${todayTempText}`;
                         this.log.debug(`Weather today added to intermediate message: ${weatherDesc}${todayTempText}`);
@@ -1365,7 +1448,7 @@ ${statusText}
                         weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
                     const tempTomorrow =
                         tempTomorrowState && tempTomorrowState.val !== null ? tempTomorrowState.val : null;
-                    const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
+                    const tempText = tempTomorrow !== null ? ` ${this.round(tempTomorrow, 1)}°C` : '';
 
                     const weatherText = weatherTomorrowText || weatherTomorrow;
                     if (weatherText) {
@@ -1465,11 +1548,12 @@ ${statusText}
                     const weatherTodayTemp =
                         weatherTodayTempState && weatherTodayTempState.val !== null ? weatherTodayTempState.val : null;
 
-                    if (weatherTodayText || weatherTodayTemp) {
+                    if (weatherTodayText || weatherTodayTemp !== null) {
                         const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
-                        const todayTempSuffix = weatherTodayTemp
-                            ? ` (${this.translate('Currently')}: ${this.round(weatherTodayTemp, 1)}°C)`
-                            : '';
+                        const todayTempSuffix =
+                            weatherTodayTemp !== null
+                                ? ` (${this.translate('Currently')}: ${this.round(weatherTodayTemp, 1)}°C)`
+                                : '';
                         message += `\n━━━━━━━━━━━━━━━━━━━━━━\n🌤️ *${this.translate('Weather today')}:* ${weatherDesc}${todayTempSuffix}`;
                         weatherAdded = true;
                     }
@@ -1495,7 +1579,7 @@ ${statusText}
                         weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
                     const tempTomorrow =
                         tempTomorrowState && tempTomorrowState.val !== null ? tempTomorrowState.val : null;
-                    const tempText = tempTomorrow ? ` ${this.round(tempTomorrow, 1)}°C` : '';
+                    const tempText = tempTomorrow !== null ? ` ${this.round(tempTomorrow, 1)}°C` : '';
 
                     const weatherText = weatherTomorrowText || weatherTomorrow;
                     if (weatherText) {
@@ -1592,7 +1676,7 @@ ${statusText}
             return '🌡️ unbekannt';
         }
 
-        const text = weatherText.toLowerCase();
+        const text = String(weatherText).toLowerCase();
 
         if (text.includes('sonnig') || text.includes('klar')) {
             return '☀️ sonnig';
@@ -1635,7 +1719,7 @@ ${statusText}
         if (!weatherText) {
             return false;
         }
-        const text = weatherText.toLowerCase();
+        const text = String(weatherText).toLowerCase();
         return (
             text.includes('sonnig') || text.includes('klar') || text.includes('clear') || text.includes('few clouds')
         );
@@ -1650,7 +1734,7 @@ ${statusText}
         if (!weatherText) {
             return false;
         }
-        const text = weatherText.toLowerCase();
+        const text = String(weatherText).toLowerCase();
         return (
             text.includes('regen') ||
             text.includes('rain') ||
@@ -1676,65 +1760,60 @@ ${statusText}
         return Math.round(value * Math.pow(10, decimals)) / Math.pow(10, decimals);
     }
 
+    /**
+     * Parse a time string "HH:MM"
+     *
+     * @param {string} value - Time string
+     * @returns {{ hours: number, minutes: number } | null} Parsed time or null if invalid
+     */
+    parseTime(value) {
+        const match = String(value || '')
+            .trim()
+            .match(/^(\d{1,2}):(\d{2})/);
+        if (!match) {
+            return null;
+        }
+        const hours = parseInt(match[1], 10);
+        const minutes = parseInt(match[2], 10);
+        return hours < 24 && minutes < 60 ? { hours, minutes } : null;
+    }
+
+    /**
+     * Parse the value of the sunset object ("HH:MM", ISO date string or timestamp) into local hours/minutes
+     *
+     * @param {ioBroker.StateValue | undefined} value - State value
+     * @returns {{ hours: number, minutes: number } | null} Parsed time or null if invalid
+     */
+    parseSunsetTime(value) {
+        if (value === null || value === undefined || value === '') {
+            return null;
+        }
+        const time = typeof value === 'string' ? this.parseTime(value) : null;
+        if (time) {
+            return time;
+        }
+        const date = new Date(typeof value === 'string' && /^\d+$/.test(value) ? Number(value) : value);
+        return isNaN(date.getTime()) ? null : { hours: date.getHours(), minutes: date.getMinutes() };
+    }
+
+    /**
+     * Check whether the given time equals the configured time string
+     *
+     * @param {Date} now - Current time
+     * @param {string} configTime - Configured time "HH:MM"
+     */
+    isTime(now, configTime) {
+        const time = this.parseTime(configTime);
+        return !!time && now.getHours() === time.hours && now.getMinutes() === time.minutes;
+    }
+
     /**
      * Start scheduled tasks
      */
     startScheduledTasks() {
         // Check every minute
         this.scheduledInterval = this.setInterval(() => {
-            const now = new Date();
-            const hours = now.getHours();
-            const minutes = now.getMinutes();
-            const jsDay = now.getDay(); // JavaScript: 0=So, 1=Mo, ..., 6=Sa
-            // Umwandeln in ioBroker-Format: 0=Mo, 1=Di, ..., 6=So
-            const day = jsDay === 0 ? 6 : jsDay - 1;
-            const date = now.getDate();
-
-            // Alle 5 Minuten: Statistik prüfen (um :00, :05, :10, ...)
-            if (minutes % 5 === 0) {
-                this.resetDailyStats();
-                this.resetWeeklyStats().catch(e => this.log.error(`Weekly reset failed: ${e.message}`));
-                this.resetMonthlyStats().catch(e => this.log.error(`Monthly reset failed: ${e.message}`));
-            }
-
-            // Tägliche Statistik — entweder zur konfigurierten Zeit oder zum Sonnenuntergang
-            if (this.config.statsUseSunset && this.config.statsSunsetObject) {
-                // Sonnenuntergangszeit aus dem konfigurierten Objekt lesen
-                this.getForeignStateAsync(this.config.statsSunsetObject)
-                    .then(sunsetState => {
-                        if (sunsetState && sunsetState.val) {
-                            const sunsetTime = String(sunsetState.val).trim();
-                            const match = sunsetTime.match(/^(\d{1,2}):(\d{2})/);
-                            if (match) {
-                                const sunsetHours = parseInt(match[1], 10);
-                                const sunsetMinutes = parseInt(match[2], 10);
-                                if (hours === sunsetHours && minutes === sunsetMinutes) {
-                                    this.sendDailyStatsMessage();
-                                }
-                            }
-                        }
-                    })
-                    .catch(e => this.log.warn(`Could not read sunset object: ${e.message}`));
-            } else {
-                const [dayHours, dayMinutes] = this.config.statsDayTime.split(':').map(Number);
-                if (hours === dayHours && minutes === dayMinutes) {
-                    this.sendDailyStatsMessage();
-                }
-            }
-
-            // Wöchentliche Statistik am konfigurierten Tag und Zeit
-            const [weekHours, weekMinutes] = this.config.statsWeekTime.split(':').map(Number);
-            if (day === this.config.statsWeekDay && hours === weekHours && minutes === weekMinutes) {
-                this.sendTelegram(this.buildWeeklyStatsMessage());
-            }
-
-            // Monatsstatistik am konfigurierten Tag und Zeit
-            if (this.config.monthlyStatsEnabled) {
-                const [monthHours, monthMinutes] = this.config.monthlyStatsTime.split(':').map(Number);
-                if (date === this.config.monthlyStatsDay && hours === monthHours && minutes === monthMinutes) {
-                    this.sendTelegram(this.buildMonthlyStatsMessage());
-                }
-            }
+            this.runScheduledTasks(new Date()).catch(e => this.log.error(`Scheduled task failed: ${e.message}`));
         }, 60000); // Jede Minute ausführen
 
         this.log.info(
@@ -1743,19 +1822,61 @@ ${statusText}
     }
 
     /**
-     * Tägliche Statistik zurücksetzen (zur konfigurierten Zeit)
+     * Run the scheduled tasks for the given minute
+     *
+     * @param {Date} now - Current time
      */
-    resetDailyStats() {
-        const today = new Date().getDate();
-        const now = new Date();
-        const hours = now.getHours();
-        const minutes = now.getMinutes();
+    async runScheduledTasks(now) {
+        const jsDay = now.getDay(); // JavaScript: 0=So, 1=Mo, ..., 6=Sa
+        // Umwandeln in ioBroker-Format: 0=Mo, 1=Di, ..., 6=So
+        const day = jsDay === 0 ? 6 : jsDay - 1;
+        const date = now.getDate();
+
+        // Statistik-Resets bei jedem Durchlauf prüfen (jeweils nur einmal pro Tag/Woche/Monat)
+        this.resetDailyStats(now);
+        await this.resetWeeklyStats(now);
+        await this.resetMonthlyStats(now);
+
+        // Tägliche Statistik — entweder zur konfigurierten Zeit oder zum Sonnenuntergang
+        if (this.config.statsUseSunset && this.config.statsSunsetObject) {
+            // Sonnenuntergangszeit aus dem konfigurierten Objekt lesen
+            try {
+                const sunsetState = await this.getForeignStateAsync(this.config.statsSunsetObject);
+                const sunset = this.parseSunsetTime(sunsetState ? sunsetState.val : null);
+                if (sunset && now.getHours() === sunset.hours && now.getMinutes() === sunset.minutes) {
+                    await this.sendDailyStatsMessage();
+                }
+            } catch (e) {
+                this.log.warn(`Could not read sunset object: ${e.message}`);
+            }
+        } else if (this.isTime(now, this.config.statsDayTime)) {
+            await this.sendDailyStatsMessage();
+        }
 
-        // Konfigurierte Zeit parsen
-        const [resetHours, resetMinutes] = this.config.statsDayTime.split(':').map(Number);
+        // Wöchentliche Statistik am konfigurierten Tag und Zeit
+        if (day === Number(this.config.statsWeekDay) && this.isTime(now, this.config.statsWeekTime)) {
+            this.sendTelegram(this.buildWeeklyStatsMessage());
+        }
 
-        // Reset zur konfigurierten Zeit
-        if (today !== this.stats.lastStatsReset && hours === resetHours && minutes === resetMinutes) {
+        // Monatsstatistik am konfigurierten Tag und Zeit
+        if (
+            this.config.monthlyStatsEnabled &&
+            date === Number(this.config.monthlyStatsDay) &&
+            this.isTime(now, this.config.monthlyStatsTime)
+        ) {
+            this.sendTelegram(this.buildMonthlyStatsMessage());
+        }
+    }
+
+    /**
+     * Tägliche Statistik zurücksetzen (bei Tageswechsel, passend zu loadStatistics())
+     *
+     * @param {Date} [now] - Current time
+     */
+    resetDailyStats(now = new Date()) {
+        const today = now.getDate();
+
+        if (today !== this.stats.lastStatsReset) {
             this.log.info('Resetting daily statistics');
             this.stats.fullCycles = 0;
             this.stats.emptyCycles = 0;
@@ -1767,17 +1888,27 @@ ${statusText}
     }
 
     /**
-     * Reset weekly statistics - AUTOMATISCH am Sonntag um 23:55 (vor sourceanalytix Reset)
+     * Check whether the "before midnight" save window (23:55-23:59) is active
+     *
+     * @param {Date} now - Current time
      */
-    async resetWeeklyStats() {
-        const now = new Date();
+    isSaveWindow(now) {
+        return now.getHours() === 23 && now.getMinutes() >= 55;
+    }
+
+    /**
+     * Reset weekly statistics - AUTOMATISCH am Sonntag ab 23:55 (vor sourceanalytix Reset)
+     *
+     * @param {Date} [now] - Current time
+     */
+    async resetWeeklyStats(now = new Date()) {
         const jsDay = now.getDay(); // JavaScript: 0=So, 1=Mo, ..., 6=Sa
-        const hours = now.getHours();
-        const minutes = now.getMinutes();
+        const dateKey = now.toDateString();
 
-        // Automatische Speicherung: Jeden Sonntag um 23:55 (vor Mitternacht)
-        // JavaScript: 0 = Sonntag → genau das wollen wir!
-        if (jsDay === 0 && hours === 23 && minutes === 55) {
+        // Automatische Speicherung: Jeden Sonntag 23:55-23:59 (vor Mitternacht), einmal pro Woche.
+        // Ein Fenster statt einer exakten Minute, damit ein verzögerter Timer-Tick den Abschluss nicht verpasst.
+        if (jsDay === 0 && this.isSaveWindow(now) && this.status.lastWeekSave !== dateKey) {
+            this.status.lastWeekSave = dateKey;
             this.log.info('Auto-saving weekly statistics (Sunday 23:55, before sourceanalytix reset)');
 
             // Aktuelle Daten aus externen States lesen (direkter Zugriff)
@@ -1794,50 +1925,49 @@ ${statusText}
             this.stats.weekFullCycles = 0;
             this.stats.weekEmptyCycles = 0;
 
-            this.saveStatistics();
+            await this.saveStatistics();
             this.log.info(
                 `Weekly stats saved: Production=${this.stats.lastWeekProduction} kWh, FeedIn=${this.stats.lastWeekFeedIn} kWh`,
             );
-            // KEIN Senden hier - Senden erfolgt nur in startScheduledTasks() zur konfigurierten Zeit
+            // KEIN Senden hier - Senden erfolgt nur in runScheduledTasks() zur konfigurierten Zeit
         }
     }
 
     /**
-     * Monatsstatistik zurücksetzen - AUTOMATISCH am letzten Tag des Monats um 23:55 (vor sourceanalytix Reset)
+     * Monatsstatistik zurücksetzen - AUTOMATISCH am letzten Tag des Monats ab 23:55 (vor sourceanalytix Reset).
+     * Die Monatszyklen werden auch bei deaktivierter Monatsstatistik zurückgesetzt.
+     *
+     * @param {Date} [now] - Current time
      */
-    async resetMonthlyStats() {
-        if (!this.config.monthlyStatsEnabled) {
-            return;
-        }
-
-        const now = new Date();
+    async resetMonthlyStats(now = new Date()) {
         const today = now.getDate();
-        const hours = now.getHours();
-        const minutes = now.getMinutes();
+        const dateKey = now.toDateString();
 
         // Letzten Tag des aktuellen Monats berechnen
         // new Date(Jahr, Monat+1, 0) gibt den letzten Tag des aktuellen Monats zurück
         const lastDayOfMonth = new Date(now.getFullYear(), now.getMonth() + 1, 0).getDate();
 
-        // Automatische Speicherung: Letzter Tag des Monats um 23:55 (vor Mitternacht)
-        if (today === lastDayOfMonth && hours === 23 && minutes === 55) {
+        // Automatische Speicherung: Letzter Tag des Monats 23:55-23:59 (vor Mitternacht), einmal pro Monat
+        if (today === lastDayOfMonth && this.isSaveWindow(now) && this.status.lastMonthSave !== dateKey) {
+            this.status.lastMonthSave = dateKey;
             this.log.info(
                 `Auto-saving monthly statistics (last day of month ${today}. ${now.getMonth() + 1}.${now.getFullYear()} 23:55, before sourceanalytix reset)`,
             );
 
             // Aktuelle Daten aus externen States lesen (direkter Zugriff)
-            this.stats.lastMonthProduction = await this.readForeignNumber(this.config.monthlyProduction);
-            this.stats.lastMonthConsumption = await this.readForeignNumber(this.config.monthlyConsumption);
-            this.stats.lastMonthFeedIn = await this.readForeignNumber(this.config.monthlyFeedIn);
-            this.stats.lastMonthGridPower = await this.readForeignNumber(this.config.monthlyGridPower);
-            // Monthly cycle counters (previously the daily counters were stored by mistake)
+            if (this.config.monthlyStatsEnabled) {
+                this.stats.lastMonthProduction = await this.readForeignNumber(this.config.monthlyProduction);
+                this.stats.lastMonthConsumption = await this.readForeignNumber(this.config.monthlyConsumption);
+                this.stats.lastMonthFeedIn = await this.readForeignNumber(this.config.monthlyFeedIn);
+                this.stats.lastMonthGridPower = await this.readForeignNumber(this.config.monthlyGridPower);
+            }
             this.stats.lastMonthFullCycles = this.stats.monthFullCycles;
             this.stats.lastMonthEmptyCycles = this.stats.monthEmptyCycles;
             this.stats.monthFullCycles = 0;
             this.stats.monthEmptyCycles = 0;
 
             this.stats.lastMonthReset = today;
-            this.saveStatistics();
+            await this.saveStatistics();
             this.log.info(
                 `Monthly stats saved: Production=${this.stats.lastMonthProduction} kWh, FeedIn=${this.stats.lastMonthFeedIn} kWh`,
             );
@@ -2120,9 +2250,9 @@ ${statusText}
                         weatherTodayTextState && weatherTodayTextState.val !== null ? weatherTodayTextState.val : null;
                     const weatherTodayTemp =
                         weatherTodayState && weatherTodayState.val !== null ? weatherTodayState.val : null;
-                    const tempText = weatherTodayTemp ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
+                    const tempText = weatherTodayTemp !== null ? ` ${this.round(weatherTodayTemp, 1)}°C` : '';
 
-                    if (weatherTodayText || weatherTodayTemp) {
+                    if (weatherTodayText || weatherTodayTemp !== null) {
                         const weatherDesc = weatherTodayText ? this.getWeatherDescription(weatherTodayText) : '🌡️';
                         message += `\n\n🌤️ *${this.translate('Weather today')}:* ${weatherDesc}${tempText}`;
                     }
@@ -2143,9 +2273,9 @@ ${statusText}
                             : null;
                     const weatherTomorrowTemp =
                         weatherTomorrowState && weatherTomorrowState.val !== null ? weatherTomorrowState.val : null;
-                    const tempText = weatherTomorrowTemp ? ` ${this.round(weatherTomorrowTemp, 1)}°C` : '';
+                    const tempText = weatherTomorrowTemp !== null ? ` ${this.round(weatherTomorrowTemp, 1)}°C` : '';
 
-                    if (weatherTomorrowText || weatherTomorrowTemp) {
+                    if (weatherTomorrowText || weatherTomorrowTemp !== null) {
                         const weatherDesc = weatherTomorrowText
                             ? this.getWeatherDescription(weatherTomorrowText)
                             : '🌡️';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.pv-notifications",
-  "version": "1.2.32",
+  "version": "1.2.33",
   "description": "PV-Anlage Batterie-Status Telegram Benachrichtigungen",
   "author": {
     "name": "Alex1808 via LLM: Qwen",
@@ -58,7 +58,7 @@
     "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/dev-server": "^0.8.0",
     "@iobroker/eslint-config": "^2.3.4",
-    "@iobroker/testing": "^6.2.1",
+    "@iobroker/testing": "^6.3.0",
     "@tsconfig/node22": "^22.0.5",
     "@types/node": "^22.19.21",
     "typescript": "~5.9.3"