node-red-contrib-energymeterplus 0.0.7 → 0.0.9

package/energyMeterPlus.html

@@ -1,7 +1,7 @@
 <script type="text/javascript">
     RED.nodes.registerType('energyMeterPlus', {
         category: 'energy',
-        color: '#d9910cdb', <!-- Orange -->
+        color: '#d9910cfe', <!-- Dutch Orange -->
         defaults: {
             name: {value:""},
             baselineDaily: {value:0},

package/energyMeterPlus.js

@@ -7,7 +7,7 @@ module.exports = function(RED) {
 
         let unitCost = Number(config.unitCost) || 0;
         let filePath = config.filePath || "/addon_configs/a0d7b954_nodered/node_red/solarGen_data.json";
-        let inputUnit = config.inputUnit || "kW";
+        let inputUnit = config.inputUnit || "W"; // default to Watts since your stream is in W
 
         // Numeric baseline corrections
         let baselineDaily   = Number(config.baselineDaily)   || 0;
@@ -19,44 +19,38 @@ module.exports = function(RED) {
         let baseline = { daily: baselineDaily, weekly: baselineWeekly, monthly: baselineMonthly, yearly: baselineYearly };
         let lastCheck = new Date();
 
-        // Function to handle rollover
+        // Rollover logic
         function checkRollover() {
             let now = new Date();
-
             if (now.getDate() !== lastCheck.getDate()) baseline.daily = baselineDaily;
             if (now.getDay() === 0 && lastCheck.getDay() !== 0) baseline.weekly = baselineWeekly;
             if (now.getMonth() !== lastCheck.getMonth()) baseline.monthly = baselineMonthly;
             if (now.getFullYear() !== lastCheck.getFullYear()) {
                 let archiveName = filePath.replace(".json", `_${lastCheck.getFullYear()}.json`);
-                try {
-                    fs.writeFileSync(archiveName, JSON.stringify(baseline, null, 2));
-                } catch (err) {
-                    node.error("Failed to archive yearly file: " + err);
-                }
+                try { fs.writeFileSync(archiveName, JSON.stringify(baseline, null, 2)); }
+                catch (err) { node.error("Failed to archive yearly file: " + err); }
                 baseline.yearly = baselineYearly;
             }
-
             lastCheck = now;
         }
-
         setInterval(checkRollover, 60000);
 
         node.on('input', function(msg) {
-            let factor = (inputUnit === "W") ? 0.001 : 1;
+            let now = new Date();
+            let durationHours = (now - lastCheck) / (1000 * 3600); // elapsed time in hours
+            lastCheck = now;
 
-            // Accept either raw number or JSON object
-            if (typeof msg.payload === "number") {
-                let power = msg.payload * factor;
-                baseline.daily   += power;
-                baseline.weekly  += power;
-                baseline.monthly += power;
-                baseline.yearly  += power;
-            } else if (typeof msg.payload === "object") {
-                baseline.daily   = (msg.payload.daily_kWh   || baseline.daily)   * factor;
-                baseline.weekly  = (msg.payload.weekly_kWh  || baseline.weekly)  * factor;
-                baseline.monthly = (msg.payload.monthly_kWh || baseline.monthly) * factor;
-                baseline.yearly  = (msg.payload.yearly_kWh  || baseline.yearly)  * factor;
-            }
+            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   += energyIncrement;
+            baseline.weekly  += energyIncrement;
+            baseline.monthly += energyIncrement;
+            baseline.yearly  += energyIncrement;
 
             // Calculate costs
             let daily_cost   = baseline.daily   * unitCost;
@@ -77,17 +71,14 @@ module.exports = function(RED) {
             };
 
             // Save snapshot
-            try {
-                fs.writeFileSync(filePath, JSON.stringify(msg.payload, null, 2));
-            } catch (err) {
-                node.error("Failed to write to file: " + err);
-            }
+            try { fs.writeFileSync(filePath, JSON.stringify(msg.payload, null, 2)); }
+            catch (err) { node.error("Failed to write to file: " + err); }
 
             node.send(msg);
         });
     }
 
     RED.nodes.registerType("energyMeterPlus", EnergyMeterPlus, {
-        color: "#d9910cdb" // Orange node color
+        color: "#228B22" // Forest Green
     });
 }

package/package.json

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