node-red-contrib-energymeterplus 0.1.2 → 0.2.0

package/energyMeterPlus.js

@@ -19,12 +19,29 @@ module.exports = function(RED) {
 
         // Load persisted baseline or initialize
         let baseline = node.context().get("baseline") || {
-            daily: baselineDaily,
-            weekly: baselineWeekly,
-            monthly: baselineMonthly,
-            yearly: baselineYearly
+            daily: 0,
+            weekly: 0,
+            monthly: 0,
+            yearly: 0
         };
 
+        // Apply baselines if new values entered
+        let baselineApplied = node.context().get("baselineApplied") || false;
+        if (!baselineApplied || baselineDaily || baselineWeekly || baselineMonthly || baselineYearly) {
+            baseline.daily   += baselineDaily;
+            baseline.weekly  += baselineWeekly;
+            baseline.monthly += baselineMonthly;
+            baseline.yearly  += baselineYearly;
+
+            node.context().set("baselineApplied", true);
+
+            // Cosmetic blanking: clear config fields so they show empty in UI
+            config.baselineDaily   = "";
+            config.baselineWeekly  = "";
+            config.baselineMonthly = "";
+            config.baselineYearly  = "";
+        }
+
         // Load last timestamp or initialize
         let lastCheck = node.context().get("lastCheck") || new Date();
 
@@ -41,10 +58,45 @@ module.exports = function(RED) {
         // Rollover logic
         function checkRollover() {
             let now = new Date();
-            if (now.getDate() !== lastCheck.getDate()) baseline.daily = baselineDaily;
-            if (now.getDay() === 0 && lastCheck.getDay() !== 0) baseline.weekly = baselineWeekly;
-            if (now.getMonth() !== lastCheck.getMonth()) baseline.monthly = baselineMonthly;
-            if (now.getFullYear() !== lastCheck.getFullYear()) baseline.yearly = baselineYearly;
+
+            // Daily rollover (midnight)
+            if (now.getDate() !== lastCheck.getDate()) {
+                baseline.weekly += baseline.daily; // absorb yesterday
+                baseline.daily = 0;
+            }
+
+            // Weekly rollover (Sunday → Monday)
+            if (now.getDay() === 1 && lastCheck.getDay() !== 1) {
+                baseline.monthly += baseline.weekly; // absorb last week
+                baseline.weekly = 0;
+            }
+
+            // Monthly rollover (1st of month)
+            if (now.getMonth() !== lastCheck.getMonth()) {
+                baseline.yearly += baseline.monthly; // absorb last month
+                baseline.monthly = 0;
+            }
+
+            // 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;
+            }
+
             lastCheck = now;
             node.context().set("baseline", baseline);
             node.context().set("lastCheck", lastCheck);
@@ -62,12 +114,7 @@ module.exports = function(RED) {
 
             let energyIncrement = power_kW * durationHours;
 
-            baseline.daily   += energyIncrement;
-            baseline.weekly  += energyIncrement;
-            baseline.monthly += energyIncrement;
-            baseline.yearly  += energyIncrement;
-
-            node.context().set("baseline", baseline);
+            baseline.daily += energyIncrement;
 
             function round2(val) { return Number(val.toFixed(2)); }
 

package/package.json

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