Add check that node sends object rather than primitive type

Fixes #3876

.github/workflows/release.yml

@@ -5,9 +5,6 @@ on:
   release:
     types: [published]
 
-permissions:
-  contents: read
-
 jobs:
   generate:
     name: 'Update node-red-docker image'

.github/workflows/tests.yml

@@ -6,14 +6,8 @@ on:
   pull_request:
     branches: [ master, dev ]
 
-permissions:
-  contents: read
-
 jobs:
   build:
-    permissions:
-      checks: write  # for coverallsapp/github-action to create new checks
-      contents: read  # for actions/checkout to fetch code
     runs-on: ubuntu-latest
     strategy:
       matrix:

packages/node_modules/@node-red/editor-client/src/js/nodes.js

@@ -1965,7 +1965,7 @@ RED.nodes = (function() {
                         }
                     }
                 } else {
-                    const keepNodesCurrentZ = reimport && n.z && (RED.workspaces.contains(n.z) || RED.nodes.subflow(n.z))
+                    const keepNodesCurrentZ = reimport && n.z && RED.workspaces.contains(n.z)
                     if (!keepNodesCurrentZ && n.z && !workspace_map[n.z] && !subflow_map[n.z]) {
                         n.z = activeWorkspace;
                     }
@@ -2067,7 +2067,7 @@ RED.nodes = (function() {
                         node.id = getID();
                     } else {
                         node.id = n.id;
-                        const keepNodesCurrentZ = reimport && node.z && (RED.workspaces.contains(node.z) || RED.nodes.subflow(node.z))
+                        const keepNodesCurrentZ = reimport && node.z && RED.workspaces.contains(node.z)
                         if (!keepNodesCurrentZ && (node.z == null || (!workspace_map[node.z] && !subflow_map[node.z]))) {
                             if (createMissingWorkspace) {
                                 if (missingWorkspace === null) {
@@ -2740,7 +2740,6 @@ RED.nodes = (function() {
                     }
                 });
 
-                const nodeGroupMap = {}
                 var replaceNodeIds = Object.keys(replaceNodes);
                 if (replaceNodeIds.length > 0) {
                     var reimportList = [];
@@ -2751,12 +2750,6 @@ RED.nodes = (function() {
                         } else {
                             allNodes.removeNode(n);
                         }
-                        if (n.g) {
-                            // reimporting a node *without* including its group object
-                            // will cause the g property to be cleared. Cache it
-                            // here so we can restore it
-                            nodeGroupMap[n.id] = n.g
-                        }
                         reimportList.push(convertNode(n));
                         RED.events.emit('nodes:remove',n);
                     });
@@ -2778,18 +2771,6 @@ RED.nodes = (function() {
                     var newNodeMap = {};
                     result.nodes.forEach(function(n) {
                         newNodeMap[n.id] = n;
-                        if (nodeGroupMap[n.id]) {
-                            // This node is in a group - need to substitute the
-                            // node reference inside the group
-                            n.g = nodeGroupMap[n.id]
-                            const group = RED.nodes.group(n.g)
-                            if (group) {
-                                var index = group.nodes.findIndex(gn => gn.id === n.id)
-                                if (index > -1) {
-                                    group.nodes[index] = n
-                                }
-                            }
-                        }
                     });
                     RED.nodes.eachLink(function(l) {
                         if (newNodeMap.hasOwnProperty(l.source.id)) {

packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js

@@ -146,7 +146,7 @@
         { value: "reset", source: ["delay","trigger","join","rbe"] },
         { value: "responseCookies", source: ["http request"] },
         { value: "responseTopic", source: ["mqtt"] },
-        { value: "responseUrl", source: ["http request"] },
+        { value: "responseURL", source: ["http request"] },
         { value: "restartTimeout", source: ["join"] },
         { value: "retain", source: ["mqtt"] },
         { value: "schema", source: ["json"] },

packages/node_modules/@node-red/nodes/core/function/15-change.js

@@ -318,7 +318,7 @@ module.exports = function(RED) {
             }
             var r = node.rules[currentRule];
             if (r.t === "move") {
-                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1) && (r.p !== r.to)) {
+                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1)) {
                     applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:r.p, tot:r.pt},(err,msg) => {
                         applyRule(msg,{t:"delete", p:r.p, pt:r.pt}, (err,msg) => {
                             completeApplyingRules(msg,currentRule,done);

packages/node_modules/@node-red/nodes/core/network/10-mqtt.html

@@ -421,11 +421,7 @@
 <script type="text/javascript">
 (function() {
 
-    var typedInputNoneOpt = {
-        value: 'none',
-        label: RED._("node-red:mqtt.label.none"),
-        hasValue: false
-    };
+    var typedInputNoneOpt = { value: 'none', label: '', hasValue: false };
     var makeTypedInputOpt = function(value){
         return {
             value: value,
@@ -440,11 +436,7 @@
         makeTypedInputOpt("text/csv"),
         makeTypedInputOpt("text/html"),
         makeTypedInputOpt("text/plain"),
-        {
-            value: "other",
-            label: RED._("node-red:mqtt.label.other"),
-            icon: "red/images/typedInput/az.svg"
-        }
+        {value:"other", label:""}
     ];
 
     function getDefaultContentType(value) {
@@ -507,17 +499,17 @@
             cleansession: {value: true},
             birthTopic: {value:"", validate:validateMQTTPublishTopic},
             birthQos: {value:"0"},
-            birthRetain: {value:"false"},
+            birthRetain: {value:false},
             birthPayload: {value:""},
             birthMsg: { value: {}},
             closeTopic: {value:"", validate:validateMQTTPublishTopic},
             closeQos: {value:"0"},
-            closeRetain: {value:"false"},
+            closeRetain: {value:false},
             closePayload: {value:""},
             closeMsg: { value: {}},
             willTopic: {value:"", validate:validateMQTTPublishTopic},
             willQos: {value:"0"},
-            willRetain: {value:"false"},
+            willRetain: {value:false},
             willPayload: {value:""},
             willMsg: { value: {}},
             userProps: { value: ""},

packages/node_modules/@node-red/nodes/core/network/10-mqtt.js

@@ -459,6 +459,7 @@ module.exports = function(RED) {
             if(!opts || typeof opts !== "object") {
                 return; //nothing to change, simply return
             }
+            const originalBrokerURL = node.brokerurl;
 
             //apply property changes (only if the property exists in the opts object)
             setIfHasProperty(opts, node, "url", init);
@@ -467,6 +468,7 @@ module.exports = function(RED) {
             setIfHasProperty(opts, node, "clientid", init);
             setIfHasProperty(opts, node, "autoConnect", init);
             setIfHasProperty(opts, node, "usetls", init);
+            setIfHasProperty(opts, node, "usews", init);
             setIfHasProperty(opts, node, "verifyservercert", init);
             setIfHasProperty(opts, node, "compatmode", init);
             setIfHasProperty(opts, node, "protocolVersion", init);
@@ -569,6 +571,9 @@ module.exports = function(RED) {
             if (typeof node.usetls === 'undefined') {
                 node.usetls = false;
             }
+            if (typeof node.usews === 'undefined') {
+                node.usews = false;
+            }
             if (typeof node.verifyservercert === 'undefined') {
                 node.verifyservercert = false;
             }
@@ -995,7 +1000,7 @@ module.exports = function(RED) {
                     node.client.publish(msg.topic, msg.payload, options, function (err) {
                         if (done) {
                             done(err)
-                        } else if(err) {
+                        } else {
                             node.error(err, msg)
                         }
                     })

packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js

@@ -110,12 +110,7 @@ module.exports = function(RED) {
                                         if (msg.payload[s].hasOwnProperty(p)) {
                                             /* istanbul ignore else */
                                             if (typeof msg.payload[s][p] !== "object") {
-                                            // Fix to honour include null values flag
-                                            //if (typeof msg.payload[s][p] !== "object" || (node.include_null_values === true && msg.payload[s][p] === null)) {
-                                                var q = "";
-                                                if (msg.payload[s][p] !== undefined) {
-                                                    q += msg.payload[s][p];
-                                                }
+                                                var q = "" + msg.payload[s][p];
                                                 if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                     q = q.replace(/"/g, '""');
                                                     ou += node.quo + q + node.quo + node.sep;
@@ -135,12 +130,9 @@ module.exports = function(RED) {
                                             ou += node.sep;
                                         }
                                         else {
-                                            var p = RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']");
+                                            var p = RED.util.ensureString(RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']"));
                                             /* istanbul ignore else */
-                                            if (p === undefined) { p = ""; }
-                                            // fix to honour include null values flag
-                                            //if (p === null && node.include_null_values !== true) { p = "";}
-                                            p = RED.util.ensureString(p);
+                                            if (p === "undefined") { p = ""; }
                                             if (p.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                 p = p.replace(/"/g, '""');
                                                 ou += node.quo + p + node.quo + node.sep;

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

@@ -446,9 +446,7 @@
             "staticTopic": "Subscribe to single topic",
             "dynamicTopic": "Dynamic subscription",
             "auto-connect": "Connect automatically",
-            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode.",
-            "none": "none",
-            "other": "other"
+            "auto-mode-depreciated": "This option is depreciated. Please use the new auto-detect mode."
         },
         "sections-label": {
             "birth-message": "Message sent on connection (birth message)",

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

@@ -446,9 +446,7 @@
             "staticTopic": "1つのトピックを購読",
             "dynamicTopic": "動的な購読",
             "auto-connect": "自動接続",
-            "auto-mode-depreciated": "本オプションは非推奨になりました。新しい自動判定モードを使用してください。",
-            "none": "なし",
-            "other": "その他"
+            "auto-mode-depreciated": "本オプションは非推奨になりました。新しい自動判定モードを使用してください。"
         },
         "sections-label": {
             "birth-message": "接続時の送信メッセージ(Birthメッセージ)",

packages/node_modules/@node-red/runtime/lib/nodes/Node.js

@@ -373,6 +373,11 @@ Node.prototype.send = function(msg) {
     if (msg === null || typeof msg === "undefined") {
         return;
     } else if (!util.isArray(msg)) {
+        // A single message has been passed in
+        if (typeof msg !== 'object') {
+            this.error(Log._("nodes.flow.non-message-returned", { type: typeof msg }));
+            return
+        }
         if (this._wire) {
             // A single message and a single wire on output 0
             // TODO: pre-load flows.get calls - cannot do in constructor
@@ -425,27 +430,31 @@ Node.prototype.send = function(msg) {
                     for (k = 0; k < msgs.length; k++) {
                         var m = msgs[k];
                         if (m !== null && m !== undefined) {
-                            if (!m._msgid) {
-                                hasMissingIds = true;
+                            if (typeof m !== 'object') {
+                                this.error(Log._("nodes.flow.non-message-returned", { type: typeof m }));
+                            } else {
+                                if (!m._msgid) {
+                                    hasMissingIds = true;
+                                }
+                                /* istanbul ignore else */
+                                if (!sentMessageId) {
+                                    sentMessageId = m._msgid;
+                                }
+                                sendEvents.push({
+                                    msg: m,
+                                    source: {
+                                        id: this.id,
+                                        node: this,
+                                        port: i
+                                    },
+                                    destination: {
+                                        id: wires[j],
+                                        node: undefined
+                                    },
+                                    cloneMessage: msgSent
+                                });
+                                msgSent = true;
                             }
-                            /* istanbul ignore else */
-                            if (!sentMessageId) {
-                                sentMessageId = m._msgid;
-                            }
-                            sendEvents.push({
-                                msg: m,
-                                source: {
-                                    id: this.id,
-                                    node: this,
-                                    port: i
-                                },
-                                destination: {
-                                    id: wires[j],
-                                    node: undefined
-                                },
-                                cloneMessage: msgSent
-                            });
-                            msgSent = true;
                         }
                     }
                 }

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

@@ -134,7 +134,8 @@
         "flow": {
             "unknown-type": "Unknown type: __type__",
             "missing-types": "missing types",
-            "error-loop": "Message exceeded maximum number of catches"
+            "error-loop": "Message exceeded maximum number of catches",
+            "non-message-returned": "Node tried to send a message of type __type__"
         },
         "index": {
             "unrecognised-id": "Unrecognised id: __id__",

test/nodes/core/function/15-change_spec.js

@@ -1717,24 +1717,6 @@ describe('change Node', function() {
                 changeNode1.receive({topic:{foo:{bar:1}}, payload:"String"});
             });
         });
-        it('moves the value of a message property object to itself', function(done) {
-            var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"move","p":"payload","pt":"msg","to":"payload","tot":"msg"}],"name":"changeNode","wires":[["helperNode1"]]},
-                        {id:"helperNode1", type:"helper", wires:[]}];
-            helper.load(changeNode, flow, function() {
-                var changeNode1 = helper.getNode("changeNode1");
-                var helperNode1 = helper.getNode("helperNode1");
-                helperNode1.on("input", function(msg) {
-                    try {
-                        msg.should.have.property('payload');
-                        msg.payload.should.equal("bar");
-                        done();
-                    } catch(err) {
-                        done(err);
-                    }
-                });
-                changeNode1.receive({payload:"bar"});
-            });
-        });
         it('moves the value of a message property object to a sub-property', function(done) {
             var flow = [{"id":"changeNode1","type":"change","rules":[{"t":"move","p":"payload","pt":"msg","to":"payload.foo","tot":"msg"}],"name":"changeNode","wires":[["helperNode1"]]},
                         {id:"helperNode1", type:"helper", wires:[]}];

test/nodes/core/network/21-httprequest_spec.js

@@ -1529,7 +1529,7 @@ describe('HTTP Request Node', function() {
                         msg.payload.headers.should.have.property('Content-Type').which.startWith('application/json');
                         //msg.dynamicHeaderName should be present in headers with the value of msg.dynamicHeaderValue
                         msg.payload.headers.should.have.property('dyn-header-name').which.startWith('dyn-header-value');
-                        //static (custom) header set in Flow UI should be present
+                        //static (custom) header set in Flow UI should be present 
                         msg.payload.headers.should.have.property('static-header-name').which.startWith('static-header-value');
                         //msg.headers['location'] should be deleted because Flow UI "Location" header has a blank value
                         //ensures headers with matching characters but different case are eliminated
@@ -2281,7 +2281,7 @@ describe('HTTP Request Node', function() {
             let port = testPort++
 
             let server;
-
+        
             before(function() {
                 server = net.createServer(function (socket) {
                     socket.write("HTTP/1.0 200\nContent-Type: text/plain\n\nHelloWorld")
@@ -2291,7 +2291,7 @@ describe('HTTP Request Node', function() {
                 server.listen(port,'127.0.0.1', function(err) {
                 })
             });
-
+            
             after(function() {
                 server.close()
             });
@@ -2322,14 +2322,14 @@ describe('HTTP Request Node', function() {
                     var n2 = helper.getNode("n2");
                     n2.on('input', function(msg) {
                         try{
-                            msg.payload.should.match(/RequestError: Parse Error/)
+                            msg.payload.should.equal(`RequestError: Parse Error: Missing expected CR after header value : http://localhost:${port}/`)
                             done()
                         } catch (err) {
                             done(err)
                         }
                     })
                     n1.receive({payload: 'foo'})
-
+                    
                 });
             });
         }

test/nodes/core/network/21-mqtt_spec.js

@@ -489,39 +489,6 @@ describe('MQTT Nodes', function () {
         }       
         testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
     });
-    itConditional('should safely discard bad birth topic', function (done) {
-        if (skipTests) { return this.skip() }
-        this.timeout = 2000;
-        const baseTopic = nextTopic();
-        const brokerOptions = {
-            protocolVersion: 4,
-            birthTopic: baseTopic + "#", // a publish topic should never have a wildcard
-            birthPayload: "broker connected",
-            birthQos: 2,
-        }
-        const options = {};
-        const hooks = { done: null, beforeLoad: null, afterLoad: null, afterConnect: null };
-        hooks.afterLoad = (helperNode, mqttBroker, mqttIn, mqttOut) => {
-            helperNode.on("input", function (msg) {
-                try {
-                    msg.should.have.a.property("error").type("object");
-                    msg.error.should.have.a.property("source").type("object");
-                    msg.error.source.should.have.a.property("id", mqttIn.id);
-                    done();
-                } catch (err) {
-                    done(err)
-                }
-            });
-            return true; //handled
-        }
-        options.expectMsg = null;
-        try {
-            testSendRecv(brokerOptions, { topic: brokerOptions.birthTopic }, {}, options, hooks);
-            done()
-        } catch(err) {
-            done(e)
-        }
-    });
     itConditional('should publish close message', function (done) {
         if (skipTests) { return this.skip() }
         this.timeout = 2000;
@@ -679,13 +646,12 @@ function testSendRecv(brokerOptions, inNodeOptions, outNodeOptions, options, hoo
             const mqttBroker = helper.getNode(brokerOptions.id);
             const mqttIn = helper.getNode(nodes.mqtt_in.id);
             const mqttOut = helper.getNode(nodes.mqtt_out.id);
-            let afterLoadHandled = false, finished = false;
+            let afterLoadHandled = false;
             if (hooks.afterLoad) {
                 afterLoadHandled = hooks.afterLoad(helperNode, mqttBroker, mqttIn, mqttOut)
             }
             if (!afterLoadHandled) {
                 helperNode.on("input", function (msg) {
-                    finished = true
                     try {
                         compareMsgToExpected(msg, expectMsg);
                         if (hooks.done) { hooks.done(); }
@@ -710,12 +676,10 @@ function testSendRecv(brokerOptions, inNodeOptions, outNodeOptions, options, hoo
                 }
             })
             .catch((e) => {
-                if(finished) { return }
                 if (hooks.done) { hooks.done(e); }
                 else { throw e; }
             });
         } catch (err) {
-            if(finished) { return }
             if (hooks.done) { hooks.done(err); }
             else { throw err; }
         }

test/nodes/core/parsers/70-CSV_spec.js

@@ -693,20 +693,19 @@ describe('CSV node', function() {
     describe('json object to csv', function() {
 
         it('should convert a simple object back to a csv', function(done) {
-            var flow = [ { id:"n1", type:"csv", temp:"a,b,c,,e,f,g,h,i,j,k", wires:[["n2"]] },
+            var flow = [ { id:"n1", type:"csv", temp:"a,b,c,,e,f", wires:[["n2"]] },
                 {id:"n2", type:"helper"} ];
             helper.load(csvNode, flow, function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
                 n2.on("input", function(msg) {
-                    // console.log("GOT",msg)
                     try {
-                        msg.should.have.property('payload', '4,foo,true,,0,"Hello\nWorld",,,undefined,null,null\n');
+                        msg.should.have.property('payload', '4,foo,true,,0,"Hello\nWorld"\n');
                         done();
                     }
                     catch(e) { done(e); }
                 });
-                var testJson = { e:0, d:1, b:"foo", c:true, a:4, f:"Hello\nWorld", h:undefined, i:"undefined",j:null,k:"null" };
+                var testJson = { e:0, d:1, b:"foo", c:true, a:4, f:"Hello\nWorld" };
                 n1.emit("input", {payload:testJson});
             });
         });
@@ -718,14 +717,13 @@ describe('CSV node', function() {
                 var n1 = helper.getNode("n1");
                 var n2 = helper.getNode("n2");
                 n2.on("input", function(msg) {
-                    // console.log("GOT",msg)
                     try {
-                        msg.should.have.property('payload', '1,foo,"ba""r","di,ng",,undefined,null\n');
+                        msg.should.have.property('payload', '1,foo,"ba""r","di,ng"\n');
                         done();
                     }
                     catch(e) { done(e); }
                 });
-                var testJson = { d:1, b:"foo", c:"ba\"r", a:"di,ng", e:undefined, f:"undefined", g:null,h:"null" };
+                var testJson = { d:1, b:"foo", c:"ba\"r", a:"di,ng" };
                 n1.emit("input", {payload:testJson});
             });
         });