iobroker.utility-monitor 1.5.1 → 1.6.1

package/README.md

@@ -108,6 +108,36 @@ wasser.main.consumption.daily
 - **Klarheit**: Keine Special-Case Logik mehr im Code
 - **Multi-Meter**: Bessere Unterstützung für mehrere Zähler pro Typ
 - **CSV Import**: Einfaches Nachpflegen von historischen Daten via Drag-and-Drop im Admin-Interface
+- **Strukturierte Statistiken (v1.6.0)**: Klare Trennung von Verbrauch, Kosten und Zeitstempeln
+
+---
+
+## ⚠️ Breaking Changes in Version 1.6.0
+
+**WICHTIG:** Version 1.6.0 strukturiert das Statistik-Objekt um!
+
+### Was hat sich geändert?
+
+**Vorher (bis 1.5.1):**
+
+```
+gas.main.statistics.lastDay
+gas.main.statistics.lastMonth
+gas.main.statistics.lastDayStart
+```
+
+**Jetzt (ab 1.6.0):**
+
+```
+gas.main.statistics.consumption.lastDay      ← Verbrauchswerte
+gas.main.statistics.cost.lastDay             ← Kostenwerte (NEU!)
+gas.main.statistics.timestamps.lastDayStart   ← Zeitstempel der Resets
+```
+
+### 🔧 Migration erforderlich
+
+1. **Skripte/VIS anpassen**: Falls du direkt auf Statistik-Datenpunkte zugreifst, musst du die Pfade anpassen.
+2. **Kostenstatistiken**: Du profitierst nun von historischen Kostenübersichten (Tag/Woche/Monat).
 
 ---
 
@@ -212,13 +242,34 @@ Balance:           +62,64 € → Nachzahlung
 
 ### 📈 **statistics** (Statistiken)
 
+Seit Version 1.6.1 sind Statistiken in drei Unterkanäle unterteilt:
+
+#### 📊 **consumption** (Verbrauchshistorie)
+
+| Datenpunkt       | Beschreibung                         |
+| ---------------- | ------------------------------------ |
+| `lastDay`        | Verbrauch **gestern** (Vortag)       |
+| `lastWeek`       | Verbrauch **letzte Woche**           |
+| `lastMonth`      | Verbrauch **letzter Monat**          |
+| `lastYear`       | Verbrauch **letztes Jahr** (Vorjahr) |
+| `averageDaily`   | Durchschnittlicher Tagesverbrauch    |
+| `averageMonthly` | Durchschnittlicher Monatsverbrauch   |
+
+#### 💰 **cost** (Kostenhistorie - NEU in 1.6.0)
+
+| Datenpunkt       | Beschreibung                      |
+| ---------------- | --------------------------------- |
+| `lastDay`        | Kosten **gestern** (Vortag)       |
+| `lastWeek`       | Kosten **letzte Woche**           |
+| `lastMonth`      | Kosten **letzter Monat**          |
+| `lastYear`       | Kosten **letztes Jahr** (Vorjahr) |
+| `averageDaily`   | Durchschnittliche Tageskosten     |
+| `averageMonthly` | Durchschnittliche Monatskosten    |
+
+#### 📅 **timestamps** (Reset-Zeitstempel)
+
 | Datenpunkt       | Beschreibung                             |
 | ---------------- | ---------------------------------------- |
-| `averageDaily`   | Durchschnittlicher Tagesverbrauch        |
-| `averageMonthly` | Durchschnittlicher Monatsverbrauch       |
-| `lastDay`        | Verbrauch **gestern** (Vortag)           |
-| `lastWeek`       | Verbrauch **letzte Woche**               |
-| `lastMonth`      | Verbrauch **letzter Monat**              |
 | `lastDayStart`   | Letzter Tages-Reset (23:59 Uhr)          |
 | `lastWeekStart`  | Letzter Wochen-Reset (Sonntag 23:59)     |
 | `lastMonthStart` | Letzter Monats-Reset (letzter Tag 23:59) |
@@ -308,6 +359,28 @@ Der Adapter setzt Zähler automatisch zurück:
 
 ## Changelog
 
