From bb12ec702a9611bf500e1e02f78e143a261620ea Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 24 Jan 2020 18:20:14 +0000
Subject: [PATCH] Add second output to trigger node

and add tests
---
 .../nodes/core/function/89-trigger.html       |  19 +++-
 .../nodes/core/function/89-trigger.js         |   7 +-
 .../nodes/locales/en-US/messages.json         |   1 +
 test/nodes/core/function/89-trigger_spec.js   | 102 ++++++++++++------
 4 files changed, 91 insertions(+), 38 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
index 28bf0cdeb..7c97f44f7 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
+++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.html
@@ -14,7 +14,7 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="trigger">
+<script type="text/html" data-template-name="trigger">
     <div class="form-row">
         <label data-i18n="trigger.send" for="node-input-op1"></label>
         <input type="hidden" id="node-input-op1type">
@@ -47,6 +47,10 @@
         <input type="hidden" id="node-input-op2type">
         <input style="width: 70%" type="text" id="node-input-op2" placeholder="0">
     </div>
+    <div class="form-row">
+        <label></label>
+            <input type="checkbox" id="node-input-second" style="margin-left: 0px; vertical-align: top; width: auto !important;"> <label style="width:auto !important;" for="node-input-second" data-i18n="trigger.second"></label>
+        </div>
     <div class="form-row">
         <label data-i18n="trigger.label.reset" style="width:auto"></label>
         <div style="display:inline-block; width:70%;vertical-align:top">
@@ -80,9 +84,11 @@
             op2type: {value:"val"},
             duration: {value:"250",required:true,validate:RED.validators.number()},
             extend: {value:"false"},
+            second: {value:false},
             units: {value:"ms"},
             reset: {value:""},
-            bytopic: {value: "all"},
+            bytopic: {value:"all"},
+            outputs: {value:1},
             name: {value:""}
         },
         inputs:1,
