From 5510dffe184d91203a1e0a72cad5d01b0726ab12 Mon Sep 17 00:00:00 2001 From: Mark Hindess Date: Wed, 14 Jan 2015 14:19:21 +0000 Subject: [PATCH] Fix random delay mode to be random delay not random rate-limited stack. Documentation says "Introduces a delay into a flow or rate limits messages." but this node was doing delay and rate limit in random mode which doesn't seem that useful. Worse it was a stack not a queue. I can't think of any sane use cases for that behaviour. --- nodes/core/core/89-delay.js | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/nodes/core/core/89-delay.js b/nodes/core/core/89-delay.js index 3a299caeb..02a1cc2e5 100644 --- a/nodes/core/core/89-delay.js +++ b/nodes/core/core/89-delay.js @@ -21,16 +21,6 @@ module.exports = function(RED) { var MILLIS_TO_NANOS = 1000000; var SECONDS_TO_NANOS = 1000000000; - function random(n) { - var wait = n.randomFirst + (n.diff * Math.random()); - if (n.buffer.length > 0) { - n.send(n.buffer.pop()); - n.randomID = setTimeout(function() {random(n);},wait); - } else { - n.randomID = -1; - } - } - function DelayNode(n) { RED.nodes.createNode(this,n); @@ -180,19 +170,22 @@ module.exports = function(RED) { }); } else if (this.pauseType === "random") { - this.on("input",function(msg){ - node.buffer.push(msg); - if (node.randomID === -1) { - var wait = node.randomFirst + (node.diff * Math.random()); - node.randomID = setTimeout(function() {random(node);},wait); - } + this.on("input", function(msg) { + var wait = node.randomFirst + (node.diff * Math.random()); + var id = setTimeout(function(){ + node.idList.splice(node.idList.indexOf(id),1); + node.send(msg); + }, wait); + this.idList.push(id); }); - this.on("close", function (){ - if (this.randomID !== -1) { - clearTimeout(this.randomID); + this.on("close", function() { + for (var i=0; i