+### 1.6.1 (2026-01-28)
+
+- **NEU:** 📊 **Erweiterte Jahresstatistiken** - Einführung von `lastYear` Datenpunkten in den Statistiken:
+    - `statistics.consumption.lastYear`: Gesamtverbrauch des Vorjahres
+    - `statistics.cost.lastYear`: Gesamtkosten des Vorjahres
+    - Unterstützung für HT/NT und Gas-Volumen in der Vorjahresansicht
+- **NEU:** 🔄 **Automatisches Sichern** - Vorjahreswerte werden beim jährlichen Reset automatisch in die Statistik archiviert
+- **FIX:** 🛠️ **Syntax & Einheiten** - Korrektur von Einheiten-Inkonsistenzen (speziell Wasser/m³) und Linter-Fehlern
+- **DOCS:** 🌐 **Übersetzungen** - News-Einträge in alle unterstützten Sprachen übersetzt
+
+### 1.6.0 (2026-01-28)
+
+- **NEU:** 📊 **Strukturierte Statistiken** - Einführung von Unterkanälen für bessere Übersicht:
+    - `statistics.consumption`: Alle historischen Verbrauchswerte
+    - `statistics.cost`: Alle historischen Kostenwerte (Tag/Woche/Monat)
+    - `statistics.timestamps`: Alle Reset-Zeitstempel an einem Ort
+- **NEU:** 💰 **Kostenstatistiken** - Verfolge deine Kosten nun auch für gestern, letzte Woche und letzten Monat
+- **REFACTORING:** 🏗️ **Modulare State-Verwaltung**:
+    - `stateManager.js` wurde in spezialisierte Module aufgeteilt (`lib/state/`)
+    - Verbesserte Wartbarkeit und Testbarkeit
+- **CLEANUP:** 🧹 **Bereinigung** - Automatische Entfernung veralteter Statistik-Datenpunkte beim ersten Start
+
 ### 1.5.1 (2026-01-26)
 
 - **FIX:** 🕛 **Reset-Timing** - Automatische Resets werden nun um 23:59 Uhr ausgeführt (statt 00:00 Uhr)

package/io-package.json

