iobroker.utility-monitor 1.4.5 → 1.5.0

package/lib/stateManager.js

@@ -1,28 +1,7 @@
 /**
- * State Manager module for nebenkosten-monitor
  * Manages the creation and structure of all adapter states
  */
 
-/**
- * Safe wrapper for setObjectNotExistsAsync with error handling
- *
- * @param {object} adapter - Adapter instance
- * @param {string} id - State ID
- * @param {object} obj - State object
- * @returns {Promise<void>}
- */
-async function safeSetObjectNotExists(adapter, id, obj) {
-    try {
-        await adapter.setObjectNotExistsAsync(id, obj);
-    } catch (error) {
-        adapter.log.warn(`Failed to create state ${id}: ${error.message}`);
-        // Re-throw critical errors
-        if (error.message && error.message.includes('EACCES')) {
-            throw error;
-        }
-    }
-}
-
 /**
  * State role definitions for different state types
  */
@@ -162,6 +141,20 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
         native: {},
     });
 
+    await adapter.setObjectNotExistsAsync(`${type}.consumption.weekly`, {
+        type: 'state',
+        common: {
+            name: `Wochen-${(label.consumption || 'Verbrauch').toLowerCase()} (${label.unit})`,
+            type: 'number',
+            role: STATE_ROLES.consumption,
+            read: true,
+            write: false,
+            unit: label.unit,
+            def: 0,
+        },
+        native: {},
+    });
+
     // Map internal type to config type (electricity -> strom, water -> wasser, gas -> gas)
     const configTypeMap = {
         electricity: 'strom',
@@ -200,6 +193,28 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
                 native: {},
             });
         }
+
+        const htNtWeeklyStates = ['weeklyHT', 'weeklyNT'];
+        const htNtWeeklyLabels = {
+            weeklyHT: 'Wochenverbrauch Haupttarif (HT)',
+            weeklyNT: 'Wochenverbrauch Nebentarif (NT)',
+        };
+
+        for (const state of htNtWeeklyStates) {
+            await adapter.setObjectNotExistsAsync(`${type}.consumption.${state}`, {
+                type: 'state',
+                common: {
+                    name: `${htNtWeeklyLabels[state]} (${label.unit})`,
+                    type: 'number',
+                    role: STATE_ROLES.consumption,
+                    read: true,
+                    write: false,
+                    unit: label.unit,
+                    def: 0,
+                },
+                native: {},
+            });
+        }
     }
 
     await adapter.setObjectNotExistsAsync(`${type}.consumption.lastUpdate`, {
@@ -265,6 +280,20 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
         native: {},
     });
 
+    await adapter.setObjectNotExistsAsync(`${type}.costs.weekly`, {
+        type: 'state',
+        common: {
+            name: `Wochen-${(label.cost || 'Kosten').toLowerCase()} (€)`,
+            type: 'number',
+            role: STATE_ROLES.cost,
+            read: true,
+            write: false,
+            unit: '€',
+            def: 0,
+        },
+        native: {},
+    });
+
     // HT/NT states - only create if HT/NT tariff is enabled
     // Note: htNtEnabledKey already calculated above for consumption section
     if (_config[htNtEnabledKey]) {
@@ -351,6 +380,34 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
             },
             native: {},
         });
+
+        await adapter.setObjectNotExistsAsync(`${type}.costs.weeklyHT`, {
+            type: 'state',
+            common: {
+                name: 'Wochenkosten Haupttarif (HT) (€)',
+                type: 'number',
+                role: STATE_ROLES.cost,
+                read: true,
+                write: false,
+                unit: '€',
+                def: 0,
+            },
+            native: {},
+        });
+
+        await adapter.setObjectNotExistsAsync(`${type}.costs.weeklyNT`, {
+            type: 'state',
+            common: {
+                name: 'Wochenkosten Nebentarif (NT) (€)',
+                type: 'number',
+                role: STATE_ROLES.cost,
+                read: true,
+                write: false,
+                unit: '€',
+                def: 0,
+            },
+            native: {},
+        });
     }
 
     await adapter.setObjectNotExistsAsync(`${type}.costs.totalYearly`, {
@@ -765,6 +822,68 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
         });
     }
 
