node-red-contrib-energymeterplus 0.3.0 → 0.3.2

package/energyMeterPlus.js

@@ -2,24 +2,6 @@ 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) {
-        const nodeInstance = RED.nodes.getNode(baselineMsg.nodeId);
-        if (nodeInstance) {
-            let baseline = nodeInstance.context().get("baseline") || {
-                daily:0, weekly:0, monthly:0, yearly:0
-            };
-            // Additive offsets
-            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;
@@ -30,21 +12,23 @@ module.exports = function(RED) {
         let currencyCode = config.currency || "USD";
 
         // Baseline offsets
-        let baseline = node.context().get("baseline") || { daily:0, weekly:0, monthly:0, yearly:0 };
+        let baseline = node.context().get("baseline") || {
+            daily: Number(config.baselineDaily) || 0,
+            weekly: Number(config.baselineWeekly) || 0,
+            monthly: Number(config.baselineMonthly) || 0,
+            yearly: Number(config.baselineYearly) || 0
+        };
 
         // Live increments
-        let accumulated = node.context().get("accumulated") || { daily:0, weekly:0, monthly:0, yearly:0 };
-
-        // Apply initial baselines from config
-        baseline.daily   += Number(config.baselineDaily) || 0;
-        baseline.weekly  += Number(config.baselineWeekly) || 0;
-        baseline.monthly += Number(config.baselineMonthly) || 0;
-        baseline.yearly  += Number(config.baselineYearly) || 0;
-
-        node.context().set("baseline", baseline);
-        node.context().set("accumulated", accumulated);
-
-        let lastCheck = node.context().get("lastCheck") || new Date();
+        let accumulated = node.context().get("accumulated") || {
+            daily:0, weekly:0, monthly:0, yearly:0
+        };
+
+        // Rehydrate lastCheck from context
+        let lastCheck = node.context().get("lastCheck");
+        if (!(lastCheck instanceof Date)) {
+            lastCheck = new Date(lastCheck || Date.now());
+        }
 
         function currencySymbol(code) {
             switch (code) {
@@ -66,46 +50,40 @@ module.exports = function(RED) {
                 if (fs.existsSync(archivePath)) {
                     archive = JSON.parse(fs.readFileSync(archivePath));
                 }
-                archive.push({ year, total: total, timestamp: new Date().toISOString() });
+                archive.push({ year, 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 resets counters
+        // Rollover logic
         function checkRollover() {
             let now = new Date();
 
-            // Daily reset at midnight
-            if (now.getDate() !== lastCheck.getDate()) {
-                accumulated.daily = 0;
-                baseline.daily = 0;
+            // Ensure lastCheck is a Date
+            if (!(lastCheck instanceof Date)) {
+                lastCheck = new Date(lastCheck || Date.now());
             }
 
-            // Weekly reset (Sunday midnight → Monday start)
+            if (now.getDate() !== lastCheck.getDate()) {
+                accumulated.daily = 0; baseline.daily = 0;
+            }
             if (now.getDay() === 1 && lastCheck.getDay() !== 1) {
-                accumulated.weekly = 0;
-                baseline.weekly = 0;
+                accumulated.weekly = 0; baseline.weekly = 0;
             }
-
-            // Monthly reset
             if (now.getMonth() !== lastCheck.getMonth()) {
-                accumulated.monthly = 0;
-                baseline.monthly = 0;
+                accumulated.monthly = 0; baseline.monthly = 0;
             }
-
-            // Yearly reset
             if (now.getFullYear() !== lastCheck.getFullYear()) {
                 archiveYearly(baseline.yearly + accumulated.yearly, lastCheck.getFullYear());
-                accumulated.yearly = 0;
-                baseline.yearly = 0;
+                accumulated.yearly = 0; baseline.yearly = 0;
             }
 
             lastCheck = now;
+            node.context().set("lastCheck", lastCheck);
             node.context().set("accumulated", accumulated);
             node.context().set("baseline", baseline);
-            node.context().set("lastCheck", lastCheck);
         }
         setInterval(checkRollover, 60000);
 
@@ -114,6 +92,16 @@ module.exports = function(RED) {
             let now = new Date();
             let durationHours = (now - lastCheck) / (1000 * 3600);
 
+            // Handle baseline updates
+            if (msg.topic === "applyBaseline" && msg.payload) {
+                baseline.daily   += Number(msg.payload.daily)   || 0;
+                baseline.weekly  += Number(msg.payload.weekly)  || 0;
+                baseline.monthly += Number(msg.payload.monthly) || 0;
+                baseline.yearly  += Number(msg.payload.yearly)  || 0;
+                node.context().set("baseline", baseline);
+            }
+
+            // Handle power input
             let power = Number(msg.payload);
             if (!isNaN(power) && durationHours > 0) {
                 let power_kW = (inputUnit === "W") ? power / 1000 : power;
@@ -129,7 +117,6 @@ module.exports = function(RED) {
             node.context().set("lastCheck", lastCheck);
             node.context().set("accumulated", accumulated);
 
-            // Output = baseline + accumulated
             msg.payload = {
                 energyDaily:   round2(baseline.daily   + accumulated.daily),
                 energyWeekly:  round2(baseline.weekly  + accumulated.weekly),

package/package.json

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