@@ -1,8 +1,38 @@
 {
     "common": {
         "name": "utility-monitor",
-        "version": "1.5.0",
+        "version": "1.6.1",
         "news": {
+            "1.6.1": {
+                "en": "New statistics data points: lastDay, lastWeek, lastMonth, and lastYear for costs and consumption.",
+                "de": "Neue Statistik-Datenpunkte: lastDay, lastWeek, lastMonth, lastYear für Kosten und Verbrauch.",
+                "ru": "Новые точки статистических данных: lastDay, lastWeek, lastMonth и lastYear для затрат и потребления.",
+                "pt": "Novos pontos de dados estatísticos: lastDay, lastWeek, lastMonth e lastYear para custos e consumo.",
+                "nl": "Nieuwe statistiekgegevenspunten: lastDay, lastWeek, lastMonth en lastYear voor kosten en verbruik.",
+                "fr": "Nouveaux points de données statistiques : lastDay, lastWeek, lastMonth et lastYear pour les coûts et la consommation.",
+                "it": "Nuovi punti dati statistici: lastDay, lastWeek, lastMonth e lastYear per costi e consumi.",
+                "es": "Nuevos puntos de datos estadísticos: lastDay, lastWeek, lastMonth y lastYear para costes y consumo.",
+                "pl": "Nowe punkty danych statystycznych: lastDay, lastWeek, lastMonth i lastYear dla kosztów i zużycia.",
+                "uk": "Нові статистичні дані: lastDay, lastWeek, lastMonth і lastYear для витрат і споживання.",
+                "zh-cn": "新的统计数据点：成本和消耗的 lastDay、lastWeek、lastMonth 和 lastYear。"
+            },
+            "1.6.0": {
+                "en": "New: Structured statistics with consumption and cost sub-channels. New: Weekly and monthly cost tracking. Refactoring: Split stateManager.js into modular files. Cleanup: Removed redundant old statistics states.",
+                "de": "Neu: Strukturierte Statistiken mit Unterkanälen für Verbrauch und Kosten. Neu: Wöchentliche und monatliche Kostenverfolgung. Refactoring: stateManager.js in modulare Dateien aufgeteilt. Bereinigung: Veraltete Statistik-Datenpunkte entfernt."
+            },
+            "1.5.1": {
+                "en": "Fix: Reset timing and monthly calculation logic. Fix: JSDoc type definitions.",
+                "de": "Fix: Reset-Timing und monatliche Berechnungslogik. Fix: JSDoc Typ-Definitionen.",
+                "ru": "Исправление: время сброса и логика ежемесячного расчета. Исправление: определения типов JSDoc.",
+                "pt": "Correção: tempo de redefinição e lógica de cálculo mensal. Correção: definições de tipo JSDoc.",
+                "nl": "Fix: Reset timing en maandelijkse berekeningslogica. Fix: JSDoc type definities.",
+                "fr": "Correctif : synchronisation de la réinitialisation et logique de calcul mensuel. Correctif : définitions de type JSDoc.",
+                "it": "Correzione: tempi di ripristino e logica di calcolo mensile. Correzione: definizioni dei tipi JSDoc.",
+                "es": "Solución: sincronización de reinicio y lógica de cálculo mensual. Solución: definiciones de tipos de JSDoc.",
+                "pl": "Naprawa: czas resetowania i logika obliczeń miesięcznych. Naprawa: definicje typów JSDoc.",
+                "uk": "Виправлення: час скидання та логіка щомісячного розрахунку. Виправлення: визначення типів JSDoc.",
+                "zh-cn": "修复：重置时间和每月计算逻辑。修复：JSDoc 类型定义。"
+            },
             "1.5.0": {
                 "en": "New: CSV Import feature with drag and drop support. New: Weekly tracking points. Fix: Resets now performed at 23:59. Refactoring: Modular backend architecture.",
                 "de": "Neu: CSV-Import mit Drag-and-Drop. Neu: Wöchentliche Datenpunkte. Fix: Resets werden jetzt um 23:59 Uhr ausgeführt. Refactoring: Modulare Backend-Architektur.",

package/lib/billingManager.js

@@ -171,7 +171,7 @@ class BillingManager {
         }
 
         if (!startDate || isNaN(startDate.getTime())) {
-            const lastYearStart = await this.adapter.getStateAsync(`${type}.statistics.lastYearStart`);
+            const lastYearStart = await this.adapter.getStateAsync(`${type}.statistics.timestamps.lastYearStart`);
             startDate = new Date(lastYearStart?.val || Date.now());
         }
 
@@ -372,7 +372,11 @@ class BillingManager {
         // even if the user closes the period early (e.g. 2 days before)
         const thisYearAnniversary = new Date(startDate);
         thisYearAnniversary.setFullYear(new Date().getFullYear());
-        await this.adapter.setStateAsync(`${type}.statistics.lastYearStart`, thisYearAnniversary.getTime(), true);
+        await this.adapter.setStateAsync(
+            `${type}.statistics.timestamps.lastYearStart`,
+            thisYearAnniversary.getTime(),
+            true,
+        );
 
         this.adapter.log.info(`✅ Abrechnungszeitraum ${year} für ${type} erfolgreich abgeschlossen!`);
         this.adapter.log.info(
@@ -526,7 +530,11 @@ class BillingManager {
         // Update lastYearStart to contract anniversary
         const thisYearAnniversary = new Date(startDate);
         thisYearAnniversary.setFullYear(new Date().getFullYear());
-        await this.adapter.setStateAsync(`${basePath}.statistics.lastYearStart`, thisYearAnniversary.getTime(), true);
+        await this.adapter.setStateAsync(
+            `${basePath}.statistics.timestamps.lastYearStart`,
+            thisYearAnniversary.getTime(),
+            true,
+        );
 
         // Update totals if multiple meters exist
         const meters = this.adapter.multiMeterManager?.getMetersForType(type) || [];
@@ -644,7 +652,7 @@ class BillingManager {
             };
 
             // DAILY RESET: Trigger at 23:59 if today's reset hasn't happened yet
-            const lastDayStart = await this.adapter.getStateAsync(`${basePath}.statistics.lastDayStart`);
+            const lastDayStart = await this.adapter.getStateAsync(`${basePath}.statistics.timestamps.lastDayStart`);
             if (lastDayStart?.val) {
                 const lastResetTime = lastDayStart.val;
                 const alreadyResetToday = isValidResetToday(lastResetTime);
@@ -665,7 +673,7 @@ class BillingManager {
             }
 
             // WEEKLY RESET: Trigger at 23:59 on Sunday if this week's reset hasn't happened yet
-            const lastWeekStart = await this.adapter.getStateAsync(`${basePath}.statistics.lastWeekStart`);
+            const lastWeekStart = await this.adapter.getStateAsync(`${basePath}.statistics.timestamps.lastWeekStart`);
             if (lastWeekStart?.val) {
                 const lastWeekTime = lastWeekStart.val;
                 const isSunday = nowDate.getDay() === 0; // 0 = Sunday
@@ -694,7 +702,9 @@ class BillingManager {
 
             // MONTHLY RESET: Trigger at 23:59 on last day of month
             if (meters.length > 0) {
-                const lastMonthStartState = await this.adapter.getStateAsync(`${basePath}.statistics.lastMonthStart`);
+                const lastMonthStartState = await this.adapter.getStateAsync(
+                    `${basePath}.statistics.timestamps.lastMonthStart`,
+                );
                 if (lastMonthStartState?.val) {
                     const lastMonthTime = lastMonthStartState.val;
                     const lastMonthDate = new Date(lastMonthTime);
@@ -725,7 +735,7 @@ class BillingManager {
             for (const meter of meters) {
                 const meterBasePath = `${type}.${meter.name}`;
                 const lastYearStartState = await this.adapter.getStateAsync(
-                    `${meterBasePath}.statistics.lastYearStart`,
+                    `${meterBasePath}.statistics.timestamps.lastYearStart`,
                 );
 
                 if (lastYearStartState?.val) {
@@ -835,7 +845,12 @@ class BillingManager {
             const dailyValue = dailyState?.val || 0;
 
             // Save last day consumption
-            await this.adapter.setStateAsync(`${basePath}.statistics.lastDay`, dailyValue, true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastDay`, dailyValue, true);
+
+            // Save last day costs
+            const dailyCostState = await this.adapter.getStateAsync(`${basePath}.costs.daily`);
+            const dailyCostValue = dailyCostState?.val || 0;
+            await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastDay`, dailyCostValue, true);
 
             await this.adapter.setStateAsync(`${basePath}.consumption.daily`, 0, true);
 
@@ -843,7 +858,11 @@ class BillingManager {
                 const dailyVolume = await this.adapter.getStateAsync(`${basePath}.consumption.dailyVolume`);
                 const dailyVolumeValue = dailyVolume?.val || 0;
                 // Save last day volume for gas
-                await this.adapter.setStateAsync(`${basePath}.statistics.lastDayVolume`, dailyVolumeValue, true);
+                await this.adapter.setStateAsync(
+                    `${basePath}.statistics.consumption.lastDayVolume`,
+                    dailyVolumeValue,
+                    true,
+                );
                 await this.adapter.setStateAsync(`${basePath}.consumption.dailyVolume`, 0, true);
             }
 
@@ -853,23 +872,44 @@ class BillingManager {
             if (htNtEnabled) {
                 const dailyHT = await this.adapter.getStateAsync(`${basePath}.consumption.dailyHT`);
                 const dailyNT = await this.adapter.getStateAsync(`${basePath}.consumption.dailyNT`);
-                await this.adapter.setStateAsync(`${basePath}.statistics.lastDayHT`, dailyHT?.val || 0, true);
-                await this.adapter.setStateAsync(`${basePath}.statistics.lastDayNT`, dailyNT?.val || 0, true);
+                await this.adapter.setStateAsync(
+                    `${basePath}.statistics.consumption.lastDayHT`,
+                    dailyHT?.val || 0,
+                    true,
+                );
+                await this.adapter.setStateAsync(
+                    `${basePath}.statistics.consumption.lastDayNT`,
+                    dailyNT?.val || 0,
+                    true,
+                );
                 await this.adapter.setStateAsync(`${basePath}.consumption.dailyHT`, 0, true);
                 await this.adapter.setStateAsync(`${basePath}.consumption.dailyNT`, 0, true);
+
+                // Costs for HT/NT
+                const dailyCostHT = (await this.adapter.getStateAsync(`${basePath}.costs.dailyHT`))?.val || 0;
+                const dailyCostNT = (await this.adapter.getStateAsync(`${basePath}.costs.dailyNT`))?.val || 0;
+                await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastDayHT`, dailyCostHT, true);
+                await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastDayNT`, dailyCostNT, true);
+                await this.adapter.setStateAsync(`${basePath}.costs.dailyHT`, 0, true);
+                await this.adapter.setStateAsync(`${basePath}.costs.dailyNT`, 0, true);
             }
 
             await this.adapter.setStateAsync(`${basePath}.costs.daily`, 0, true);
 
             // Update lastDayStart timestamp (use normalized timestamp if provided)
             const timestamp = resetTimestamp || Date.now();
-            await this.adapter.setStateAsync(`${basePath}.statistics.lastDayStart`, timestamp, true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.timestamps.lastDayStart`, timestamp, true);
 
             await this.adapter.setStateAsync(
-                `${basePath}.statistics.averageDaily`,
+                `${basePath}.statistics.consumption.averageDaily`,
                 calculator.roundToDecimals(dailyValue, 2),
                 true,
             );
+            await this.adapter.setStateAsync(
+                `${basePath}.statistics.cost.averageDaily`,
+                calculator.roundToDecimals(dailyCostValue, 2),
+                true,
+            );
         }
 
         // Update totals if multiple meters exist
@@ -907,13 +947,22 @@ class BillingManager {
             const monthlyValue = monthlyState?.val || 0;
 
             // Save last month consumption
-            await this.adapter.setStateAsync(`${basePath}.statistics.lastMonth`, monthlyValue, true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastMonth`, monthlyValue, true);
+
+            // Save last month costs
+            const monthlyCostState = await this.adapter.getStateAsync(`${basePath}.costs.monthly`);
+            const monthlyCostValue = monthlyCostState?.val || 0;
+            await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastMonth`, monthlyCostValue, true);
 
             // For gas: also save volume
             if (type === 'gas') {
                 const monthlyVolume = await this.adapter.getStateAsync(`${basePath}.consumption.monthlyVolume`);
                 const monthlyVolumeValue = monthlyVolume?.val || 0;
-                await this.adapter.setStateAsync(`${basePath}.statistics.lastMonthVolume`, monthlyVolumeValue, true);
+                await this.adapter.setStateAsync(
+                    `${basePath}.statistics.consumption.lastMonthVolume`,
+                    monthlyVolumeValue,
+                    true,
+                );
                 await this.adapter.setStateAsync(`${basePath}.consumption.monthlyVolume`, 0, true);
             }
 
@@ -924,21 +973,38 @@ class BillingManager {
             const configType = getConfigType(type);
             const htNtEnabled = this.adapter.config[`${configType}HtNtEnabled`] || false;
             if (htNtEnabled) {
+                const monthlyHT = (await this.adapter.getStateAsync(`${basePath}.consumption.monthlyHT`))?.val || 0;
+                const monthlyNT = (await this.adapter.getStateAsync(`${basePath}.consumption.monthlyNT`))?.val || 0;
+                await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastMonthHT`, monthlyHT, true);
+                await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastMonthNT`, monthlyNT, true);
                 await this.adapter.setStateAsync(`${basePath}.consumption.monthlyHT`, 0, true);
                 await this.adapter.setStateAsync(`${basePath}.consumption.monthlyNT`, 0, true);
+
+                // Costs for HT/NT
+                const monthlyCostHT = (await this.adapter.getStateAsync(`${basePath}.costs.monthlyHT`))?.val || 0;
+                const monthlyCostNT = (await this.adapter.getStateAsync(`${basePath}.costs.monthlyNT`))?.val || 0;
+                await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastMonthHT`, monthlyCostHT, true);
+                await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastMonthNT`, monthlyCostNT, true);
+                await this.adapter.setStateAsync(`${basePath}.costs.monthlyHT`, 0, true);
+                await this.adapter.setStateAsync(`${basePath}.costs.monthlyNT`, 0, true);
             }
 
             await this.adapter.setStateAsync(`${basePath}.costs.monthly`, 0, true);
 
             // Update lastMonthStart timestamp (use normalized timestamp if provided)
             const timestamp = resetTimestamp || Date.now();
-            await this.adapter.setStateAsync(`${basePath}.statistics.lastMonthStart`, timestamp, true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.timestamps.lastMonthStart`, timestamp, true);
 
             await this.adapter.setStateAsync(
-                `${basePath}.statistics.averageMonthly`,
+                `${basePath}.statistics.consumption.averageMonthly`,
                 calculator.roundToDecimals(monthlyValue, 2),
                 true,
             );
+            await this.adapter.setStateAsync(
+                `${basePath}.statistics.cost.averageMonthly`,
+                calculator.roundToDecimals(monthlyCostValue, 2),
+                true,
+            );
         }
 
         // Update totals if multiple meters exist
@@ -970,18 +1036,51 @@ class BillingManager {
 
             this.adapter.log.debug(`Resetting yearly counter for ${basePath} (${label})`);
 
+            const yearlyState = await this.adapter.getStateAsync(`${basePath}.consumption.yearly`);
+            const yearlyValue = yearlyState?.val || 0;
+            await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastYear`, yearlyValue, true);
+
+            const yearlyCostState = await this.adapter.getStateAsync(`${basePath}.costs.yearly`);
+            const yearlyCostValue = yearlyCostState?.val || 0;
+            await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastYear`, yearlyCostValue, true);
+
             await this.adapter.setStateAsync(`${basePath}.consumption.yearly`, 0, true);
 
             if (type === 'gas') {
+                const yearlyVolume = await this.adapter.getStateAsync(`${basePath}.consumption.yearlyVolume`);
+                const yearlyVolumeValue = yearlyVolume?.val || 0;
+                await this.adapter.setStateAsync(
+                    `${basePath}.statistics.consumption.lastYearVolume`,
+                    yearlyVolumeValue,
+                    true,
+                );
                 await this.adapter.setStateAsync(`${basePath}.consumption.yearlyVolume`, 0, true);
             }
 
+            const configType = getConfigType(type);
+            const htNtEnabled = this.adapter.config[`${configType}HtNtEnabled`] || false;
+            if (htNtEnabled) {
+                const yearlyHT = (await this.adapter.getStateAsync(`${basePath}.consumption.yearlyHT`))?.val || 0;
+                const yearlyNT = (await this.adapter.getStateAsync(`${basePath}.consumption.yearlyNT`))?.val || 0;
+                await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastYearHT`, yearlyHT, true);
+                await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastYearNT`, yearlyNT, true);
+                await this.adapter.setStateAsync(`${basePath}.consumption.yearlyHT`, 0, true);
+                await this.adapter.setStateAsync(`${basePath}.consumption.yearlyNT`, 0, true);
+
+                const yearlyCostHT = (await this.adapter.getStateAsync(`${basePath}.costs.yearlyHT`))?.val || 0;
+                const yearlyCostNT = (await this.adapter.getStateAsync(`${basePath}.costs.yearlyNT`))?.val || 0;
+                await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastYearHT`, yearlyCostHT, true);
+                await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastYearNT`, yearlyCostNT, true);
+                await this.adapter.setStateAsync(`${basePath}.costs.yearlyHT`, 0, true);
+                await this.adapter.setStateAsync(`${basePath}.costs.yearlyNT`, 0, true);
+            }
+
             await this.adapter.setStateAsync(`${basePath}.costs.yearly`, 0, true);
             await this.adapter.setStateAsync(`${basePath}.billing.notificationSent`, false, true);
             await this.adapter.setStateAsync(`${basePath}.billing.notificationChangeSent`, false, true);
 
             // Update lastYearStart timestamp
-            await this.adapter.setStateAsync(`${basePath}.statistics.lastYearStart`, Date.now(), true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.timestamps.lastYearStart`, Date.now(), true);
         }
 
         // Update totals if multiple meters exist
@@ -1003,19 +1102,52 @@ class BillingManager {
 
         this.adapter.log.debug(`Resetting yearly counter for ${basePath} (${label})`);
 
+        const yearlyState = await this.adapter.getStateAsync(`${basePath}.consumption.yearly`);
+        const yearlyValue = yearlyState?.val || 0;
+        await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastYear`, yearlyValue, true);
+
+        const yearlyCostState = await this.adapter.getStateAsync(`${basePath}.costs.yearly`);
+        const yearlyCostValue = yearlyCostState?.val || 0;
+        await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastYear`, yearlyCostValue, true);
+
         await this.adapter.setStateAsync(`${basePath}.consumption.yearly`, 0, true);
 
         if (type === 'gas') {
+            const yearlyVolume = await this.adapter.getStateAsync(`${basePath}.consumption.yearlyVolume`);
+            const yearlyVolumeValue = yearlyVolume?.val || 0;
+            await this.adapter.setStateAsync(
+                `${basePath}.statistics.consumption.lastYearVolume`,
+                yearlyVolumeValue,
+                true,
+            );
             await this.adapter.setStateAsync(`${basePath}.consumption.yearlyVolume`, 0, true);
         }
 
+        const configType = getConfigType(type);
+        const htNtEnabled = this.adapter.config[`${configType}HtNtEnabled`] || false;
+        if (htNtEnabled) {
+            const yearlyHT = (await this.adapter.getStateAsync(`${basePath}.consumption.yearlyHT`))?.val || 0;
+            const yearlyNT = (await this.adapter.getStateAsync(`${basePath}.consumption.yearlyNT`))?.val || 0;
+            await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastYearHT`, yearlyHT, true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastYearNT`, yearlyNT, true);
+            await this.adapter.setStateAsync(`${basePath}.consumption.yearlyHT`, 0, true);
+            await this.adapter.setStateAsync(`${basePath}.consumption.yearlyNT`, 0, true);
+
+            const yearlyCostHT = (await this.adapter.getStateAsync(`${basePath}.costs.yearlyHT`))?.val || 0;
+            const yearlyCostNT = (await this.adapter.getStateAsync(`${basePath}.costs.yearlyNT`))?.val || 0;
+            await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastYearHT`, yearlyCostHT, true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastYearNT`, yearlyCostNT, true);
+            await this.adapter.setStateAsync(`${basePath}.costs.yearlyHT`, 0, true);
+            await this.adapter.setStateAsync(`${basePath}.costs.yearlyNT`, 0, true);
+        }
+
         await this.adapter.setStateAsync(`${basePath}.costs.yearly`, 0, true);
         await this.adapter.setStateAsync(`${basePath}.billing.notificationSent`, false, true);
         await this.adapter.setStateAsync(`${basePath}.billing.notificationChangeSent`, false, true);
 
         // Update lastYearStart timestamp (use normalized timestamp if provided)
         const timestamp = resetTimestamp || Date.now();
-        await this.adapter.setStateAsync(`${basePath}.statistics.lastYearStart`, timestamp, true);
+        await this.adapter.setStateAsync(`${basePath}.statistics.timestamps.lastYearStart`, timestamp, true);
     }
 
     /**
@@ -1034,13 +1166,22 @@ class BillingManager {
             // Save last week consumption before reset
             const weeklyState = await this.adapter.getStateAsync(`${basePath}.consumption.weekly`);
             const weeklyValue = weeklyState?.val || 0;
-            await this.adapter.setStateAsync(`${basePath}.statistics.lastWeek`, weeklyValue, true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastWeek`, weeklyValue, true);
+
+            // Save last week costs before reset
+            const weeklyCostState = await this.adapter.getStateAsync(`${basePath}.costs.weekly`);
+            const weeklyCostValue = weeklyCostState?.val || 0;
+            await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastWeek`, weeklyCostValue, true);
 
             // For gas: also save volume
             if (type === 'gas') {
                 const weeklyVolume = await this.adapter.getStateAsync(`${basePath}.consumption.weeklyVolume`);
                 const weeklyVolumeValue = weeklyVolume?.val || 0;
-                await this.adapter.setStateAsync(`${basePath}.statistics.lastWeekVolume`, weeklyVolumeValue, true);
+                await this.adapter.setStateAsync(
+                    `${basePath}.statistics.consumption.lastWeekVolume`,
+                    weeklyVolumeValue,
+                    true,
+                );
                 await this.adapter.setStateAsync(`${basePath}.consumption.weeklyVolume`, 0, true);
             }
 
@@ -1051,15 +1192,25 @@ class BillingManager {
             const configType = getConfigType(type);
             const htNtEnabled = this.adapter.config[`${configType}HtNtEnabled`] || false;
             if (htNtEnabled) {
+                const weeklyHT = (await this.adapter.getStateAsync(`${basePath}.consumption.weeklyHT`))?.val || 0;
+                const weeklyNT = (await this.adapter.getStateAsync(`${basePath}.consumption.weeklyNT`))?.val || 0;
+                await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastWeekHT`, weeklyHT, true);
+                await this.adapter.setStateAsync(`${basePath}.statistics.consumption.lastWeekNT`, weeklyNT, true);
                 await this.adapter.setStateAsync(`${basePath}.consumption.weeklyHT`, 0, true);
                 await this.adapter.setStateAsync(`${basePath}.consumption.weeklyNT`, 0, true);
+
+                // Costs for HT/NT
+                const weeklyCostHT = (await this.adapter.getStateAsync(`${basePath}.costs.weeklyHT`))?.val || 0;
+                const weeklyCostNT = (await this.adapter.getStateAsync(`${basePath}.costs.weeklyNT`))?.val || 0;
+                await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastWeekHT`, weeklyCostHT, true);
+                await this.adapter.setStateAsync(`${basePath}.statistics.cost.lastWeekNT`, weeklyCostNT, true);
                 await this.adapter.setStateAsync(`${basePath}.costs.weeklyHT`, 0, true);
                 await this.adapter.setStateAsync(`${basePath}.costs.weeklyNT`, 0, true);
             }
 
             // Update lastWeekStart timestamp (use normalized timestamp if provided)
             const timestamp = resetTimestamp || Date.now();
-            await this.adapter.setStateAsync(`${basePath}.statistics.lastWeekStart`, timestamp, true);
+            await this.adapter.setStateAsync(`${basePath}.statistics.timestamps.lastWeekStart`, timestamp, true);
         }
 
         if (meters.length > 1) {

package/lib/multiMeterManager.js

@@ -227,7 +227,7 @@ class MultiMeterManager {
         const timestampRoles = ['lastDayStart', 'lastWeekStart', 'lastMonthStart', 'lastYearStart'];
 
         for (const role of timestampRoles) {
-            const statePath = `${basePath}.statistics.${role}`;
+            const statePath = `${basePath}.statistics.timestamps.${role}`;
             const state = await this.adapter.getStateAsync(statePath);
 
             if (role === 'lastYearStart') {
@@ -325,8 +325,8 @@ class MultiMeterManager {
         const now = Date.now();
 
         // Get period start timestamps
-        const lastWeekStartState = await this.adapter.getStateAsync(`${basePath}.statistics.lastWeekStart`);
-        const lastDayStartState = await this.adapter.getStateAsync(`${basePath}.statistics.lastDayStart`);
+        const lastWeekStartState = await this.adapter.getStateAsync(`${basePath}.statistics.timestamps.lastWeekStart`);
+        const lastDayStartState = await this.adapter.getStateAsync(`${basePath}.statistics.timestamps.lastDayStart`);
 
         if (!lastWeekStartState?.val || !lastDayStartState?.val) {
             this.adapter.log.debug(`[${basePath}] No period timestamps found, skipping reconstruction`);
@@ -350,7 +350,7 @@ class MultiMeterManager {
         // Get current consumption values
         const weeklyState = await this.adapter.getStateAsync(`${basePath}.consumption.weekly`);
         const dailyState = await this.adapter.getStateAsync(`${basePath}.consumption.daily`);
-        const lastDayState = await this.adapter.getStateAsync(`${basePath}.statistics.lastDay`);
+        const lastDayState = await this.adapter.getStateAsync(`${basePath}.statistics.consumption.lastDay`);
 
         const currentWeekly = weeklyState?.val || 0;
         const currentDaily = dailyState?.val || 0;
@@ -376,7 +376,9 @@ class MultiMeterManager {
                 // Also reconstruct gas volume if applicable
                 if (type === 'gas') {
                     const weeklyVolumeState = await this.adapter.getStateAsync(`${basePath}.consumption.weeklyVolume`);
-                    const lastDayVolumeState = await this.adapter.getStateAsync(`${basePath}.statistics.lastDayVolume`);
+                    const lastDayVolumeState = await this.adapter.getStateAsync(
+                        `${basePath}.statistics.consumption.lastDayVolume`,
+                    );
                     const currentWeeklyVolume = weeklyVolumeState?.val || 0;
                     const lastDayVolume = lastDayVolumeState?.val || 0;
 
@@ -396,7 +398,9 @@ class MultiMeterManager {
         }
 
         // Similar logic for monthly reconstruction
-        const lastMonthStartState = await this.adapter.getStateAsync(`${basePath}.statistics.lastMonthStart`);
+        const lastMonthStartState = await this.adapter.getStateAsync(
+            `${basePath}.statistics.timestamps.lastMonthStart`,
+        );
         if (lastMonthStartState?.val) {
             const lastMonthStart = lastMonthStartState.val;
             const daysSinceMonthStart = (now - lastMonthStart) / (24 * 60 * 60 * 1000);
@@ -422,7 +426,7 @@ class MultiMeterManager {
                                 `${basePath}.consumption.monthlyVolume`,
                             );
                             const lastDayVolumeState = await this.adapter.getStateAsync(
-                                `${basePath}.statistics.lastDayVolume`,
+                                `${basePath}.statistics.consumption.lastDayVolume`,
                             );
                             const currentMonthlyVolume = monthlyVolumeState?.val || 0;
                             const lastDayVolume = lastDayVolumeState?.val || 0;
@@ -649,8 +653,10 @@ class MultiMeterManager {
             const value = state?.val || 0;
 
             // Get period start timestamp to calculate expected max consumption
+            const periodKey =
+                period === 'daily' ? 'Day' : period === 'weekly' ? 'Week' : period === 'monthly' ? 'Month' : 'Year';
             const periodStartState = await this.adapter.getStateAsync(
-                `${basePath}.statistics.last${period.charAt(0).toUpperCase() + period.slice(1)}Start`,
+                `${basePath}.statistics.timestamps.last${periodKey}Start`,
             );
             const periodStart = periodStartState?.val || now;
             const daysSincePeriodStart = (now - periodStart) / (24 * 60 * 60 * 1000);
@@ -982,7 +988,7 @@ class MultiMeterManager {
      * @returns {Promise<number>} Months since start (at least 1)
      */
     async _calculateMonthsSinceYearStart(basePath) {
-        const yearStartState = await this.adapter.getStateAsync(`${basePath}.statistics.lastYearStart`);
+        const yearStartState = await this.adapter.getStateAsync(`${basePath}.statistics.timestamps.lastYearStart`);
         let monthsSinceYearStart = 1;
 
         if (yearStartState && yearStartState.val) {