@@ -103,6 +109,15 @@
             return this.name?"node_label_italic":"";
         },
         oneditprepare: function() {
+            var that = this;
+            $("#node-input-second").change(function() {
+                if ($("#node-input-second").is(":checked")) {
+                    that.outputs = 2;
+                }
+                else  {
+                    that.outputs = 1;
+                }
+            });
             $("#node-then-type").on("change", function() {
                 if ($(this).val() == "block") {
                     $(".node-type-wait").hide();
diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
index 48a595ccc..5dfe45fee 100644
--- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js
@@ -24,6 +24,7 @@ module.exports = function(RED) {
         this.op2 = n.op2 || "0";
         this.op1type = n.op1type || "str";
         this.op2type = n.op2type || "str";
+        this.second = n.second || false;
 
         if (this.op1type === 'val') {
             if (this.op1 === 'true' || this.op1 === 'false') {
@@ -188,7 +189,8 @@ module.exports = function(RED) {
                                             promise.then(() => {
                                                 msg2.payload = node.topics[topic].m2;
                                                 delete node.topics[topic];
-                                                node.send(msg2);
+                                                if (node.second === true) { node.send([null,msg2]); }
+                                                else { node.send(msg2); }
                                                 node.status({});
                                             }).catch(err => {
                                                 node.error(err);
@@ -238,7 +240,8 @@ module.exports = function(RED) {
                             }
                             delete node.topics[topic];
                             node.status({});
-                            node.send(msg2);
+                            if (node.second === true) { node.send([null,msg2]); }
+                            else { node.send(msg2); }
                         }).catch(err => {
                             node.error(err);
                         });
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index e1d7c6368..5eb83f9d1 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -311,6 +311,7 @@
             "h": "Hours"
         },
         "extend": " extend delay if new message arrives",
+        "second": " send second message to separate output",
         "label": {
             "trigger": "trigger",
             "trigger-block": "trigger & block",
diff --git a/test/nodes/core/function/89-trigger_spec.js b/test/nodes/core/function/89-trigger_spec.js
index 5f7bfc2d1..ebf1c8db9 100644
--- a/test/nodes/core/function/89-trigger_spec.js
+++ b/test/nodes/core/function/89-trigger_spec.js
@@ -102,20 +102,20 @@ describe('trigger node', function() {
     function basicTest(type, val, rval) {
         it('should output 1st value when triggered ('+type+')', function(done) {
             var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1:val, op1type:type, op2:"", op2type:"null", duration:"20", wires:[["n2"]] },
-                        {id:"n2", type:"helper"} ];
+                {id:"n2", type:"helper"} ];
             process.env[val] = rval;
             helper.load(triggerNode, flow, function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
                 n2.on("input", function(msg) {
                     try {
-			if (rval) {
-			    msg.should.have.property("payload");
-			    should.deepEqual(msg.payload, rval);
-			}
-			else {
-			    msg.should.have.property("payload", val);
-			}
+                        if (rval) {
+                            msg.should.have.property("payload");
+                            should.deepEqual(msg.payload, rval);
+                        }
+                        else {
+                            msg.should.have.property("payload", val);
+                        }
                         delete process.env[val];
                         done();
                     }
@@ -127,7 +127,7 @@ describe('trigger node', function() {
 
         it('should output 2st value when triggered ('+type+')', function(done) {
             var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1:"foo", op1type:"str", op2:val, op2type:type, duration:"20", wires:[["n2"]] },
-                        {id:"n2", type:"helper"} ];
+                {id:"n2", type:"helper"} ];
             process.env[val] = rval;
             helper.load(triggerNode, flow, function() {
                 var n1 = helper.getNode("n1");
@@ -136,17 +136,17 @@ describe('trigger node', function() {
                 n2.on("input", function(msg) {
                     try {
                         if (c === 0) {
-			    msg.should.have.property("payload", "foo");
+                            msg.should.have.property("payload", "foo");
                             c++;
                         }
                         else {
-			    if (rval) {
-			        msg.should.have.property("payload");
-			        should.deepEqual(msg.payload, rval);
-			    }
-			    else {
-			        msg.should.have.property("payload", val);
-			    }
+                            if (rval) {
+                                msg.should.have.property("payload");
+                                should.deepEqual(msg.payload, rval);
+                            }
+                            else {
+                                msg.should.have.property("payload", val);
+                            }
                             delete process.env[val];
                             done();
                         }
@@ -408,8 +408,8 @@ describe('trigger node', function() {
 
     it('should be able to return things from persistable flow and global context variables', function (done) {
         var flow = [{"id": "n1", "type": "trigger", "name": "triggerNode", "op1": "#:(memory1)::foo", "op1type": "flow",
-                     "op2": "#:(memory1)::bar", "op2type": "global", "duration": "20", "wires": [["n2"]], "z": "flow" },
-                    {"id": "n2", "type": "helper"}];
+            "op2": "#:(memory1)::bar", "op2type": "global", "duration": "20", "wires": [["n2"]], "z": "flow" },
+        {"id": "n2", "type": "helper"}];
         helper.load(triggerNode, flow, function () {
             initContext(function () {
                 var n1 = helper.getNode("n1");
@@ -442,11 +442,11 @@ describe('trigger node', function() {
 
     it('should be able to return things from multiple persistable global context variables', function (done) {
         var flow = [{"id": "n1", "z": "flow", "type": "trigger",
-                     "duration": "20", "wires": [["n2"]],
-                     "op1": "#:(memory1)::val", "op1type": "global",
-                     "op2": "#:(memory2)::val", "op2type": "global"
-                    },
-                    {"id": "n2", "type": "helper"}];
+            "duration": "20", "wires": [["n2"]],
+            "op1": "#:(memory1)::val", "op1type": "global",
+            "op2": "#:(memory2)::val", "op2type": "global"
+        },
+        {"id": "n2", "type": "helper"}];
         helper.load(triggerNode, flow, function () {
             initContext(function () {
                 var n1 = helper.getNode("n1");
@@ -481,11 +481,11 @@ describe('trigger node', function() {
 
     it('should be able to return things from multiple persistable flow context variables', function (done) {
         var flow = [{"id": "n1", "z": "flow", "type": "trigger",
-                     "duration": "20", "wires": [["n2"]],
-                     "op1": "#:(memory1)::val", "op1type": "flow",
-                     "op2": "#:(memory2)::val", "op2type": "flow"
-                    },
-                    {"id": "n2", "type": "helper"}];
+            "duration": "20", "wires": [["n2"]],
+            "op1": "#:(memory1)::val", "op1type": "flow",
+            "op2": "#:(memory2)::val", "op2type": "flow"
+        },
+        {"id": "n2", "type": "helper"}];
         helper.load(triggerNode, flow, function () {
             initContext(function () {
                 var n1 = helper.getNode("n1");
@@ -520,11 +520,11 @@ describe('trigger node', function() {
 
     it('should be able to return things from multiple persistable flow & global context variables', function (done) {
         var flow = [{"id": "n1", "z": "flow", "type": "trigger",
-                     "duration": "20", "wires": [["n2"]],
-                     "op1": "#:(memory1)::val", "op1type": "flow",
-                     "op2": "#:(memory2)::val", "op2type": "global"
-                    },
-                    {"id": "n2", "type": "helper"}];
+            "duration": "20", "wires": [["n2"]],
+            "op1": "#:(memory1)::val", "op1type": "flow",
+            "op2": "#:(memory2)::val", "op2type": "global"
+        },
+        {"id": "n2", "type": "helper"}];
         helper.load(triggerNode, flow, function () {
             initContext(function () {
                 var n1 = helper.getNode("n1");
@@ -781,6 +781,40 @@ describe('trigger node', function() {
         });
     });
 
+    it('should be able to send 2nd message to a 2nd output', function(done) {
+        var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1type:"val", op2type:"val", op1:"hello",  op2:"world", duration:"50", second:true, wires:[["n2"],["n3"]] },
+            {id:"n2", type:"helper"}, {id:"n3", type:"helper"} ];
+        helper.load(triggerNode, flow, function() {
+            var n1 = helper.getNode("n1");
+            var n2 = helper.getNode("n2");
+            var n3 = helper.getNode("n3");
+            var c = 0;
+            n2.on("input", function(msg) {
+                try {
+                    if (c === 0) {
+                        msg.should.have.a.property("payload", "hello");
+                        msg.should.have.a.property("topic", "test");
+                        c+=1;
+                    }
+                    else { done(err); }
+                }
+                catch(err) { done(err); }
+            });
+            n3.on("input", function(msg) {
+                try {
+                    if (c === 1) {
+                        msg.should.have.a.property("payload", "world");
+                        msg.should.have.a.property("topic", "test");
+                        done();
+                    }
+                    else { done(err); }
+                }
+                catch(err) { done(err); }
+            });
+            n1.emit("input", {payload:"go",topic:"test"});
+        });
+    });
+
     it('should handle string null as null', function(done) {
         var flow = [{"id":"n1", "type":"trigger", "name":"triggerNode", op1type:"val", op2type:"pay", op1:"null", op2:"null", duration:"40", wires:[["n2"]] },
             {id:"n2", type:"helper"} ];