node-red-contrib-energymeterplus 0.2.1 → 0.2.3

package/README.md

@@ -1,4 +1,4 @@
-#### **EnergyMeterPlus Node Version 0.2.1**
+#### **EnergyMeterPlus Node Version 0.2.3**
 
 
 
@@ -50,7 +50,7 @@ EnergyMeterPlus is a custom Node‑RED function node designed to convert instant
 
 
 
-###### **Configuration:**
+##### **Configuration:**
 
 
 
@@ -164,3 +164,25 @@ After 24 hours → \~108.6 kWh added to daily total.
 
 Costs scale automatically with your configured unit cost.
 
+
+
+
+
+##### **Updates 2.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
+

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,7 +11,7 @@ module.exports = function(RED) {
         let inputUnit = config.inputUnit || "W";
         let currencyCode = config.currency || "USD";
 
-        // Baseline corrections
+        // Baseline corrections (numeric values from config)
         let baselineDaily   = Number(config.baselineDaily)   || 0;
         let baselineWeekly  = Number(config.baselineWeekly)  || 0;
         let baselineMonthly = Number(config.baselineMonthly) || 0;
@@ -25,6 +25,14 @@ module.exports = function(RED) {
             yearly: 0
         };
 
+        // Store numeric baselines separately so resets don’t pull from blanked config
+        let storedBaselines = node.context().get("storedBaselines") || {
+            daily: baselineDaily,
+            weekly: baselineWeekly,
+            monthly: baselineMonthly,
+            yearly: baselineYearly
+        };
+
         // Apply baselines if new values entered
         let baselineApplied = node.context().get("baselineApplied") || false;
         if (!baselineApplied || baselineDaily || baselineWeekly || baselineMonthly || baselineYearly) {
@@ -33,7 +41,15 @@ module.exports = function(RED) {
             baseline.monthly += baselineMonthly;
             baseline.yearly  += baselineYearly;
 
+            storedBaselines = {
+                daily: baselineDaily,
+                weekly: baselineWeekly,
+                monthly: baselineMonthly,
+                yearly: baselineYearly
+            };
+
             node.context().set("baselineApplied", true);
+            node.context().set("storedBaselines", storedBaselines);
 
             // Cosmetic blanking: clear config fields so they show empty in UI
             config.baselineDaily   = "";
@@ -55,46 +71,54 @@ 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 {
+                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);
+            }
+        }
+
         // Rollover logic
         function checkRollover() {
             let now = new Date();
 
             // Daily rollover (midnight)
             if (now.getDate() !== lastCheck.getDate()) {
-                baseline.weekly += baseline.daily; // absorb yesterday
-                baseline.daily = 0;
+                baseline.daily = storedBaselines.daily;
             }
 
             // Weekly rollover (Sunday → Monday)
             if (now.getDay() === 1 && lastCheck.getDay() !== 1) {
-                baseline.monthly += baseline.weekly; // absorb last week
-                baseline.weekly = 0;
+                baseline.weekly = storedBaselines.weekly;
             }
 
             // Monthly rollover (1st of month)
             if (now.getMonth() !== lastCheck.getMonth()) {
-                baseline.yearly += baseline.monthly; // absorb last month
-                baseline.monthly = 0;
+                baseline.monthly = storedBaselines.monthly;
             }
 
             // 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 = storedBaselines.yearly;
             }
 
             lastCheck = now;
@@ -114,9 +138,13 @@ module.exports = function(RED) {
 
             let energyIncrement = power_kW * durationHours;
 
+            // Add increment to daily
             baseline.daily += energyIncrement;
 
-            function round2(val) { return Number(val.toFixed(2)); }
+            // Continuous absorption
+            baseline.weekly  += energyIncrement;
+            baseline.monthly += energyIncrement;
+            baseline.yearly  += energyIncrement;
 
             msg.payload = {
                 daily_kWh: round2(baseline.daily),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-energymeterplus",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "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 @@
     }
   }
 }
-