smithtek-mako-rf 1.8.0 → 2.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smithtek-mako-rf",
-  "version": "1.8.0",
+  "version": "2.5.0",
   "description": "Smithtek dedicated node for communicating with the Mako PLC over RS485 or RF",
   "keywords": [
     "node-red",

package/smithtek-mako-rf.html

@@ -274,7 +274,9 @@
 
       timeout_s: { value: 8, required: true, validate: RED.validators.number() },
       retries: { value: 2, required: true, validate: RED.validators.number() },
-      gap_s: { value: 0, required: true, validate: RED.validators.number() }
+      gap_s: { value: 0, required: true, validate: RED.validators.number() },
+      maxQueue: { value: 50, required: true, validate: RED.validators.number() }
+
     },
     label: function () {
       return this.busName || "smithtek mako rf";
@@ -413,6 +415,15 @@
   <div class="form-tips">
     Select a channel. RF is for the LoRa long range radio RTU coms.
   </div>
+  <div class="form-row">
+    <label for="node-config-input-maxQueue"><i class="fa fa-list"></i> Max queue</label>
+    <input type="number" id="node-config-input-maxQueue" min="1" style="width:140px;">
+  </div>
+  <div class="form-tips">
+    The max queue will limmit how many polls can be queued from the connected devices. It will drop the oldest from the queue.
+  </div>
+
+
 </script>
 
 <!-- =========================

package/smithtek-mako-rf.js

@@ -253,6 +253,7 @@ module.exports = function (RED) {
         queue: [],
         busy: false,
         lastPortKey: "",
+        maxQueue: 50
       };
       BUS.set(key, s);
     }
@@ -492,6 +493,7 @@ module.exports = function (RED) {
     this.timeout_s = toNum(n.timeout_s, 8);
     this.retries = toNum(n.retries, 2);
     this.gap_s = toNum(n.gap_s, 0);
+    this.maxQueue = toNum(n.maxQueue, 50);
 
     ensureBusState(this);
 
@@ -573,8 +575,18 @@ module.exports = function (RED) {
         if (config.includeWriteQuantity) req.quantity = quantity;
       }
 
+      const maxQ = clampInt(busCfg.maxQueue, 1, 1000, 50);
+
+      // If queue is full, drop NEW requests (keeps fairness for the ones already queued)
+      if (state.queue.length >= maxQ) {
+        try { done(); } catch (_e) {}
+        return;
+      }
+
       state.queue.push({ node, msg, send, done, req, items });
       scheduleProcess(state, busCfg.id);
+
+
     });
 
     node.on("close", function (_removed, done) {