node-red-contrib-energymeterplus 0.0.6 → 0.0.7

package/energyMeterPlus.html

@@ -1,20 +1,20 @@
 <script type="text/javascript">
     RED.nodes.registerType('energyMeterPlus', {
         category: 'energy',
-        color: '#228B22',
+        color: '#d9910cdb', <!-- Orange -->
         defaults: {
             name: {value:""},
             baselineDaily: {value:0},
             baselineWeekly: {value:0},
             baselineMonthly: {value:0},
             baselineYearly: {value:0},
-            costPerUnit: {value:0.15},
-            filepath: {value:"/config/energymeterplus.json"},
+            unitCost: {value:0.15},
+            filePath: {value:"/addon_configs/a0d7b954_nodered/node_red/solarGen_data.json"},
             inputUnit: {value:"kW"}
         },
         inputs:1,
         outputs:1,
-        icon: "smartmeter.png",
+        icon: "sun.png",
         label: function() {
             return this.name || "energyMeterPlus";
         }
@@ -22,6 +22,10 @@
 </script>
 
 <script type="text/x-red" data-template-name="energyMeterPlus">
+    <div class="form-row">
+        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-input-name">
+    </div>
     <div class="form-row">
         <label for="node-input-baselineDaily">Baseline Daily (kWh)</label>
         <input type="number" id="node-input-baselineDaily">
@@ -39,12 +43,12 @@
         <input type="number" id="node-input-baselineYearly">
     </div>
     <div class="form-row">
-        <label for="node-input-costPerUnit">Cost per Unit</label>
-        <input type="number" id="node-input-costPerUnit" step="0.01">
+        <label for="node-input-unitCost">Cost per Unit</label>
+        <input type="number" id="node-input-unitCost" step="0.01">
     </div>
     <div class="form-row">
-        <label for="node-input-filepath">Filepath</label>
-        <input type="text" id="node-input-filepath">
+        <label for="node-input-filePath">Filepath</label>
+        <input type="text" id="node-input-filePath">
     </div>
     <div class="form-row">
         <label for="node-input-inputUnit">Input Unit</label>

package/energyMeterPlus.js

@@ -5,7 +5,6 @@ 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 || "kW";
@@ -24,24 +23,10 @@ module.exports = function(RED) {
         function checkRollover() {
             let now = new Date();
 
-            // Daily rollover
-            if (now.getDate() !== lastCheck.getDate()) {
-                baseline.daily = baselineDaily;
-            }
-
-            // Weekly rollover (Sunday = 0)
-            if (now.getDay() === 0 && lastCheck.getDay() !== 0) {
-                baseline.weekly = baselineWeekly;
-            }
-
-            // Monthly rollover
-            if (now.getMonth() !== lastCheck.getMonth()) {
-                baseline.monthly = baselineMonthly;
-            }
-
-            // Yearly rollover
+            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()) {
-                // Archive previous year
                 let archiveName = filePath.replace(".json", `_${lastCheck.getFullYear()}.json`);
                 try {
                     fs.writeFileSync(archiveName, JSON.stringify(baseline, null, 2));
@@ -54,18 +39,24 @@ module.exports = function(RED) {
             lastCheck = now;
         }
 
-        // Run rollover check every minute
         setInterval(checkRollover, 60000);
 
         node.on('input', function(msg) {
             let factor = (inputUnit === "W") ? 0.001 : 1;
-            let power = Number(msg.payload) * factor || 0;
 
-            // Add to counters
-            baseline.daily   += power;
-            baseline.weekly  += power;
-            baseline.monthly += power;
-            baseline.yearly  += power;
+            // 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;
+            }
 
             // Calculate costs
             let daily_cost   = baseline.daily   * unitCost;
@@ -97,6 +88,6 @@ module.exports = function(RED) {
     }
 
     RED.nodes.registerType("energyMeterPlus", EnergyMeterPlus, {
-        color: "#228B22" // Forest Green node color
+        color: "#d9910cdb" // Orange node color
     });
 }

package/package.json

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