node-red-contrib-energymeterplus 0.0.8 → 0.0.9

package/energyMeterPlus.js

@@ -5,10 +5,9 @@ module.exports = function(RED) {
         RED.nodes.createNode(this, config);
         var node = this;
 
-        // Config values
         let unitCost = Number(config.unitCost) || 0;
         let filePath = config.filePath || "/addon_configs/a0d7b954_nodered/node_red/solarGen_data.json";
-        let inputUnit = config.inputUnit || "W";
+        let inputUnit = config.inputUnit || "W"; // default to Watts since your stream is in W
 
         // Numeric baseline corrections
         let baselineDaily   = Number(config.baselineDaily)   || 0;
@@ -16,7 +15,7 @@ module.exports = function(RED) {
         let baselineMonthly = Number(config.baselineMonthly) || 0;
         let baselineYearly  = Number(config.baselineYearly)  || 0;
 
-        // Baseline counters start at corrections
+        // Baseline counters
         let baseline = { daily: baselineDaily, weekly: baselineWeekly, monthly: baselineMonthly, yearly: baselineYearly };
         let lastCheck = new Date();
 
@@ -37,14 +36,21 @@ module.exports = function(RED) {
         setInterval(checkRollover, 60000);
 
         node.on('input', function(msg) {
-            let factor = (inputUnit === "W") ? 0.001 : 1;
-            let power = Number(msg.payload) * factor || 0;
+            let now = new Date();
+            let durationHours = (now - lastCheck) / (1000 * 3600); // elapsed time in hours
+            lastCheck = now;
+
+            let power = Number(msg.payload) || 0;
+            let power_kW = (inputUnit === "W") ? power / 1000 : power;
+
+            // Energy increment = Power × Time
+            let energyIncrement = power_kW * durationHours;
 
             // Add to counters
-            baseline.daily   += power;
-            baseline.weekly  += power;
-            baseline.monthly += power;
-            baseline.yearly  += power;
+            baseline.daily   += energyIncrement;
+            baseline.weekly  += energyIncrement;
+            baseline.monthly += energyIncrement;
+            baseline.yearly  += energyIncrement;
 
             // Calculate costs
             let daily_cost   = baseline.daily   * unitCost;
@@ -73,6 +79,6 @@ module.exports = function(RED) {
     }
 
     RED.nodes.registerType("energyMeterPlus", EnergyMeterPlus, {
-        color: "#d9910cfe" // Dutch Orange
+        color: "#228B22" // Forest Green
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-energymeterplus",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "A node-red energy meter node with editable baseline data, milestone summary, and cost calculation",
   "author": "Arcfrankye",
   "license": "MIT",