node-red-contrib-energymeterplus 0.2.3 → 0.2.4

package/README.md

@@ -1,4 +1,4 @@
-#### **EnergyMeterPlus Node Version 0.2.3**
+#### **EnergyMeterPlus Node Version 0.2.4**
 
 
 
@@ -168,7 +168,11 @@ Costs scale automatically with your configured unit cost.
 
 
 
-##### **Updates 2.3:**
+##### **Updates:**
+
+
+
+###### **V2.3:**
 
 
 
@@ -186,3 +190,19 @@ Baselines now applied once and stored in context.
 
 updated counters to continuous absorption, no transfer at rollover
 
+
+
+###### v2.4
+
+
+
+Fixed a bug where the internal counters were not updating incrementally.
+
+
+
+Added payload validation
+
+
+
+Fixed Baselines bug: Baselines captured once, stored in context, and survive after UI clears
+

package/energyMeterPlus.js

@@ -11,12 +11,6 @@ module.exports = function(RED) {
         let inputUnit = config.inputUnit || "W";
         let currencyCode = config.currency || "USD";
 
-        // Baseline corrections (numeric values from config)
-        let baselineDaily   = Number(config.baselineDaily)   || 0;
-        let baselineWeekly  = Number(config.baselineWeekly)  || 0;
-        let baselineMonthly = Number(config.baselineMonthly) || 0;
-        let baselineYearly  = Number(config.baselineYearly)  || 0;
-
         // Load persisted baseline or initialize
         let baseline = node.context().get("baseline") || {
             daily: 0,
@@ -25,37 +19,23 @@ module.exports = function(RED) {
             yearly: 0
         };
 
-        // Store numeric baselines separately so resets don’t pull from blanked config
+        // Load stored numeric baselines (persisted separately)
         let storedBaselines = node.context().get("storedBaselines") || {
-            daily: baselineDaily,
-            weekly: baselineWeekly,
-            monthly: baselineMonthly,
-            yearly: baselineYearly
+            daily: Number(config.baselineDaily) || 0,
+            weekly: Number(config.baselineWeekly) || 0,
+            monthly: Number(config.baselineMonthly) || 0,
+            yearly: Number(config.baselineYearly) || 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;
-
-            storedBaselines = {
-                daily: baselineDaily,
-                weekly: baselineWeekly,
-                monthly: baselineMonthly,
-                yearly: baselineYearly
-            };
+        // Apply baselines once if new values entered
+        if (config.baselineDaily || config.baselineWeekly || config.baselineMonthly || config.baselineYearly) {
+            baseline.daily   += storedBaselines.daily;
+            baseline.weekly  += storedBaselines.weekly;
+            baseline.monthly += storedBaselines.monthly;
+            baseline.yearly  += storedBaselines.yearly;
 
-            node.context().set("baselineApplied", true);
+            node.context().set("baseline", baseline);
             node.context().set("storedBaselines", storedBaselines);
-
-            // Cosmetic blanking: clear config fields so they show empty in UI
-            config.baselineDaily   = "";
-            config.baselineWeekly  = "";
-            config.baselineMonthly = "";
-            config.baselineYearly  = "";
         }
 
         // Load last timestamp or initialize
@@ -100,22 +80,15 @@ module.exports = function(RED) {
         function checkRollover() {
             let now = new Date();
 
-            // Daily rollover (midnight)
             if (now.getDate() !== lastCheck.getDate()) {
                 baseline.daily = storedBaselines.daily;
             }
-
-            // Weekly rollover (Sunday → Monday)
             if (now.getDay() === 1 && lastCheck.getDay() !== 1) {
                 baseline.weekly = storedBaselines.weekly;
             }
-
-            // Monthly rollover (1st of month)
             if (now.getMonth() !== lastCheck.getMonth()) {
                 baseline.monthly = storedBaselines.monthly;
             }
-
-            // Yearly rollover (Jan 1)
             if (now.getFullYear() !== lastCheck.getFullYear()) {
                 archiveYearly(baseline.yearly, lastCheck.getFullYear());
                 baseline.yearly = storedBaselines.yearly;
@@ -129,22 +102,25 @@ module.exports = function(RED) {
 
         node.on('input', function(msg) {
             let now = new Date();
-            let durationHours = (now - lastCheck) / (1000 * 3600);
-            lastCheck = now;
-            node.context().set("lastCheck", lastCheck);
 
-            let power = Number(msg.payload) || 0;
-            let power_kW = (inputUnit === "W") ? power / 1000 : power;
+            // Calculate duration BEFORE updating lastCheck
+            let durationHours = (now - lastCheck) / (1000 * 3600);
 
-            let energyIncrement = power_kW * durationHours;
+            let power = Number(msg.payload);
+            if (!isNaN(power)) {
+                let power_kW = (inputUnit === "W") ? power / 1000 : power;
+                let energyIncrement = power_kW * durationHours;
 
-            // Add increment to daily
-            baseline.daily += energyIncrement;
+                // Apply increment
+                baseline.daily   += energyIncrement;
+                baseline.weekly  += energyIncrement;
+                baseline.monthly += energyIncrement;
+                baseline.yearly  += energyIncrement;
+            }
 
-            // Continuous absorption
-            baseline.weekly  += energyIncrement;
-            baseline.monthly += energyIncrement;
-            baseline.yearly  += energyIncrement;
+            // Update lastCheck AFTER increment
+            lastCheck = now;
+            node.context().set("lastCheck", lastCheck);
 
             msg.payload = {
                 daily_kWh: round2(baseline.daily),
@@ -164,7 +140,6 @@ module.exports = function(RED) {
                 fs.mkdirSync(dir, { recursive: true });
             }
 
-            // Write snapshot safely
             try {
                 fs.writeFileSync(filePath, JSON.stringify(msg.payload, null, 2));
             } catch (err) {

package/package.json

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