+    // Last week consumption
+    await adapter.setObjectNotExistsAsync(`${type}.statistics.lastWeek`, {
+        type: 'state',
+        common: {
+            name: `Verbrauch letzte Woche (${label.unit})`,
+            type: 'number',
+            role: STATE_ROLES.consumption,
+            read: true,
+            write: false,
+            unit: label.unit,
+            def: 0,
+        },
+        native: {},
+    });
+
+    if (type === 'gas') {
+        await adapter.setObjectNotExistsAsync(`${type}.statistics.lastWeekVolume`, {
+            type: 'state',
+            common: {
+                name: `Verbrauch letzte Woche (${label.volumeUnit})`,
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: label.volumeUnit,
+                def: 0,
+            },
+            native: {},
+        });
+    }
+
+    // Last month consumption
+    await adapter.setObjectNotExistsAsync(`${type}.statistics.lastMonth`, {
+        type: 'state',
+        common: {
+            name: `Verbrauch letzter Monat (${label.unit})`,
+            type: 'number',
+            role: STATE_ROLES.consumption,
+            read: true,
+            write: false,
+            unit: label.unit,
+            def: 0,
+        },
+        native: {},
+    });
+
+    if (type === 'gas') {
+        await adapter.setObjectNotExistsAsync(`${type}.statistics.lastMonthVolume`, {
+            type: 'state',
+            common: {
+                name: `Verbrauch letzter Monat (${label.volumeUnit})`,
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: label.volumeUnit,
+                def: 0,
+            },
+            native: {},
+        });
+    }
+
     await adapter.setObjectNotExistsAsync(`${type}.statistics.lastDayStart`, {
         type: 'state',
         common: {
@@ -777,6 +896,18 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
         native: {},
     });
 
+    await adapter.setObjectNotExistsAsync(`${type}.statistics.lastWeekStart`, {
+        type: 'state',
+        common: {
+            name: 'Wochenzähler zurückgesetzt am',
+            type: 'number',
+            role: STATE_ROLES.timestamp,
+            read: true,
+            write: false,
+        },
+        native: {},
+    });
+
     await adapter.setObjectNotExistsAsync(`${type}.statistics.lastMonthStart`, {
         type: 'state',
         common: {
@@ -817,11 +948,12 @@ async function createUtilityStateStructure(adapter, type, _config = {}) {
 async function createMeterStructure(adapter, type, meterName, _config = {}) {
     const isGas = type === 'gas';
 
+    // All meters now include the meter name in labels for consistency
     const labels = {
-        gas: { name: meterName === 'main' ? 'Gas' : `Gas (${meterName})`, unit: 'kWh', volumeUnit: 'm³' },
-        water: { name: meterName === 'main' ? 'Wasser' : `Wasser (${meterName})`, unit: 'm³', volumeUnit: 'm³' },
-        electricity: { name: meterName === 'main' ? 'Strom' : `Strom (${meterName})`, unit: 'kWh', volumeUnit: 'kWh' },
-        pv: { name: meterName === 'main' ? 'PV' : `PV (${meterName})`, unit: 'kWh', volumeUnit: 'kWh' },
+        gas: { name: `Gas (${meterName})`, unit: 'kWh', volumeUnit: 'm³' },
+        water: { name: `Wasser (${meterName})`, unit: 'm³', volumeUnit: 'm³' },
+        electricity: { name: `Strom (${meterName})`, unit: 'kWh', volumeUnit: 'kWh' },
+        pv: { name: `PV (${meterName})`, unit: 'kWh', volumeUnit: 'kWh' },
     };
 
     const label = labels[type];
@@ -832,7 +964,7 @@ async function createMeterStructure(adapter, type, meterName, _config = {}) {
         // Fallback to prevent crash
         return;
     }
-    const basePath = meterName === 'main' ? type : `${type}.${meterName}`;
+    const basePath = `${type}.${meterName}`;
 
     // Create main channel
     await adapter.setObjectNotExistsAsync(basePath, {
@@ -895,6 +1027,20 @@ async function createMeterStructure(adapter, type, meterName, _config = {}) {
             },
             native: {},
         });
+
+        await adapter.setObjectNotExistsAsync(`${basePath}.consumption.weeklyVolume`, {
+            type: 'state',
+            common: {
+                name: 'Wöchentlicher Verbrauch (m³)',
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: 'm³',
+                def: 0,
+            },
+            native: {},
+        });
     }
 
     await adapter.setObjectNotExistsAsync(`${basePath}.consumption.daily`, {
@@ -939,6 +1085,65 @@ async function createMeterStructure(adapter, type, meterName, _config = {}) {
         native: {},
     });
 
+    await adapter.setObjectNotExistsAsync(`${basePath}.consumption.weekly`, {
+        type: 'state',
+        common: {
+            name: `Wochenverbrauch (${label.unit})`,
+            type: 'number',
+            role: STATE_ROLES.consumption,
+            read: true,
+            write: false,
+            unit: label.unit,
+            def: 0,
+        },
+        native: {},
+    });
+
+    if (_config.htNtEnabled) {
+        const htNtStates = [
+            'dailyHT',
+            'dailyNT',
+            'monthlyHT',
+            'monthlyNT',
+            'yearlyHT',
+            'yearlyNT',
+            'weeklyHT',
+            'weeklyNT',
+        ];
+        const htNtLabels = {
+            dailyHT: 'Tagesverbrauch Haupttarif (HT)',
+            dailyNT: 'Tagesverbrauch Nebentarif (NT)',
+            monthlyHT: 'Monatsverbrauch Haupttarif (HT)',
+            monthlyNT: 'Monatsverbrauch Nebentarif (NT)',
+            yearlyHT: 'Jahresverbrauch Haupttarif (HT)',
+            yearlyNT: 'Jahresverbrauch Nebentarif (NT)',
+            weeklyHT: 'Wochenverbrauch Haupttarif (HT)',
+            weeklyNT: 'Wochenverbrauch Nebentarif (NT)',
+            weeklyVolumeHT: 'Wochenverbrauch Haupttarif (m³)',
+            weeklyVolumeNT: 'Wochenverbrauch Nebentarif (m³)',
+        };
+
+        if (type === 'gas') {
+            htNtStates.push('weeklyVolumeHT', 'weeklyVolumeNT');
+        }
+
+        for (const state of htNtStates) {
+            await adapter.setObjectNotExistsAsync(`${basePath}.consumption.${state}`, {
+                type: 'state',
+                common: {
+                    name: `${htNtLabels[state]} (${label.unit})`,
+                    type: 'number',
+                    role: STATE_ROLES.consumption,
+                    read: true,
+                    write: false,
+                    unit: label.unit,
+                    def: 0,
+                },
+                native: {},
+            });
+        }
+    }
+
     await adapter.setObjectNotExistsAsync(`${basePath}.consumption.lastUpdate`, {
         type: 'state',
         common: {
@@ -1002,6 +1207,59 @@ async function createMeterStructure(adapter, type, meterName, _config = {}) {
         native: {},
     });
 
+    await adapter.setObjectNotExistsAsync(`${basePath}.costs.weekly`, {
+        type: 'state',
+        common: {
+            name: 'Wochenkosten (€)',
+            type: 'number',
+            role: STATE_ROLES.cost,
+            read: true,
+            write: false,
+            unit: '€',
+            def: 0,
+        },
+        native: {},
+    });
+
+    if (_config.htNtEnabled) {
+        const htNtCostStates = [
+            'dailyHT',
+            'dailyNT',
+            'monthlyHT',
+            'monthlyNT',
+            'yearlyHT',
+            'yearlyNT',
+            'weeklyHT',
+            'weeklyNT',
+        ];
+        const htNtCostLabels = {
+            dailyHT: 'Tageskosten Haupttarif (HT)',
+            dailyNT: 'Tageskosten Nebentarif (NT)',
+            monthlyHT: 'Monatskosten Haupttarif (HT)',
+            monthlyNT: 'Monatskosten Nebentarif (NT)',
+            yearlyHT: 'Jahreskosten Haupttarif (HT)',
+            yearlyNT: 'Jahreskosten Nebentarif (NT)',
+            weeklyHT: 'Wochenkosten Haupttarif (HT)',
+            weeklyNT: 'Wochenkosten Nebentarif (NT)',
+        };
+
+        for (const state of htNtCostStates) {
+            await adapter.setObjectNotExistsAsync(`${basePath}.costs.${state}`, {
+                type: 'state',
+                common: {
+                    name: `${htNtCostLabels[state]} (€)`,
+                    type: 'number',
+                    role: STATE_ROLES.cost,
+                    read: true,
+                    write: false,
+                    unit: '€',
+                    def: 0,
+                },
+                native: {},
+            });
+        }
+    }
+
     await adapter.setObjectNotExistsAsync(`${basePath}.costs.totalYearly`, {
         type: 'state',
         common: {
@@ -1278,27 +1536,27 @@ async function createMeterStructure(adapter, type, meterName, _config = {}) {
         native: {},
     });
 
-    await adapter.setObjectNotExistsAsync(`${basePath}.info.lastSync`, {
+    await adapter.setObjectNotExistsAsync(`${basePath}.info.sensorActive`, {
         type: 'state',
         common: {
-            name: 'Letzte Synchronisation',
-            type: 'number',
-            role: STATE_ROLES.timestamp,
+            name: 'Sensor aktiv',
+            type: 'boolean',
+            role: 'indicator.reachable',
             read: true,
             write: false,
+            def: false,
         },
         native: {},
     });
 
-    await adapter.setObjectNotExistsAsync(`${basePath}.info.sensorActive`, {
+    await adapter.setObjectNotExistsAsync(`${basePath}.info.lastSync`, {
         type: 'state',
         common: {
-            name: 'Sensor aktiv',
-            type: 'boolean',
-            role: STATE_ROLES.indicator,
+            name: 'Letzte Synchronisation',
+            type: 'number',
+            role: STATE_ROLES.timestamp,
             read: true,
             write: false,
-            def: false,
         },
         native: {},
     });
@@ -1383,6 +1641,68 @@ async function createMeterStructure(adapter, type, meterName, _config = {}) {
         });
     }
 
+    // Last week consumption
+    await adapter.setObjectNotExistsAsync(`${basePath}.statistics.lastWeek`, {
+        type: 'state',
+        common: {
+            name: `Verbrauch letzte Woche (${label.unit})`,
+            type: 'number',
+            role: STATE_ROLES.consumption,
+            read: true,
+            write: false,
+            unit: label.unit,
+            def: 0,
+        },
+        native: {},
+    });
+
+    if (type === 'gas') {
+        await adapter.setObjectNotExistsAsync(`${basePath}.statistics.lastWeekVolume`, {
+            type: 'state',
+            common: {
+                name: `Verbrauch letzte Woche (${label.volumeUnit})`,
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: label.volumeUnit,
+                def: 0,
+            },
+            native: {},
+        });
+    }
+
+    // Last month consumption
+    await adapter.setObjectNotExistsAsync(`${basePath}.statistics.lastMonth`, {
+        type: 'state',
+        common: {
+            name: `Verbrauch letzter Monat (${label.unit})`,
+            type: 'number',
+            role: STATE_ROLES.consumption,
+            read: true,
+            write: false,
+            unit: label.unit,
+            def: 0,
+        },
+        native: {},
+    });
+
+    if (type === 'gas') {
+        await adapter.setObjectNotExistsAsync(`${basePath}.statistics.lastMonthVolume`, {
+            type: 'state',
+            common: {
+                name: `Verbrauch letzter Monat (${label.volumeUnit})`,
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: label.volumeUnit,
+                def: 0,
+            },
+            native: {},
+        });
+    }
+
     await adapter.setObjectNotExistsAsync(`${basePath}.statistics.lastDayStart`, {
         type: 'state',
         common: {
@@ -1419,6 +1739,18 @@ async function createMeterStructure(adapter, type, meterName, _config = {}) {
         native: {},
     });
 
+    await adapter.setObjectNotExistsAsync(`${basePath}.statistics.lastWeekStart`, {
+        type: 'state',
+        common: {
+            name: 'Wochenzähler zurückgesetzt am',
+            type: 'number',
+            role: STATE_ROLES.timestamp,
+            read: true,
+            write: false,
+        },
+        native: {},
+    });
+
     adapter.log.debug(`Meter state structure created for ${type}.${meterName}`);
 }
 
@@ -1523,6 +1855,61 @@ async function createTotalsStructure(adapter, type) {
         native: {},
     });
 
+    if (type === 'gas') {
+        await adapter.setObjectNotExistsAsync(`${basePath}.consumption.weeklyVolume`, {
+            type: 'state',
+            common: {
+                name: 'Wochenverbrauch Gesamt (m³)',
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: 'm³',
+                def: 0,
+            },
+            native: {},
+        });
+
+        // Also add HT/NT volume totals if gas has HT/NT enabled
+        if (adapter.config.gasHtNtEnabled) {
+            const hntVolumeStates = ['weeklyVolumeHT', 'weeklyVolumeNT'];
+            const hntVolumeLabels = {
+                weeklyVolumeHT: 'Wochenverbrauch Gesamt Haupttarif (HT) (m³)',
+                weeklyVolumeNT: 'Wochenverbrauch Gesamt Nebentarif (NT) (m³)',
+            };
+
+            for (const state of hntVolumeStates) {
+                await adapter.setObjectNotExistsAsync(`${basePath}.consumption.${state}`, {
+                    type: 'state',
+                    common: {
+                        name: hntVolumeLabels[state],
+                        type: 'number',
+                        role: STATE_ROLES.consumption,
+                        read: true,
+                        write: false,
+                        unit: 'm³',
+                        def: 0,
+                    },
+                    native: {},
+                });
+            }
+        }
+    }
+
+    await adapter.setObjectNotExistsAsync(`${basePath}.consumption.weekly`, {
+        type: 'state',
+        common: {
+            name: `Wochenverbrauch Gesamt (${label.unit})`,
+            type: 'number',
+            role: STATE_ROLES.consumption,
+            read: true,
+            write: false,
+            unit: label.unit,
+            def: 0,
+        },
+        native: {},
+    });
+
     // COST STATES (totals)
     await adapter.setObjectNotExistsAsync(`${basePath}.costs`, {
         type: 'channel',
@@ -1560,6 +1947,20 @@ async function createTotalsStructure(adapter, type) {
         native: {},
     });
 
+    await adapter.setObjectNotExistsAsync(`${basePath}.costs.weekly`, {
+        type: 'state',
+        common: {
+            name: 'Wochenkosten Gesamt (€)',
+            type: 'number',
+            role: STATE_ROLES.cost,
+            read: true,
+            write: false,
+            unit: '€',
+            def: 0,
+        },
+        native: {},
+    });
+
     await adapter.setObjectNotExistsAsync(`${basePath}.costs.totalYearly`, {
         type: 'state',
         common: {
@@ -1577,11 +1978,82 @@ async function createTotalsStructure(adapter, type) {
     adapter.log.debug(`Totals state structure created for ${type}`);
 }
 
+/**
+ * Creates history structure for a specific year
+ *
+ * @param {object} adapter - The adapter instance
+ * @param {string} type - 'gas', 'water', 'electricity', 'pv'
+ * @param {string} meterName - Meter name
+ * @param {number|string} year - Year (YYYY)
+ * @returns {Promise<void>}
+ */
+async function createHistoryStructure(adapter, type, meterName, year) {
+    const basePath = `${type}.${meterName}.history.${year}`;
+
+    await adapter.setObjectNotExistsAsync(`${type}.${meterName}.history`, {
+        type: 'channel',
+        common: { name: 'Historie' },
+        native: {},
+    });
+
+    await adapter.setObjectNotExistsAsync(basePath, {
+        type: 'channel',
+        common: { name: `Jahr ${year}` },
+        native: { year },
+    });
+
+    const unit = type === 'water' ? 'm³' : 'kWh';
+
+    await adapter.setObjectNotExistsAsync(`${basePath}.consumption`, {
+        type: 'state',
+        common: {
+            name: `Jahresverbrauch ${year} (${unit})`,
+            type: 'number',
+            role: STATE_ROLES.consumption,
+            read: true,
+            write: false,
+            unit: unit,
+            def: 0,
+        },
+        native: {},
+    });
+
+    if (type === 'gas') {
+        await adapter.setObjectNotExistsAsync(`${basePath}.volume`, {
+            type: 'state',
+            common: {
+                name: `Jahresverbrauch ${year} (m³)`,
+                type: 'number',
+                role: STATE_ROLES.consumption,
+                read: true,
+                write: false,
+                unit: 'm³',
+                def: 0,
+            },
+            native: {},
+        });
+    }
+
+    await adapter.setObjectNotExistsAsync(`${basePath}.costs`, {
+        type: 'state',
+        common: {
+            name: `Jahreskosten ${year} (€)`,
+            type: 'number',
+            role: STATE_ROLES.cost,
+            read: true,
+            write: false,
+            unit: '€',
+            def: 0,
+        },
+        native: {},
+    });
+}
+
 module.exports = {
     createUtilityStateStructure,
     createMeterStructure,
     createTotalsStructure,
+    createHistoryStructure,
     deleteUtilityStateStructure,
-    safeSetObjectNotExists,
     STATE_ROLES,
 };