node-red-contrib-energymeterplus 0.2.4 → 0.2.6

package/README.md

@@ -1,4 +1,4 @@
-#### **EnergyMeterPlus Node Version 0.2.4**
+#### **EnergyMeterPlus Node Version 0.2.5**
 
 
 
@@ -206,3 +206,11 @@ Added payload validation
 
 Fixed Baselines bug: Baselines captured once, stored in context, and survive after UI clears
 
+
+
+v2.5
+
+
+
+Fixed internal counter bug
+

package/energyMeterPlus.js

@@ -11,7 +11,7 @@ module.exports = function(RED) {
         let inputUnit = config.inputUnit || "W";
         let currencyCode = config.currency || "USD";
 
-        // Load persisted baseline or initialize
+        // Counters always start from context or zero
         let baseline = node.context().get("baseline") || {
             daily: 0,
             weekly: 0,
@@ -19,7 +19,7 @@ module.exports = function(RED) {
             yearly: 0
         };
 
-        // Load stored numeric baselines (persisted separately)
+        // Capture baselines once on deploy
         let storedBaselines = node.context().get("storedBaselines") || {
             daily: Number(config.baselineDaily) || 0,
             weekly: Number(config.baselineWeekly) || 0,
@@ -27,21 +27,19 @@ module.exports = function(RED) {
             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;
+        // Apply each baseline only to its own counter
+        if (storedBaselines.daily)   baseline.daily   += storedBaselines.daily;
+        if (storedBaselines.weekly)  baseline.weekly  += storedBaselines.weekly;
+        if (storedBaselines.monthly) baseline.monthly += storedBaselines.monthly;
+        if (storedBaselines.yearly)  baseline.yearly  += storedBaselines.yearly;
 
-            node.context().set("baseline", baseline);
-            node.context().set("storedBaselines", storedBaselines);
-        }
+        node.context().set("baseline", baseline);
+        node.context().set("storedBaselines", storedBaselines);
 
-        // Load last timestamp or initialize
+        // Last timestamp
         let lastCheck = node.context().get("lastCheck") || new Date();
 
-        // Currency symbol helper
+        // Helpers
         function currencySymbol(code) {
             switch (code) {
                 case "USD": return "$";
@@ -50,14 +48,11 @@ module.exports = function(RED) {
                 default: return code;
             }
         }
-
-        // 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");
@@ -65,11 +60,7 @@ module.exports = function(RED) {
                 if (fs.existsSync(archivePath)) {
                     archive = JSON.parse(fs.readFileSync(archivePath));
                 }
-                archive.push({
-                    year: year,
-                    total_kWh: total,
-                    timestamp: new Date().toISOString()
-                });
+                archive.push({ 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);
@@ -79,19 +70,14 @@ module.exports = function(RED) {
         // Rollover logic
         function checkRollover() {
             let now = new Date();
+            let stored = node.context().get("storedBaselines") || { daily:0, weekly:0, monthly:0, yearly:0 };
 
-            if (now.getDate() !== lastCheck.getDate()) {
-                baseline.daily = storedBaselines.daily;
-            }
-            if (now.getDay() === 1 && lastCheck.getDay() !== 1) {
-                baseline.weekly = storedBaselines.weekly;
-            }
-            if (now.getMonth() !== lastCheck.getMonth()) {
-                baseline.monthly = storedBaselines.monthly;
-            }
+            if (now.getDate() !== lastCheck.getDate()) baseline.daily = stored.daily;
+            if (now.getDay() === 1 && lastCheck.getDay() !== 1) baseline.weekly = stored.weekly;
+            if (now.getMonth() !== lastCheck.getMonth()) baseline.monthly = stored.monthly;
             if (now.getFullYear() !== lastCheck.getFullYear()) {
                 archiveYearly(baseline.yearly, lastCheck.getFullYear());
-                baseline.yearly = storedBaselines.yearly;
+                baseline.yearly = stored.yearly;
             }
 
             lastCheck = now;
@@ -100,27 +86,25 @@ module.exports = function(RED) {
         }
         setInterval(checkRollover, 60000);
 
+        // Input handler
         node.on('input', function(msg) {
             let now = new Date();
-
-            // Calculate duration BEFORE updating lastCheck
             let durationHours = (now - lastCheck) / (1000 * 3600);
 
             let power = Number(msg.payload);
-            if (!isNaN(power)) {
+            if (!isNaN(power) && durationHours > 0) {
                 let power_kW = (inputUnit === "W") ? power / 1000 : power;
                 let energyIncrement = power_kW * durationHours;
 
-                // Apply increment
                 baseline.daily   += energyIncrement;
                 baseline.weekly  += energyIncrement;
                 baseline.monthly += energyIncrement;
                 baseline.yearly  += energyIncrement;
             }
 
-            // Update lastCheck AFTER increment
             lastCheck = now;
             node.context().set("lastCheck", lastCheck);
+            node.context().set("baseline", baseline);
 
             msg.payload = {
                 daily_kWh: round2(baseline.daily),
@@ -134,17 +118,10 @@ module.exports = function(RED) {
                 currency: currencySymbol(currencyCode)
             };
 
-            // Ensure directory exists
             const dir = path.dirname(filePath);
-            if (!fs.existsSync(dir)) {
-                fs.mkdirSync(dir, { recursive: true });
-            }
-
-            try {
-                fs.writeFileSync(filePath, JSON.stringify(msg.payload, null, 2));
-            } catch (err) {
-                node.error("Failed to write to file: " + err);
-            }
+            if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+            try { fs.writeFileSync(filePath, JSON.stringify(msg.payload, null, 2)); }
+            catch (err) { node.error("Failed to write to file: " + err); }
 
             node.send(msg);
         });

package/package.json

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