Merge branch 'dev' of github.com:node-red/node-red into dev

packages/node_modules/@node-red/editor-client/src/sass/jquery.scss

@@ -137,10 +137,10 @@
     padding: 0;
     border: 1px solid $form-input-border-color;
 }
-.ui-spinner input {
+.ui-spinner input[type=text] {
     background: $form-input-background;
     margin: 0 17px 0 0;
-    padding: 6px;
+    padding: 8px;
     border: none;
     border-top-right-radius: 0px;
     border-bottom-right-radius: 0px;

packages/node_modules/@node-red/nodes/core/function/89-delay.html

@@ -78,11 +78,17 @@
               <option value="day" data-i18n="delay.label.units.day.singular"></option>
             </select>
         </div>
-        <div class="form-row" id="rate-override">
+        <div class="form-row" id="rate-override" style="display: flex; align-items: center">
-            <label></label><input style="width:30px; vertical-align:baseline;" type="checkbox" id="node-input-allowrate"><label style="width: 250px;" for="node-input-allowrate" data-i18n="delay.allowrate"></label>
+            <label></label><input style="width:30px; margin:0" type="checkbox" id="node-input-allowrate"><label style="margin:0;width: auto;" for="node-input-allowrate" data-i18n="delay.allowrate"></label>
         </div>
         <div class="form-row" id="rate-details-drop">
-            <label></label><input style="width:30px;; vertical-align:baseline;" type="checkbox" id="node-input-drop"><label style="width: 250px;" for="node-input-drop" data-i18n="delay.dropmsg"></label>
+            <input type="hidden" id="node-input-outputs" value="1">
+            <label></label>
+            <select id="node-input-drop-select" style="width: 70%">
+                <option id="node-input-drop-select-queue" value="queue" data-i18n="delay.queuemsg"></option>
+                <option value="drop" data-i18n="delay.dropmsg"></option>
+                <option value="emit" data-i18n="delay.sendmsg"></option>
+            </select>
         </div>
         <div class="form-row" id="rate-details-per-topic">
             <label></label>
@@ -114,7 +120,8 @@
             randomLast: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
             randomUnits: {value: "seconds"},
             drop: {value:false},
-            allowrate: {value:false}
+            allowrate: {value:false},
+            outputs: { value: 1},
         },
         inputs:1,
         outputs:1,
@@ -234,12 +241,23 @@
                 }
             }).trigger("change");
 
+            if (this.outputs === 2) {
+                $("#node-input-drop-select").val("emit");
+            } else if (this.drop) {
+                $("#node-input-drop-select").val("drop");
+            } else {
+                $("#node-input-drop-select").val("queue");
+            }
+
             $("#node-input-rate-type").on("change", function() {
                 if (this.value === "all") {
-                    $("#node-input-drop").attr('disabled',false).next().css("opacity",1)
                     $("#rate-details-per-topic").hide();
+                    $("#node-input-drop-select-queue").attr('disabled', false);
                 } else if (this.value === "topic") {
-                    $("#node-input-drop").prop('checked',true).attr('disabled',true).next().css("opacity",0.5)
+                    if ($("#node-input-drop-select").val() === "queue") {
+                        $("#node-input-drop-select").val("drop");
+                    }
+                    $("#node-input-drop-select-queue").attr('disabled', true);
                     $("#rate-details-per-topic").show();
                 }
             }).trigger("change");
@@ -248,6 +266,7 @@
             var action = $("#node-input-delay-action").val();
             if (action === "delay") {
                 this.pauseType = $("#node-input-delay-type").val();
+                $("#node-input-outputs").val(1);
             } else if (action === "rate") {
                 action = $("#node-input-rate-type").val();
                 if (action === "all") {
@@ -255,6 +274,9 @@
                 } else {
                     this.pauseType = $("#node-input-rate-topic-type").val();
                 }
+                var dropType = $("#node-input-drop-select").val();
+                this.drop = dropType !== "queue";
+                $("#node-input-outputs").val(dropType === "emit"?2:1);
             }
         }
     });

packages/node_modules/@node-red/nodes/core/function/89-delay.js

