iobroker.pv-notifications 1.0.98 → 1.1.0

package/README.md

@@ -339,13 +339,14 @@ sadam6752@gmail.com
 	### **WORK IN PROGRESS**
 -->
 
-### 1.0.98 (2026-03-01)
+### 1.1.0 (2026-03-01)
 
-* (FIX) Weekly/monthly stats now read directly from external states using getForeignStateAsync (not from internal states)
+* (FIX) buildFullMessage() and buildEmptyMessage() now read from INTERNAL states (statistics.currentPower, etc.) instead of external config states
+* (FIX) buildFullMessage() and buildEmptyMessage() converted to async functions with await
 
-### 1.0.97 (2026-03-01)
+### 1.0.99 (2026-03-01)
 
-* (FIX) Weekly/monthly statistics now read from internal states (statistics.currentTotalProduction, etc.) instead of external config
+* (FIX) Weekly stats auto-saved every Sunday at 23:55 (before sourceanalytix reset at 00:00)
 
 ### 1.0.93 (2026-02-27)
 

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "pv-notifications",
-    "version": "1.0.98",
+    "version": "1.1.0",
     "titleLang": {
       "en": "PV Notifications",
       "de": "PV-Benachrichtigungen",

package/main.js

@@ -639,7 +639,7 @@ class PvNotifications extends utils.Adapter {
             const allowNotification = (!nightTime || !nightModeActive) && (!quietTime || !quietModeActive);
 
             if (allowNotification && !this.status.full && this.canNotify('full')) {
-                const message = this.buildFullMessage(soc);
+                const message = await this.buildFullMessage(soc);
                 this.sendTelegram(message, 'high');
                 this.status.full = true;
                 this.status.lastNotification.full = Date.now();
@@ -668,7 +668,7 @@ class PvNotifications extends utils.Adapter {
                 const blockedByQuietTime = quietTime && quietModeActive;
 
                 if (allowEmptyNotification && !blockedByQuietTime) {
-                    const message = this.buildEmptyMessage(soc);
+                    const message = await this.buildEmptyMessage(soc);
                     this.sendTelegram(message, 'high');
                     this.status.empty = true;
                     this.status.lastNotification.empty = Date.now();
@@ -852,11 +852,17 @@ class PvNotifications extends utils.Adapter {
      *
      * @param {number} soc - Battery state of charge in percent
      */
-    buildFullMessage(soc) {
-        const power = this.getStateValue(this.config.powerProduction);
-        const totalProd = this.getStateValue(this.config.totalProduction);
-        const feedIn = this.getStateValue(this.config.feedIn);
-        const consumption = this.getStateValue(this.config.consumption);
+    async buildFullMessage(soc) {
+        // Werte aus INTERNEN States lesen (aktualisiert in Echtzeit durch onStateChange)
+        const powerState = await this.getStateAsync('statistics.currentPower');
+        const totalProdState = await this.getStateAsync('statistics.currentTotalProduction');
+        const feedInState = await this.getStateAsync('statistics.currentFeedIn');
+        const consumptionState = await this.getStateAsync('statistics.currentConsumption');
+
+        const power = powerState && powerState.val !== null ? powerState.val : 0;
+        const totalProd = totalProdState && totalProdState.val !== null ? totalProdState.val : 0;
+        const feedIn = feedInState && feedInState.val !== null ? feedInState.val : 0;
+        const consumption = consumptionState && consumptionState.val !== null ? consumptionState.val : 0;
 
         let message = `🔋 *${this.translate('Battery full')}* (${soc}%)
 
@@ -900,9 +906,13 @@ class PvNotifications extends utils.Adapter {
      *
      * @param {number} soc - Battery state of charge in percent
      */
-    buildEmptyMessage(soc) {
-        const gridPower = this.getStateValue(this.config.gridPower);
-        const consumption = this.getStateValue(this.config.consumption);
+    async buildEmptyMessage(soc) {
+        // Werte aus INTERNEN States lesen (aktualisiert in Echtzeit durch onStateChange)
+        const gridPowerState = await this.getStateAsync('statistics.currentGridPower');
+        const consumptionState = await this.getStateAsync('statistics.currentConsumption');
+
+        const gridPower = gridPowerState && gridPowerState.val !== null ? gridPowerState.val : 0;
+        const consumption = consumptionState && consumptionState.val !== null ? consumptionState.val : 0;
 
         let message = `🔋 *${this.translate('Battery empty')}* (${soc}%)
 
@@ -1266,18 +1276,20 @@ ${statusText}`;
     }
 
     /**
-     * Reset weekly statistics
+     * Reset weekly statistics - AUTOMATISCH am Sonntag um 23:55 (vor sourceanalytix Reset)
      */
     async resetWeeklyStats() {
-        const jsDay = new Date().getDay(); // JavaScript: 0=So, 1=Mo, ..., 6=Sa
-        // Umwandeln in ioBroker-Format: 0=Mo, 1=Di, ..., 6=So
-        const today = jsDay === 0 ? 6 : jsDay - 1;
+        const now = new Date();
+        const jsDay = now.getDay(); // JavaScript: 0=So, 1=Mo, ..., 6=Sa
+        const hours = now.getHours();
+        const minutes = now.getMinutes();
 
-        if (today === this.config.statsWeekDay && today !== this.stats.lastWeekReset) {
-            this.log.info('Resetting weekly statistics');
+        // Automatische Speicherung: Jeden Sonntag um 23:55 (vor Mitternacht)
+        // JavaScript: 0 = Sonntag → genau das wollen wir!
+        if (jsDay === 0 && hours === 23 && minutes === 55) {
+            this.log.info('Auto-saving weekly statistics (Sunday 23:55, before sourceanalytix reset)');
 
-            // Aktuelle Daten aus internen States lesen (aktualisiert in Echtzeit)
-            // Fallback: Wenn interne States leer, direkt aus externen States lesen
+            // Aktuelle Daten aus externen States lesen (direkter Zugriff)
             const totalProd = await this.getForeignStateAsync(this.config.totalProduction);
             const consumption = await this.getForeignStateAsync(this.config.consumption);
             const feedIn = await this.getForeignStateAsync(this.config.feedIn);
@@ -1293,32 +1305,33 @@ ${statusText}`;
             // Wöchentliche Statistik zurücksetzen
             this.stats.weekFullCycles = 0;
             this.stats.weekEmptyCycles = 0;
-            this.stats.lastWeekReset = today;
 
             this.saveStatistics();
-            this.log.info(`Weekly stats saved: Production=${this.stats.lastWeekProduction} kWh`);
+            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
         }
     }
 
     /**
-     * Monatsstatistik zurücksetzen
+     * Monatsstatistik zurücksetzen - AUTOMATISCH am letzten Tag des Monats um 23:55 (vor sourceanalytix Reset)
      */
     async resetMonthlyStats() {
         if (!this.config.monthlyStatsEnabled) {
             return;
         }
 
-        const today = new Date().getDate();
         const now = new Date();
+        const today = now.getDate();
         const hours = now.getHours();
         const minutes = now.getMinutes();
-        const [statHours, statMinutes] = this.config.monthlyStatsTime.split(':').map(Number);
 
-        // Daten am konfigurierten Tag zur konfigurierten Zeit speichern (nicht vorher)
-        if (today === this.config.monthlyStatsDay && this.stats.lastMonthReset !== today && 
-            (hours > statHours || (hours === statHours && minutes >= statMinutes))) {
-            this.log.info('Resetting monthly statistics');
+        // 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) {
+            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)
             const totalProd = await this.getForeignStateAsync(this.config.monthlyProduction);
@@ -1335,7 +1348,7 @@ ${statusText}`;
 
             this.stats.lastMonthReset = today;
             this.saveStatistics();
-            this.log.info(`Monthly stats saved: Production=${this.stats.lastMonthProduction} kWh`);
+            this.log.info(`Monthly stats saved: Production=${this.stats.lastMonthProduction} kWh, FeedIn=${this.stats.lastMonthFeedIn} kWh`);
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.pv-notifications",
-  "version": "1.0.98",
+  "version": "1.1.0",
   "description": "PV-Anlage Batterie-Status Telegram Benachrichtigungen",
   "author": {
     "name": "Alex1808 via LLM: Qwen",