node-red-contrib-energymeterplus 0.2.6 → 0.2.8

package/energyMeterPlus.html

@@ -4,14 +4,14 @@
         color: '#f3a108fe', <!-- Dutch Orange -->
         defaults: {
             name: {value:""},
-            baselineDaily: {value:0},
-            baselineWeekly: {value:0},
-            baselineMonthly: {value:0},
-            baselineYearly: {value:0},
-            unitCost: {value:0.15},
-            currency: {value:"USD"},   // NEW field
-            filePath: {value:"/config/node_red/solargen_data.json"},
-            inputUnit: {value:"kW"}
+            baselineDaily: {value:0, required:false},
+            baselineWeekly: {value:0, required:false},
+            baselineMonthly: {value:0, required:false},
+            baselineYearly: {value:0, required:false},
+            unitCost: {value:0.15, required:true},
+            currency: {value:"USD", required:true},   // NEW field
+            filePath: {value:"/config/node_red/solargen_data.json", required:false},
+            inputUnit: {value:"kW", required:true}
         },
         inputs:1,
         outputs:1,
@@ -19,12 +19,23 @@
         label: function() {
             return this.name || "energyMeterPlus";
         },
+        oneditprepare: function() {
+        // Nothing special here yet
+        },
         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("");
+            // When user clicks Done, send a one-time baseline message
+            var baselineMsg = {
+                topic: "applyBaseline",
+                nodeId: this.id, // include the nodeId!
+                payload: {
+                    daily: Number($("#node-input-baselineDaily").val()) || 0,
+                    weekly: Number($("#node-input-baselineWeekly").val()) || 0,
+                    monthly: Number($("#node-input-baselineMonthly").val()) || 0,
+                    yearly: Number($("#node-input-baselineYearly").val()) || 0
+                }
+            };
+            // Push message into runtime instantly
+            RED.comms.send("energyMeterPlus/applyBaseline", baselineMsg);
         }
     });
 </script>

package/energyMeterPlus.js

@@ -2,6 +2,25 @@ const fs = require("fs");
 const path = require("path");
 
 module.exports = function(RED) {
+
+    // Listener for baseline messages from the editor
+    RED.comms.subscribe("energyMeterPlus/applyBaseline", function(baselineMsg) {
+        // baselineMsg should include nodeId so we know which instance to update
+        const nodeInstance = RED.nodes.getNode(baselineMsg.nodeId);
+        if (nodeInstance) {
+            let baseline = nodeInstance.context().get("baseline") || {
+                daily:0, weekly:0, monthly:0, yearly:0
+            };
+
+            baseline.daily   = baselineMsg.payload.daily;
+            baseline.weekly  = baselineMsg.payload.weekly;
+            baseline.monthly = baselineMsg.payload.monthly;
+            baseline.yearly  = baselineMsg.payload.yearly;
+
+            nodeInstance.context().set("baseline", baseline);
+        }
+    });
+
     function EnergyMeterPlus(config) {
         RED.nodes.createNode(this, config);
         var node = this;
@@ -11,7 +30,7 @@ module.exports = function(RED) {
         let inputUnit = config.inputUnit || "W";
         let currencyCode = config.currency || "USD";
 
-        // Counters always start from context or zero
+        // Counters start from context or zero
         let baseline = node.context().get("baseline") || {
             daily: 0,
             weekly: 0,
@@ -20,21 +39,22 @@ module.exports = function(RED) {
         };
 
         // Capture baselines once on deploy
-        let storedBaselines = node.context().get("storedBaselines") || {
+        let storedBaselines = {
             daily: Number(config.baselineDaily) || 0,
             weekly: Number(config.baselineWeekly) || 0,
             monthly: Number(config.baselineMonthly) || 0,
             yearly: Number(config.baselineYearly) || 0
         };
 
-        // 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;
+        // Apply baselines once
+        baseline.daily   += storedBaselines.daily;
+        baseline.weekly  += storedBaselines.weekly;
+        baseline.monthly += storedBaselines.monthly;
+        baseline.yearly  += storedBaselines.yearly;
 
+        // Discard baselines from UI after applying
         node.context().set("baseline", baseline);
-        node.context().set("storedBaselines", storedBaselines);
+        node.context().set("storedBaselines", { daily:0, weekly:0, monthly:0, yearly:0 });
 
         // Last timestamp
         let lastCheck = node.context().get("lastCheck") || new Date();
@@ -70,14 +90,26 @@ 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 = stored.daily;
-            if (now.getDay() === 1 && lastCheck.getDay() !== 1) baseline.weekly = stored.weekly;
-            if (now.getMonth() !== lastCheck.getMonth()) baseline.monthly = stored.monthly;
+            // Daily rollover
+            if (now.getDate() !== lastCheck.getDate()) {
+                baseline.daily = 0;
+            }
+
+            // Weekly rollover (Sunday midnight → Monday start)
+            if (now.getDay() === 1 && lastCheck.getDay() !== 1) {
+                baseline.weekly = 0;
+            }
+
+            // Monthly rollover
+            if (now.getMonth() !== lastCheck.getMonth()) {
+                baseline.monthly = 0;
+            }
+
+            // Yearly rollover
             if (now.getFullYear() !== lastCheck.getFullYear()) {
                 archiveYearly(baseline.yearly, lastCheck.getFullYear());
-                baseline.yearly = stored.yearly;
+                baseline.yearly = 0;
             }
 
             lastCheck = now;
@@ -96,6 +128,7 @@ module.exports = function(RED) {
                 let power_kW = (inputUnit === "W") ? power / 1000 : power;
                 let energyIncrement = power_kW * durationHours;
 
+                // Apply increment separately to each counter
                 baseline.daily   += energyIncrement;
                 baseline.weekly  += energyIncrement;
                 baseline.monthly += energyIncrement;

package/package.json

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