@@ -95,6 +95,7 @@ module.exports = function(RED) {
         this.droppedMsgs = 0;
         this.allowrate = n.allowrate|| false;
         this.fixedrate = this.rate;
+        this.outputs = n.outputs;
         var node = this;
 
         function ourTimeout(handler, delay, clearHandler) {
@@ -324,6 +325,8 @@ module.exports = function(RED) {
                         else if ( ( (timeSinceLast[0] * SECONDS_TO_NANOS) + timeSinceLast[1] ) > (node.rate * MILLIS_TO_NANOS) ) {
                             node.lastSent = process.hrtime();
                             send(msg);
+                        } else if (node.outputs === 2) {
+                            send([null,msg])
                         }
                     }
                     done();

packages/node_modules/@node-red/nodes/locales/en-US/messages.json

@@ -290,7 +290,9 @@
         "and": "&",
         "rate": "Rate",
         "msgper": "msg(s) per",
-        "dropmsg": "drop intermediate messages",
+        "queuemsg": "Queue intermediate messages",
+        "dropmsg": "Drop intermediate messages",
+        "sendmsg": "Send intermediate messages on 2nd output",
         "allowrate": "allow msg.rate (in ms) to override rate",
         "label": {
             "delay": "delay",

test/nodes/core/function/89-delay_spec.js

@@ -251,13 +251,28 @@ describe('delay Node', function() {
      * @param nbUnit - the multiple of the unit, aLimit Message for nbUnit Seconds
      * @param runtimeInMillis - when to terminate run and count messages received
      */
-    function dropRateLimitSECONDSTest(aLimit, nbUnit, runtimeInMillis, rateValue, done) {
+    function dropRateLimitSECONDSTest(aLimit, nbUnit, runtimeInMillis, rateValue, sendIntermediate, done) {
-        var flow = [{"id":"delayNode1","type":"delay","name":"delayNode","pauseType":"rate","timeout":5,"nbRateUnits":nbUnit,"timeoutUnits":"seconds","rate":aLimit,"rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":true,"wires":[["helperNode1"]]},
+        if (!done) {
-                    {id:"helperNode1", type:"helper", wires:[]}];
+            done = sendIntermediate;
+            sendIntermediate = false;
+        }
+        var outputs = 1;
+        if (sendIntermediate) {
+            outputs = 2;
+        }
+        var flow = [
+            {"id":"delayNode1","type":"delay","name":"delayNode","pauseType":"rate","timeout":5,"nbRateUnits":nbUnit,"timeoutUnits":"seconds","rate":aLimit,"rateUnits":"second","randomFirst":"1","randomLast":"5","randomUnits":"seconds","drop":true,outputs:outputs,"wires":[["helperNode1"],["helperNode2"]]},
+            {id:"helperNode1", type:"helper", wires:[]},
+            {id:"helperNode2", type:"helper", wires:[]}
+        ]
+
+                    ;
         helper.load(delayNode, flow, function() {
             var delayNode1 = helper.getNode("delayNode1");
             var helperNode1 = helper.getNode("helperNode1");
+            var helperNode2 = helper.getNode("helperNode2");
             var receivedMessagesStack = [];
+            var receivedIntermediateMessagesStack = [];
 
             // Add a small grace to the calculated delay
             var rate = 1000/aLimit + 10;
@@ -273,6 +288,9 @@ describe('delay Node', function() {
                 receiveTimestamp = process.hrtime();
                 receivedMessagesStack.push(msg);
             });
+            helperNode2.on("input", function(msg) {
+                receivedIntermediateMessagesStack.push(msg);
+            });
 
             var possibleMaxMessageCount = Math.ceil(aLimit * (runtimeInMillis / 1000) + aLimit); // +aLimit as at the start of the 2nd period, we're allowing the 3rd burst
 
@@ -304,6 +322,11 @@ describe('delay Node', function() {
                         }
                     }
                     foundAtLeastOneDrop.should.be.true();
+                    if (sendIntermediate) {
+                        receivedIntermediateMessagesStack.length.should.be.greaterThan(0);
+                    } else {
+                        receivedIntermediateMessagesStack.length.should.be.exactly(0);
+                    }
                     done();
                 } catch (err) {
                     done(err);
@@ -327,6 +350,11 @@ describe('delay Node', function() {
         dropRateLimitSECONDSTest(2, 1, 5000, null, done);
     });
 
+    it('limits the message rate to 2 per second, 5 seconds, with drop, 2nd output', function(done) {
+        this.timeout(6000);
+        dropRateLimitSECONDSTest(2, 1, 5000, null, true, done);
+    });
+
     it('limits the message rate with drop using msg.rate', function (done) {
         this.timeout(6000);
         RED.settings.nodeMessageBufferMaxLength = 3;