@node-red/nodes 3.1.0-beta.4 → 3.1.1

package/core/function/rbe.html

@@ -56,9 +56,11 @@
             inout: {value:"out"},
             septopics: {value:true},
             property: {value:"payload", required:true,
-                       label:RED._("node-red:rbe.label.property")},
+                       label:RED._("node-red:rbe.label.property"),
+                       validate: RED.validators.typedInput({ type: 'msg' })},
             topi: {value:"topic", required:true,
-                   label:RED._("node-red:rbe.label.topic")}
+                   label:RED._("node-red:rbe.label.topic"),
+                   validate: RED.validators.typedInput({ type: 'msg' })}
         },
         inputs:1,
         outputs:1,

package/core/network/10-mqtt.html

@@ -492,12 +492,12 @@
                 let ok = true;
                 if ($("#node-config-input-clientid").length) {
                     // Currently editing the node
-                    let needClientId = !$("#node-config-input-cleansession").is(":checked") || !$("#node-config-input-autoUnsubscribe").is(":checked")
+                    let needClientId = !$("#node-config-input-cleansession").is(":checked")
                     if (needClientId) {
                         ok = (v||"").length > 0;
                     }
                 } else {
-                    let needClientId = !(this.cleansession===undefined || this.cleansession) || this.autoUnsubscribe;
+                    let needClientId = !(this.cleansession===undefined || this.cleansession)
                     if (needClientId) {
                         ok = (v||"").length > 0;
                     }

package/core/network/10-mqtt.js

@@ -24,7 +24,6 @@ module.exports = function(RED) {
         "text/css":"string",
         "text/html":"string",
         "text/plain":"string",
-        "text/html":"string",
         "application/json":"json",
         "application/octet-stream":"buffer",
         "application/pdf":"buffer",
@@ -105,6 +104,7 @@ module.exports = function(RED) {
      * @returns `true` if it is a valid topic
      */
     function isValidPublishTopic(topic) {
+        if (topic.length === 0) return false;
         return !/[\+#\b\f\n\r\t\v\0]/.test(topic);
     }
 
@@ -220,8 +220,8 @@ module.exports = function(RED) {
      */
     function subscriptionHandler(node, datatype ,topic, payload, packet) {
         const msg = {topic:topic, payload:null, qos:packet.qos, retain:packet.retain};
-        const v5 = (node && node.brokerConn) 
-            ? node.brokerConn.v5() 
+        const v5 = (node && node.brokerConn)
+            ? node.brokerConn.v5()
             : Object.prototype.hasOwnProperty.call(packet, "properties");
         if(v5 && packet.properties) {
             setStrProp(packet.properties, msg, "responseTopic");
@@ -452,7 +452,7 @@ module.exports = function(RED) {
 
     /**
      * Perform the disconnect action
-     * @param {MQTTInNode|MQTTOutNode} node 
+     * @param {MQTTInNode|MQTTOutNode} node
      * @param {Function} done
      */
     function handleDisconnectAction(node, done) {
@@ -612,7 +612,7 @@ module.exports = function(RED) {
                 node.brokerurl = node.url;
             } else {
                 // if the broker is ws:// or wss:// or tcp://
-                if (node.broker.indexOf("://") > -1) {
+                if ((typeof node.broker  === 'string') && node.broker.indexOf("://") > -1) {
                     node.brokerurl = node.broker;
                     // Only for ws or wss, check if proxy env var for additional configuration
                     if (node.brokerurl.indexOf("wss://") > -1 || node.brokerurl.indexOf("ws://") > -1) {
@@ -866,7 +866,7 @@ module.exports = function(RED) {
              * Call end and wait for the client to end (or timeout)
              * @param {mqtt.MqttClient} client The broker client
              * @param {number} ms The time to wait for the client to end
-             * @returns 
+             * @returns
              */
             let waitEnd = (client, ms) => {
                 return new Promise( (resolve, reject) => {
@@ -906,7 +906,7 @@ module.exports = function(RED) {
         node.subid = 1;
 
         //typedef for subscription object:
-        /** 
+        /**
          * @typedef {Object} Subscription
          * @property {String} topic - topic to subscribe to
          * @property {Object} [options] - options object
@@ -934,7 +934,7 @@ module.exports = function(RED) {
             const ref = _ref || 0;
             let options
             let qos = 1 // default to QoS 1 (AWS and several other brokers don't support QoS 2)
-            
+
             // if options is an object, then clone it
             if (typeof _options == "object") {
                 options = RED.util.cloneMessage(_options || {})
@@ -948,7 +948,7 @@ module.exports = function(RED) {
             if (typeof qos === "number" && qos >= 0 && qos <= 2) {
                 options.qos = qos;
             }
-            
+
             subscription.topic = _topic;
             subscription.qos = qos;
             subscription.options = RED.util.cloneMessage(options);
@@ -958,16 +958,16 @@ module.exports = function(RED) {
         }
 
         /**
-         * If topic is a subscription object, then use that, otherwise look up the topic in 
+         * If topic is a subscription object, then use that, otherwise look up the topic in
          * the  subscriptions object.  If the topic is not found, then create a new subscription
          * object and add it to the subscriptions object.
-         * @param {Subscription|String} topic 
-         * @param {*} options 
-         * @param {*} callback 
-         * @param {*} ref 
+         * @param {Subscription|String} topic
+         * @param {*} options
+         * @param {*} callback
+         * @param {*} ref
          */
         node.subscribe = function (topic, options, callback, ref) {
-            /** @type {Subscription} */ 
+            /** @type {Subscription} */
             let subscription
             let doCompare = false
             let changesFound = false
@@ -1005,7 +1005,7 @@ module.exports = function(RED) {
                     _brokerConn.unsubscribe(sub.topic, sub.ref, true)
                 }
             })
-            
+
             // if subscription is found (or sent in as a parameter), then check for changes.
             // if there are any changes requested, tidy up the old subscription
             if (subscription) {
@@ -1092,7 +1092,7 @@ module.exports = function(RED) {
                         delete sub[ref]
                     }
                 }
-                // if instructed to remove the actual MQTT client subscription 
+                // if instructed to remove the actual MQTT client subscription
                 if (unsub) {
                     // if there are no more subscriptions for the topic, then remove the topic
                     if (Object.keys(sub).length === 0) {

package/core/network/21-httprequest.js

@@ -452,10 +452,6 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                     formData.append(opt, val);
                                 } else if (typeof val === 'object' && val.hasOwnProperty('value')) {
                                     formData.append(opt,val.value,val.options || {});
-                                } else if (Array.isArray(val)) {
-                                    for (var i=0; i<val.length; i++) {
-                                        formData.append(opt, val[i])
-                                    }
                                 } else {
                                     formData.append(opt,JSON.stringify(val));
                                 }
@@ -637,6 +633,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
                     msg.payload = msg.payload.toString('utf8'); // txt
 
                     if (node.ret === "obj") {
+                        if (msg.statusCode == 204){msg.payload= "{}"}; 
                         try { msg.payload = JSON.parse(msg.payload); } // obj
                         catch(e) { node.warn(RED._("httpin.errors.json-error")); }
                     }

package/core/parsers/70-CSV.js

@@ -63,7 +63,7 @@ module.exports = function(RED) {
                         if (!(notemplate && (msg.hasOwnProperty("parts") && msg.parts.hasOwnProperty("index") && msg.parts.index > 0))) {
                             template = clean(node.template);
                         }
-                        var ou = "";
+                        const ou = [];
                         if (!Array.isArray(msg.payload)) { msg.payload = [ msg.payload ]; }
                         if (node.hdrout !== "none" && node.hdrSent === false) {
                             if ((template.length === 1) && (template[0] === '')) {
@@ -74,7 +74,7 @@ module.exports = function(RED) {
                                     template = Object.keys(msg.payload[0]);
                                 }
                             }
-                            ou += template.map(v => v.indexOf(node.sep)!==-1 ? '"'+v+'"' : v).join(node.sep) + node.ret;
+                            ou.push(template.map(v => v.indexOf(node.sep)!==-1 ? '"'+v+'"' : v).join(node.sep));
                             if (node.hdrout === "once") { node.hdrSent = true; }
                         }
                         for (var s = 0; s < msg.payload.length; s++) {
@@ -93,7 +93,7 @@ module.exports = function(RED) {
                                         msg.payload[s][t] = node.quo + msg.payload[s][t].toString() + node.quo;
                                     }
                                 }
-                                ou += msg.payload[s].join(node.sep) + node.ret;
+                                ou.push(msg.payload[s].join(node.sep));
                             }
                             else {
                                 if ((template.length === 1) && (template[0] === '') && (msg.hasOwnProperty("columns"))) {
@@ -105,6 +105,7 @@ module.exports = function(RED) {
                                         node.warn(RED._("csv.errors.obj_csv"));
                                         tmpwarn = false;
                                     }
+                                    const row = [];
                                     for (var p in msg.payload[0]) {
                                         /* istanbul ignore else */
                                         if (msg.payload[s].hasOwnProperty(p)) {
@@ -118,21 +119,22 @@ module.exports = function(RED) {
                                                 }
                                                 if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                     q = q.replace(/"/g, '""');
-                                                    ou += node.quo + q + node.quo + node.sep;
+                                                    row.push(node.quo + q + node.quo);
                                                 }
                                                 else if (q.indexOf(node.sep) !== -1 || p.indexOf("\n") !== -1) { // add quotes if any "commas" or "\n"
-                                                    ou += node.quo + q + node.quo + node.sep;
+                                                    row.push(node.quo + q + node.quo);
                                                 }
-                                                else { ou += q + node.sep; } // otherwise just add
+                                                else { row.push(q); } // otherwise just add
                                             }
                                         }
                                     }
-                                    ou = ou.slice(0,-1) + node.ret;
+                                    ou.push(row.join(node.sep)); // add separator
                                 }
                                 else {
+                                    const row = [];
                                     for (var t=0; t < template.length; t++) {
                                         if (template[t] === '') {
-                                            ou += node.sep;
+                                            row.push('');
                                         }
                                         else {
                                             var tt = template[t];
@@ -146,19 +148,20 @@ module.exports = function(RED) {
                                             p = RED.util.ensureString(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;
+                                                row.push(node.quo + p + node.quo);
                                             }
                                             else if (p.indexOf(node.sep) !== -1 || p.indexOf("\n") !== -1) { // add quotes if any "commas" or "\n"
-                                                ou += node.quo + p + node.quo + node.sep;
+                                                row.push(node.quo + p + node.quo);
                                             }
-                                            else { ou += p + node.sep; } // otherwise just add
+                                            else { row.push(p); } // otherwise just add
                                         }
                                     }
-                                    ou = ou.slice(0,-1) + node.ret; // remove final "comma" and add "newline"
+                                    ou.push(row.join(node.sep)); // add separator
                                 }
                             }
                         }
-                        msg.payload = ou;
+                        // join lines, don't forget to add the last new line
+                        msg.payload = ou.join(node.ret) + node.ret;
                         msg.columns = template.map(v => v.indexOf(',')!==-1 ? '"'+v+'"' : v).join(',');
                         if (msg.payload !== '') { send(msg); }
                         done();

package/core/parsers/70-HTML.html

@@ -41,8 +41,8 @@
         color:"#DEBD5C",
         defaults: {
             name: {value:""},
-            property: {value:"payload"},
-            outproperty: {value:"payload"},
+            property: {value:"payload", validate: RED.validators.typedInput({ type: 'msg' }) },
+            outproperty: {value:"payload", validate: RED.validators.typedInput({ type: 'msg' }) },
             tag: {value:""},
             ret: {value:"html"},
             as: {value:"single"}

package/core/parsers/70-JSON.html

@@ -32,6 +32,7 @@
         defaults: {
             name: {value:""},
             property: {value:"payload",required:true,
+                       validate: RED.validators.typedInput({ type: 'msg' }),
                        label:RED._("node-red:json.label.property")},
             action: {value:""},
             pretty: {value:false}

package/core/parsers/70-XML.html

@@ -27,7 +27,8 @@
         defaults: {
             name: {value:""},
             property: {value:"payload",required:true,
-                       label:RED._("node-red:common.label.property")},
+                       label:RED._("node-red:common.label.property"),
+                       validate: RED.validators.typedInput({ type: 'msg' })},
             attr: {value:""},
             chr: {value:""}
         },

package/core/parsers/70-YAML.html

@@ -16,6 +16,7 @@
         color:"#DEBD5C",
         defaults: {
             property: {value:"payload",required:true,
+                       validate: RED.validators.typedInput({ type: 'msg' }),
                        label:RED._("node-red:common.label.property")},
             name: {value:""}
         },

package/core/sequence/17-split.html

@@ -57,7 +57,7 @@
             arraySplt: {value:1},
             arraySpltType: {value:"len"},
             stream: {value:false},
-            addname: {value:""}
+            addname: {value:"", validate: RED.validators.typedInput({ type: 'msg', allowBlank: true })}
         },
         inputs:1,
         outputs:1,
@@ -208,7 +208,22 @@
                 validate:RED.validators.typedInput("propertyType", false)
             },
             propertyType: { value:"msg"},
-            key: {value:"topic"},
+            key: {value:"topic", validate: (function () {
+                const typeValidator = RED.validators.typedInput({ type: 'msg' })
+                return function(v, opt) {
+                    const joinMode = $("#node-input-mode").val() || this.mode
+                    if (joinMode !== 'custom') {
+                        return true
+                    }
+                    const buildType = $("#node-input-build").val() || this.build
+                    if (buildType !== 'object') {
+                        return true
+                    } else {
+                        return typeValidator(v, opt)
+                    }
+                }
+                })()
+            },
             joiner: { value:"\\n"},
             joinerType: { value:"str"},
             accumulate: { value:"false" },

package/core/storage/10-file.html

@@ -198,7 +198,7 @@
         category: 'storage',
         defaults: {
             name: {value:""},
-            filename: {value:""},
+            filename: {value:"", validate: RED.validators.typedInput({ typeField: 'filenameType' })},
             filenameType: {value:"str"},
             appendNewline: {value:true},
             createDir: {value:false},
@@ -297,7 +297,7 @@
         category: 'storage',
         defaults: {
             name: {value:""},
-            filename: {value:""},
+            filename: {value:"", validate: RED.validators.typedInput({ typeField: 'filenameType' }) },
             filenameType: {value:"str"},
             format: {value:"utf8"},
             chunk: {value:false},

package/core/storage/10-file.js

@@ -68,6 +68,9 @@ module.exports = function(RED) {
                     node.error(err,msg);
                     return done();
                 } else {
+                    if (typeof value !== 'string' && value !== null && value !== undefined) {
+                        value = value.toString();
+                    }
                     processMsg2(msg,nodeSend,value,done);
                 }
             });
@@ -278,7 +281,6 @@ module.exports = function(RED) {
     }
     RED.nodes.registerType("file",FileNode);
 
-
     function FileInNode(n) {
         // Read a file
         RED.nodes.createNode(this,n);
@@ -314,6 +316,9 @@ module.exports = function(RED) {
                     node.error(err,msg);
                     return done();
                 } else {
+                    if (typeof value !== 'string' && value !== null && value !== undefined) {
+                        value = value.toString();
+                    }
                     processMsg2(msg, nodeSend, (value || "").replace(/\t|\r|\n/g,''), nodeDone);
                 }
             });

package/icons/arduino.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff"><path d="m9.7884 22.379c-5.2427-0.41732-9.6475 5.7885-7.4975 10.585 2.0949 5.2041 9.9782 6.6154 13.727 2.4477 3.633-3.5613 5.0332-9.0411 9.4821-11.853 4.5205-3.0872 11.797-0.172 12.68 5.3144 0.86 5.2537-4.8017 10.364-9.9231 8.8205-3.7873-0.85449-6.5051-4.0905-8.0487-7.4975-1.9019-3.2526-4.3882-6.7257-8.2693-7.6077-0.6891-0.15656-1.4003-0.21831-2.1059-0.21721z" stroke-width="3.3"/><path d="m6.7012 29.821h6.6154" stroke-width="1.4"/><path d="m26.988 29.821h5.5128m-2.8115-2.7564v5.5128" stroke-width="1.8"/></g></svg>

package/icons/bluetooth.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m8.3474 17.75 22.298 22.444-10.747 13.013v-46.497l10.747 12.428-22.298 21.859" fill="none" stroke="#fff" stroke-width="4"/></svg>

package/icons/leveldb.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m2.7078 12.986c0 7.7994-0.36386 21.569 0 32.545s35.118 9.8751 34.848 0c-0.26959-9.8751 0-24.82 0-32.545 0-7.7243-34.848-7.7995-34.848 0z" fill="none" stroke="#fff"/><g fill="#fff"><path d="m3.8741 13.406v8.955c0.021834 3.5781 19.543 5.0789 25.575 3.2543 0 0 0.02229-2.6683 0.02998-2.6673l5.5325 0.7238c0.64508 0.0844 1.1345-0.74597 1.134-1.3284v-8.573l-0.99896 0.93349-15.217-2.2765c4.5883 2.1798 9.808 4.1312 9.808 4.1312-9.3667 3.1562-25.846-0.31965-25.864-3.1525z"/><path d="m3.886 26.607v8.1052c3.2188 6.1087 29.901 5.8574 32.272 0v-8.1052c-3.3598 4.6685-29.204 5.1534-32.272 0z"/><path d="m4.0032 39.082v7.1522c2.556 7.4622 28.918 7.6072 32.272 0v-7.1522c-3.2345 4.9471-29.087 5.359-32.272 0z"/></g></svg>

package/icons/mongodb.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m23.515 13.831c-4.7594-5.8789-2.6084-5.7751-7.3474 0-8.0368 10.477-8.3322 24.431 2.5476 32.935 0.13181 2.0418 0.46056 4.9803 0.46056 4.9803h1.315s0.32875-2.9219 0.46017-4.9803c2.8458-2.2339 16.799-14.619 2.5641-32.935z" fill="#fff"/></svg>

package/icons/mouse.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="3"><path d="m6 30c6 5 24 4 29-0.07"/><path d="m21 33 0.1-19c0.02-4 4-3 4-6s-4-2-4-5"/><path d="m6 22c0-11 29-10 29 0v21c0 18-29 19-29 0s4e-7 -11 0-21z"/></g></svg>

package/icons/rbe.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m29 12s0.1 30 0.05 31-3 5-7 5-19 0.04-19 0.04c6-4 9-5 17-5 0 0 4-0.1 4-2 0-2 8e-3 -29 8e-3 -29z" fill="#fff"/><path d="m12 47s-0.1-30-0.05-31 3-5 7-5 19-0.04 19-0.04c-6 4-9 5-17 5 0 0-4 0.1-4 2 0 2-8e-3 29-8e-3 29z" fill="#fff"/></svg>

package/icons/redis.svg

@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="3"><path class="cls-4" d="m17.639 30.221c-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 1.9117-0.81145 12.643-5.3861 14.91-6.2738 2.2675-0.8877 3.0517-0.91493 4.9785-0.14704 1.9267 0.76789 12.026 5.1329 13.923 5.8898 1.8966 0.75699 1.9843 1.386 0.02631 2.4861-1.958 1.1001-12.1 5.6611-14.285 6.8729s-3.355 1.2091-5.0636 0.32685z"/><path class="cls-4" d="m32.23 25.251c2.8239 1.2039 4.155 1.764 4.7307 1.9938 1.8966 0.75699 1.9843 1.386 0.0263 2.4861s-12.1 5.6611-14.285 6.8729c-2.1848 1.2117-3.3548 1.209-5.0634 0.32676-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 10.883-4.6196-9.1087 3.8612 4.9598-2.1076"/><path class="cls-4" d="m32.23 31.961c2.8239 1.2039 4.155 1.764 4.7307 1.9938 1.8966 0.75699 1.9843 1.386 0.0263 2.4861s-12.1 5.6611-14.285 6.8729c-2.1848 1.2117-3.3548 1.209-5.0634 0.32676-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 10.883-4.6196-9.1087 3.8612 4.9598-2.1076"/></g></svg>

package/locales/de/function/10-function.html

@@ -25,7 +25,7 @@
     <p>Wenn ein promise-Objekt aus dem Start-Code zurückgegeben wird,
        beginnt danach die reguläre Verarbeitung der Eingangsnachrichten.</p>
     <h3>Details</h3>
-    <p>Siehe  <a target="_blank" href="http://nodered.org/docs/writing-functions.html">Onlinedokumentation</a>
+    <p>Siehe  <a target="_blank" href="https://nodered.org/docs/writing-functions.html">Onlinedokumentation</a>
        für weitere Informationen zum Schreiben von Funktionen.</p>
     <h4><b>Nachrichten senden</b></h4>
     <p>Die Funktion kann die Nachrichten zurückgeben, die sie an die nächsten Nodes im Flow weitergeben möchte,

package/locales/en-US/function/10-function.html

@@ -26,7 +26,7 @@
     <p>If the On Start code returns a Promise object, the node will not start handling messages
         until the promise is resolved.</p>
     <h3>Details</h3>
-    <p>See the <a target="_blank" href="http://nodered.org/docs/writing-functions.html">online documentation</a>
+    <p>See the <a target="_blank" href="https://nodered.org/docs/writing-functions.html">online documentation</a>
     for more information on writing functions.</p>
     <h4>Sending messages</h4>
     <p>The function can either return the messages it wants to pass on to the next nodes

package/locales/fr/common/20-inject.html

@@ -36,5 +36,5 @@
 <p><b>Remarque</b> : Les options <i>"Intervalle entre les heures"</i> et <i>"à une heure précise"</i> utilisent le système cron standard.
   Cela signifie que pour la première option, vous pouvez envoyer un message à intervalle régulier entre les heures voulues.
   Si vous voulez envoyer un message toutes les minutes à partir de maintenant, utiliser l'option <i>"intervalle"</i>.</p>
-<p><b>Remarque</b> : Pour inclure une nouvelle ligne dans une chaîne, vous devez utiliser un noeud de fonction pour créer la charge utile.</p>
+<p><b>Remarque</b> : Pour inclure une nouvelle ligne dans une chaîne, vous devez utiliser soit un noeud de fonction soit le noeud template pour créer la charge utile.</p>
 </script>

package/locales/fr/function/10-function.html

@@ -26,7 +26,7 @@
     <p>Si le code 'Au démarrage' renvoie un objet Promise (promesse), le noeud ne commencera pas à gérer les messages
       jusqu'à ce que la promesse soit résolue.</p>
     <h3>Détails</h3>
-    <p>Voir la <a target="_blank" href="http://nodered.org/docs/writing-functions.html">documentation en ligne</a>
+    <p>Voir la <a target="_blank" href="https://nodered.org/docs/writing-functions.html">documentation en ligne</a>
       pour plus d'informations sur les fonctions d'écriture.</p>
     <h4>Envoi de messages</h4>
     <p>La fonction peut envoyer les messages qu'elle souhaite transmettre aux noeuds suivants