node-red-contrib-freya-nodes 0.2.2 → 0.2.3

package/nodes/precipitation-controller/precipitation-controller-node.html

@@ -23,8 +23,7 @@
       name: {value:""},
       interval: {value: 60, required: true, validate: RED.validators.number()},
       duration: {value: 30, required: true, validate: RED.validators.number()},
-      tickInterval: {value: 60, required: true, validate: function(v) { return RED.validators.number()(v) && parseInt(v) >= 1; }},
-      nightDisable: {value: false}
+      tickInterval: {value: 60, required: true, validate: function(v) { return RED.validators.number()(v) && parseInt(v) >= 1; }}
     },
     inputs:1,
     outputs:2,
@@ -56,11 +55,6 @@
     <label for="node-input-tickInterval"><i class="fa fa-clock-o"></i> Tick Interval (seconds)</label>
     <input type="number" id="node-input-tickInterval" placeholder="60" step="1" min="1">
   </div>
-  <hr/>
-  <div class="form-row">
-    <input type="checkbox" id="node-input-nightDisable" style="display:inline-block; width:auto; vertical-align:top;">
-    <label for="node-input-nightDisable" style="width:auto;"><i class="fa fa-moon-o"></i> Disable precipitation at night</label>
-  </div>
 </script>
 
 <script type="text/html" data-help-name="precipitation controller">
@@ -70,14 +64,19 @@
   <h3>Input</h3>
   <dl class="message-properties">
     <dt>msg.topic = "interval" <span class="property-type">number</span></dt>
-    <dd><code>msg.payload</code> sets the precipitation interval in milliseconds, overriding the configured default</dd>
+    <dd><code>msg.payload</code> sets the precipitation interval in minutes, overriding the configured default</dd>
 
     <dt>msg.topic = "duration" <span class="property-type">number</span></dt>
-    <dd><code>msg.payload</code> sets the pump duration in milliseconds, overriding the configured default</dd>
+    <dd><code>msg.payload</code> sets the pump duration in seconds, overriding the configured default</dd>
+
+    <dt>msg.topic = "nightDisable" <span class="property-type">boolean</span></dt>
+    <dd><code>msg.payload</code> enables (<code>true</code>) or disables (<code>false</code>) the
+    nighttime pause feature at runtime. Defaults to <code>false</code> on deploy.
+    Switching from <code>true</code> to <code>false</code> while paused resumes normal operation immediately.</dd>
 
     <dt>msg.topic = "night" <span class="property-type">boolean</span></dt>
     <dd><code>msg.payload</code> signals nighttime (<code>true</code>) or daytime (<code>false</code>).
-    Only effective when the nighttime disable toggle is enabled in the editor.
+    Only effective when nighttime disable has been enabled via the <code>nightDisable</code> topic.
     During nighttime no new precipitation events are started. If the pump is already active
     when night begins, the current cycle finishes normally.</dd>
   </dl>
@@ -110,11 +109,12 @@
   to prevent it from getting stuck on.</p>
 
   <h3>Nighttime Disable</h3>
-  <p>When the nighttime disable toggle is enabled, the node tracks a night/day state
-  updated via <code>msg.topic = "night"</code>. During nighttime no new precipitation events
-  are started. If the pump is already active when night begins, the current cycle is
-  allowed to finish normally. When the toggle is off, night messages are ignored and
-  precipitation runs 24/7.</p>
+  <p>The nighttime disable feature is controlled at runtime via <code>msg.topic = "nightDisable"</code>.
+  On deploy it defaults to off (precipitation runs 24/7). When enabled, the node tracks a
+  night/day state updated via <code>msg.topic = "night"</code>. During nighttime no new
+  precipitation events are started. If the pump is already active when night begins, the
+  current cycle is allowed to finish normally. Switching nighttime disable off while paused
+  causes the node to resume normal tick evaluation immediately.</p>
 
   <h3>Status Messages</h3>
   <p>Status messages are emitted on output 2 only when the state changes:</p>
@@ -130,7 +130,6 @@
     <li><strong>Interval:</strong> Time between precipitation events in minutes (default: 60)</li>
     <li><strong>Duration:</strong> How long the pump runs per event in seconds (default: 30)</li>
     <li><strong>Tick Interval:</strong> How often to evaluate whether precipitation is due in seconds (default: 60)</li>
-    <li><strong>Disable precipitation at night:</strong> When enabled, precipitation is paused during nighttime</li>
   </ul>
 
   <h3>Node Status</h3>

package/nodes/precipitation-controller/precipitation-controller-node.js

@@ -17,12 +17,12 @@ const precipitationController = (RED) => {
         this.interval = parseFloat(config.interval) || 60;
         this.duration = parseFloat(config.duration) || 30;
         this.tickInterval = parseInt(config.tickInterval) || 60;
-        this.nightDisable = config.nightDisable || false;
         const state = {
             lastPrecipitation: null,
             pumpActive: false,
             intervalMs: (node.interval || 60) * 60000,
             durationMs: (node.duration || 30) * 1000,
+            nightDisable: false,
             night: false,
             previousState: null
         };
@@ -44,7 +44,7 @@ const precipitationController = (RED) => {
             if (state.pumpActive) {
                 return;
             }
-            if (node.nightDisable && state.night) {
+            if (state.nightDisable && state.night) {
                 node.status({ fill: 'grey', shape: 'ring', text: 'paused (night)' });
                 emitStatus('paused');
                 return;
@@ -91,19 +91,25 @@ const precipitationController = (RED) => {
         };
         node.on('input', (msg, send, done) => {
             if (msg.topic === 'interval' && typeof msg.payload === 'number' && isFinite(msg.payload)) {
-                state.intervalMs = msg.payload;
-                node.log(`Interval updated: ${msg.payload}ms`);
+                state.intervalMs = msg.payload * 60000;
+                node.log(`Interval updated: ${msg.payload} minutes`);
             }
             else if (msg.topic === 'duration' && typeof msg.payload === 'number' && isFinite(msg.payload)) {
-                state.durationMs = msg.payload;
-                node.log(`Duration updated: ${msg.payload}ms`);
+                state.durationMs = msg.payload * 1000;
+                node.log(`Duration updated: ${msg.payload} seconds`);
             }
-            else if (msg.topic === 'night' && typeof msg.payload === 'boolean') {
-                if (node.nightDisable) {
-                    state.night = msg.payload;
-                    node.log(`Night state updated: ${msg.payload}`);
+            else if (msg.topic === 'nightDisable' && typeof msg.payload === 'boolean') {
+                const wasEnabled = state.nightDisable;
+                state.nightDisable = msg.payload;
+                node.log(`Nighttime disable updated: ${msg.payload}`);
+                if (wasEnabled && !msg.payload && state.night && !state.pumpActive) {
+                    evaluatePrecipitation();
                 }
             }
+            else if (msg.topic === 'night' && typeof msg.payload === 'boolean') {
+                state.night = msg.payload;
+                node.log(`Night state updated: ${msg.payload}`);
+            }
             done === null || done === void 0 ? void 0 : done();
         });
         node.on('close', (done) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-contrib-freya-nodes",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Custom nodes for Freya Vivarium Control System",
   "author": "Sanne 'SpuQ' Santens",
   "license": "GPL-3.0",