node-red-contrib-energymeterplus 0.2.2 → 0.2.4

package/README.md

@@ -1,4 +1,4 @@
-#### **EnergyMeterPlus Node Version 0.2.1**
+#### **EnergyMeterPlus Node Version 0.2.4**
 
 
 
@@ -50,7 +50,7 @@ EnergyMeterPlus is a custom Node‑RED function node designed to convert instant
 
 
 
-###### **Configuration:**
+##### **Configuration:**
 
 
 
@@ -164,3 +164,45 @@ After 24 hours → \~108.6 kWh added to daily total.
 
 Costs scale automatically with your configured unit cost.
 
+
+
+
+
+##### **Updates:**
+
+
+
+###### **V2.3:**
+
+
+
+Cleared bug where baseline values remain visible after applying the values
+
+
+
+Cleared the rollover logic to eliminate double-counting.
+
+
+
+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.html

@@ -18,6 +18,13 @@
         icon: "sun.png",
         label: function() {
             return this.name || "energyMeterPlus";
+        },
+        oneditsave: function() {
+            // Cosmetic blanking: clear baseline fields in the editor UI after deploy
+            $("#node-input-baselineDaily").val("");
+            $("#node-input-baselineWeekly").val("");
+            $("#node-input-baselineMonthly").val("");
+            $("#node-input-baselineYearly").val("");
         }
     });
 </script>

package/energyMeterPlus.js

@@ -11,12 +11,6 @@ module.exports = function(RED) {
         let inputUnit = config.inputUnit || "W";
         let currencyCode = config.currency || "USD";
 
-        // Baseline corrections
-        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,21 +19,23 @@ module.exports = function(RED) {
             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 stored numeric baselines (persisted separately)
+        let storedBaselines = node.context().get("storedBaselines") || {
+            daily: Number(config.baselineDaily) || 0,
+            weekly: Number(config.baselineWeekly) || 0,
+            monthly: Number(config.baselineMonthly) || 0,
+            yearly: Number(config.baselineYearly) || 0
+        };
+
+        // 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("baseline", baseline);
+            node.context().set("storedBaselines", storedBaselines);
         }
 
         // Load last timestamp or initialize
@@ -55,6 +51,12 @@ module.exports = function(RED) {
             }
         }
 
+        // Safe rounding helper
+        function round2(val) {
+            if (val === null || val === undefined || isNaN(val)) return 0;
+            return Number(val.toFixed(2));
+        }
+
         // Archive yearly totals
         function archiveYearly(total, year) {
             try {
@@ -74,36 +76,22 @@ module.exports = function(RED) {
             }
         }
 
-        // 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
+        // Rollover logic
         function checkRollover() {
             let now = new Date();
 
-            // Daily rollover (midnight)
             if (now.getDate() !== lastCheck.getDate()) {
-                // Reset daily back to baseline offset instead of 0
-                baseline.daily = baselineDaily;
+                baseline.daily = storedBaselines.daily;
             }
-
-            // Weekly rollover (Sunday → Monday)
             if (now.getDay() === 1 && lastCheck.getDay() !== 1) {
-                baseline.weekly = baselineWeekly; // reset to baseline offset
+                baseline.weekly = storedBaselines.weekly;
             }
-
-            // Monthly rollover (1st of month)
             if (now.getMonth() !== lastCheck.getMonth()) {
-                baseline.monthly = baselineMonthly; // reset to baseline offset
+                baseline.monthly = storedBaselines.monthly;
             }
-
-            // Yearly rollover (Jan 1)
             if (now.getFullYear() !== lastCheck.getFullYear()) {
                 archiveYearly(baseline.yearly, lastCheck.getFullYear());
-                baseline.yearly = baselineYearly; // reset to baseline offset
+                baseline.yearly = storedBaselines.yearly;
             }
 
             lastCheck = now;
@@ -114,24 +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;
-
-            let energyIncrement = power_kW * durationHours;
+            // Calculate duration BEFORE updating lastCheck
+            let durationHours = (now - lastCheck) / (1000 * 3600);
 
-            // Add increment to daily
-            baseline.daily += energyIncrement;
+            let power = Number(msg.payload);
+            if (!isNaN(power)) {
+                let power_kW = (inputUnit === "W") ? power / 1000 : power;
+                let energyIncrement = power_kW * durationHours;
 
-            // Continuous absorption
-            baseline.weekly  += energyIncrement;
-            baseline.monthly += energyIncrement;
-            baseline.yearly  += energyIncrement;
+                // Apply increment
+                baseline.daily   += energyIncrement;
+                baseline.weekly  += energyIncrement;
+                baseline.monthly += energyIncrement;
+                baseline.yearly  += energyIncrement;
+            }
 
-            function round2(val) { return Number(val.toFixed(2)); }
+            // Update lastCheck AFTER increment
+            lastCheck = now;
+            node.context().set("lastCheck", lastCheck);
 
             msg.payload = {
                 daily_kWh: round2(baseline.daily),
@@ -151,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.2",
+  "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",