node-red-contrib-energymeterplus 0.3.3 → 0.3.4

package/energyMeterPlus.js

@@ -11,13 +11,41 @@ module.exports = function(RED) {
         let inputUnit = config.inputUnit || "W";
         let currencyCode = config.currency || "USD";
 
-        // Baseline initialization + merge editor config
+        // --- Editor-config delta apply (run on every deploy)
+        function toNum(v) { const n = Number(v); return isNaN(n) ? 0 : n; }
+
+        // read stored "last applied editor values" (so we can compute deltas)
+        let lastApplied = node.context().get("lastAppliedEditor") || { daily:0, weekly:0, monthly:0, yearly:0 };
+
+        // current editor values (always read from config)
+        let editor = {
+            daily:   toNum(config.baselineDaily),
+            weekly:  toNum(config.baselineWeekly),
+            monthly: toNum(config.baselineMonthly),
+            yearly:  toNum(config.baselineYearly)
+        };
+
+        // compute delta = editor - lastApplied
+        let delta = {
+            daily:   editor.daily   - (toNum(lastApplied.daily)   || 0),
+            weekly:  editor.weekly  - (toNum(lastApplied.weekly)  || 0),
+            monthly: editor.monthly - (toNum(lastApplied.monthly) || 0),
+            yearly:  editor.yearly  - (toNum(lastApplied.yearly)  || 0)
+        };
+
+        // ensure baseline exists
         let baseline = node.context().get("baseline") || { daily:0, weekly:0, monthly:0, yearly:0 };
-        baseline.daily   += Number(config.baselineDaily)   || 0;
-        baseline.weekly  += Number(config.baselineWeekly)  || 0;
-        baseline.monthly += Number(config.baselineMonthly) || 0;
-        baseline.yearly  += Number(config.baselineYearly)  || 0;
+
+        // apply delta (this adds positive or negative changes)
+        baseline.daily   += delta.daily;
+        baseline.weekly  += delta.weekly;
+        baseline.monthly += delta.monthly;
+        baseline.yearly  += delta.yearly;
+
+        // persist baseline and remember the editor values we just applied
         node.context().set("baseline", baseline);
+        node.context().set("lastAppliedEditor", editor);
+        // -------------------------------------------------------------------------------
 
         // Accumulated values
         let accumulated = node.context().get("accumulated") || { daily:0, weekly:0, monthly:0, yearly:0 };
@@ -29,11 +57,11 @@ module.exports = function(RED) {
         }
 
         // 1. Input handler: baseline updates + power increments
-            node.on('input', function(msg) {
+        node.on('input', function(msg) {
             let now = new Date();
             let durationHours = (now - lastCheck) / (1000 * 3600);
 
-            // Handle baseline updates via message
+            // Handle baseline updates via message (runtime applyBaseline)
             if (msg.topic === "applyBaseline" && msg.payload) {
                 baseline.daily   += Number(msg.payload.daily)   || 0;
                 baseline.weekly  += Number(msg.payload.weekly)  || 0;
@@ -42,7 +70,7 @@ module.exports = function(RED) {
                 node.context().set("baseline", baseline);
             }
 
-        // 2. Handle power input
+            // Handle power input
             let power = Number(msg.payload);
             if (!isNaN(power) && durationHours > 0) {
                 let power_kW = (inputUnit === "W") ? power / 1000 : power;
@@ -58,7 +86,7 @@ module.exports = function(RED) {
             node.context().set("lastCheck", lastCheck);
             node.context().set("accumulated", accumulated);
 
-        // 3. Output payload
+            // 3. Output payload
             msg.payload = {
                 energyDaily:   round2(baseline.daily   + accumulated.daily),
                 energyWeekly:  round2(baseline.weekly  + accumulated.weekly),
@@ -71,7 +99,7 @@ module.exports = function(RED) {
                 currency: currencySymbol(currencyCode)
             };
 
-        // 4. Persist to file
+            // 4. Persist to file
             const dir = path.dirname(filePath);
             if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
             try { fs.writeFileSync(filePath, JSON.stringify(msg.payload, null, 2)); }
@@ -81,7 +109,7 @@ module.exports = function(RED) {
         });
 
         // 5. Rollover logic
-            function checkRollover() {
+        function checkRollover() {
             let now = new Date();
 
             if (!(lastCheck instanceof Date)) {
@@ -106,11 +134,11 @@ module.exports = function(RED) {
             node.context().set("lastCheck", lastCheck);
             node.context().set("accumulated", accumulated);
             node.context().set("baseline", baseline);
-            }
-            setInterval(checkRollover, 60000);
+        }
+        setInterval(checkRollover, 60000);
 
         // 6. Helpers
-            function currencySymbol(code) {
+        function currencySymbol(code) {
             switch (code) {
                 case "USD": return "$";
                 case "EUR": return "€";

package/package.json

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