node-red-contrib-energymeterplus 0.2.0 → 0.2.2

package/README.md

@@ -1,4 +1,4 @@
-#### **EnergyMeterPlus Node Version 0.1.2**
+#### **EnergyMeterPlus Node Version 0.2.1**
 
 
 
@@ -70,7 +70,7 @@ Input Unit: "W" for Watts (default) or "kW" if your source already provides kilo
 
 
 
-Baselines: Initial values for daily, weekly, monthly, and yearly counters. Can also be used to correct baseline values or left blank if not needed.
+Baselines: Initial values for daily, weekly, monthly, and yearly counters. Can also be used to correct baseline values or left blank if not needed. Baseline values are applied once at startup or upon a config change and are cleared from the UI. New values can be entered as needed, and the cycle repeats.
 
 
 

package/energyMeterPlus.js

@@ -55,46 +55,55 @@ module.exports = function(RED) {
             }
         }
 
-        // Rollover logic
+        // Archive yearly totals
+        function archiveYearly(total, year) {
+            try {
+                const archivePath = path.join(path.dirname(filePath), "yearly_archive.json");
+                let archive = [];
+                if (fs.existsSync(archivePath)) {
+                    archive = JSON.parse(fs.readFileSync(archivePath));
+                }
+                archive.push({
+                    year: year,
+                    total_kWh: total,
+                    timestamp: new Date().toISOString()
+                });
+                fs.writeFileSync(archivePath, JSON.stringify(archive, null, 2));
+            } catch (err) {
+                node.error("Failed to archive yearly total: " + err);
+            }
+        }
+
+        // Safe rounding helper
+        function round2(val) {
+            if (val === null || val === undefined || isNaN(val)) return 0;
+            return Number(val.toFixed(2));
+        }
+
+        // Rollover logic with baseline reset
         function checkRollover() {
             let now = new Date();
 
             // Daily rollover (midnight)
             if (now.getDate() !== lastCheck.getDate()) {
-                baseline.weekly += baseline.daily; // absorb yesterday
-                baseline.daily = 0;
+                // Reset daily back to baseline offset instead of 0
+                baseline.daily = baselineDaily;
             }
 
             // Weekly rollover (Sunday → Monday)
             if (now.getDay() === 1 && lastCheck.getDay() !== 1) {
-                baseline.monthly += baseline.weekly; // absorb last week
-                baseline.weekly = 0;
+                baseline.weekly = baselineWeekly; // reset to baseline offset
             }
 
             // Monthly rollover (1st of month)
             if (now.getMonth() !== lastCheck.getMonth()) {
-                baseline.yearly += baseline.monthly; // absorb last month
-                baseline.monthly = 0;
+                baseline.monthly = baselineMonthly; // reset to baseline offset
             }
 
             // Yearly rollover (Jan 1)
             if (now.getFullYear() !== lastCheck.getFullYear()) {
-                try {
-                    const archivePath = path.join(path.dirname(filePath), "yearly_archive.json");
-                    let archive = [];
-                    if (fs.existsSync(archivePath)) {
-                        archive = JSON.parse(fs.readFileSync(archivePath));
-                    }
-                    archive.push({
-                        year: lastCheck.getFullYear(),
-                        total_kWh: baseline.yearly,
-                        timestamp: new Date().toISOString()
-                    });
-                    fs.writeFileSync(archivePath, JSON.stringify(archive, null, 2));
-                } catch (err) {
-                    node.error("Failed to archive yearly total: " + err);
-                }
-                baseline.yearly = 0;
+                archiveYearly(baseline.yearly, lastCheck.getFullYear());
+                baseline.yearly = baselineYearly; // reset to baseline offset
             }
 
             lastCheck = now;
@@ -114,8 +123,14 @@ module.exports = function(RED) {
 
             let energyIncrement = power_kW * durationHours;
 
+            // Add increment to daily
             baseline.daily += energyIncrement;
 
+            // Continuous absorption
+            baseline.weekly  += energyIncrement;
+            baseline.monthly += energyIncrement;
+            baseline.yearly  += energyIncrement;
+
             function round2(val) { return Number(val.toFixed(2)); }
 
             msg.payload = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-energymeterplus",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A custom Node-RED node that integrates power readings into energy totals with persistence and cost calculation.",
   "author": "Arcfrankye",
   "license": "MIT",
@@ -13,4 +13,3 @@
     }
   }
 }
-