@node-red/nodes 3.1.0 → 3.1.1

package/core/network/10-mqtt.js

@@ -104,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);
     }
 
@@ -219,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");
@@ -451,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) {
@@ -611,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) {
@@ -865,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) => {
@@ -905,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
@@ -933,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 || {})
@@ -947,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);
@@ -957,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
@@ -1004,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) {
@@ -1091,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/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/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>