@node-red/nodes 2.2.2 → 2.2.3

package/core/common/20-inject.js

@@ -109,9 +109,10 @@ module.exports = function(RED) {
                 if (!property) return;
 
                 if (valueType === "jsonata") {
-                    if (p.exp) {
+                    if (p.v) {
                         try {
-                            var val = RED.util.evaluateJSONataExpression(p.exp, msg);
+                            var exp = RED.util.prepareJSONataExpression(p.v, node);
+                            var val = RED.util.evaluateJSONataExpression(exp, msg);
                             RED.util.setMessageProperty(msg, property, val, true);
                         }
                         catch  (err) {

package/core/common/21-debug.js

@@ -108,7 +108,9 @@ module.exports = function(RED) {
             }
         })
         this.on("input", function(msg, send, done) {
-            if (hasOwnProperty.call(msg, "status") && hasOwnProperty.call(msg.status, "source") && hasOwnProperty.call(msg.status.source, "id") && (msg.status.source.id === node.id)) {
+            if (hasOwnProperty.call(msg, "status") && msg.status &&
+                hasOwnProperty.call(msg.status, "source") && msg.status.source &&
+                hasOwnProperty.call(msg.status.source, "id") && (msg.status.source.id === node.id)) {
                 done();
                 return;
             }
@@ -129,7 +131,8 @@ module.exports = function(RED) {
                             fill = "red";
                             st = msg.error.message;
                         }
-                        if (hasOwnProperty.call(msg, "status")) {
+                        if (hasOwnProperty.call(msg, "status") &&
+                           msg.status) {
                             fill = msg.status.fill || "grey";
                             shape = msg.status.shape || "ring";
                             st = msg.status.text || "";

package/core/function/10-function.html

@@ -399,7 +399,7 @@
                     $("#func-tabs-content").children().hide();
                     $("#" + tab.id).show();
                     let editor = $("#" + tab.id).find('.monaco-editor').first();
-                   	if(editor.length) {
+                        if(editor.length) {
                         if(that.editor.nodered && that.editor.type == "monaco") {
                             that.editor.nodered.refreshModuleLibs(getLibsList());
                         }

package/core/function/15-change.js

@@ -168,9 +168,9 @@ module.exports = function(RED) {
                         return getFromValueType(RED.util.getMessageProperty(msg,rule.from),done);
                     } else if (rule.fromt === 'flow' || rule.fromt === 'global') {
                         var contextKey = RED.util.parseContextStore(rule.from);
-                        if (/\[msg\./.test(context.key)) {
+                        if (/\[msg\./.test(contextKey.key)) {
                             // The key has a nest msg. reference to evaluate first
-                            context.key = RED.util.normalisePropertyExpression(contextKey.key,msg,true);
+                            contextKey.key = RED.util.normalisePropertyExpression(contextKey.key,msg,true);
                         }
                         node.context()[rule.fromt].get(contextKey.key, contextKey.store, (err,fromValue) => {
                             if (err) {

package/core/function/89-delay.js

@@ -275,18 +275,22 @@ module.exports = function(RED) {
                     if (msg.hasOwnProperty("flush")) {
                         var len = node.buffer.length;
                         if (typeof(msg.flush) == 'number') { len = Math.min(Math.floor(msg.flush),len); }
-                        while (len > 0) {
-                            const msgInfo = node.buffer.shift();
-                            if (Object.keys(msgInfo.msg).length > 1) {
-                                node.send(msgInfo.msg);
-                                msgInfo.done();
-                            }
-                            len = len - 1;
-                        }
-                        if (node.buffer.length === 0) {
+                        if (len === 0) {
                             clearInterval(node.intervalID);
                             node.intervalID = -1;
                         }
+                        else {
+                            while (len > 0) {
+                                const msgInfo = node.buffer.shift();
+                                if (Object.keys(msgInfo.msg).length > 1) {
+                                    node.send(msgInfo.msg);
+                                    msgInfo.done();
+                                }
+                                len = len - 1;
+                            }
+                            clearInterval(node.intervalID);
+                            node.intervalID = setInterval(sendMsgFromBuffer, node.rate);
+                        }
                         node.status({fill:"blue",shape:"dot",text:node.buffer.length});
                         done();
                     }

package/core/network/10-mqtt.html

@@ -442,7 +442,17 @@
         }
         return defaultContentType || 'none'
     }
-
+    /**
+     * Test a topic string is valid for publishing
+     * @param {string} topic
+     * @returns `true` if it is a valid topic
+     */
+    function validateMQTTPublishTopic(topic, opts) {
+        if(!topic || topic == "" || !/[\+#\b\f\n\r\t\v\0]/.test(topic)) {
+            return true;
+        }
+        return RED._("node-red:mqtt.errors.invalid-topic");
+    }
     RED.nodes.registerType('mqtt-broker',{
         category: 'config',
         defaults: {
@@ -480,6 +490,7 @@
             willRetain: {value:false},
             willPayload: {value:""},
             willMsg: { value: {}},
+            userProps: { value: ""},
             sessionExpiry: {value:0}
         },
         credentials: {
@@ -609,6 +620,7 @@
                 default:  !this.userProps ? 'none':'json',
                 types: [typedInputNoneOpt, 'json']
             });
+            $("#node-config-input-userProps").typedInput('value',this.userProps);
             if (typeof this.keepalive === 'undefined') {
                 this.keepalive = 15;
                 $("#node-config-input-keepalive").val(this.keepalive);
@@ -718,6 +730,14 @@
             }
 
             if (v5) {
+                this.userProps = "";
+                const userPropsType = $("#node-config-input-userProps").typedInput("type");
+                if(userPropsType == "json") {
+                    const userProps = $("#node-config-input-userProps").val();
+                    if (userProps && typeof userProps === "string") {
+                        this.userProps = userProps.trim();
+                    }
+                }
                 this.birthMsg = saveV5Message("birth");
                 this.closeMsg = saveV5Message("close");
                 this.willMsg = saveV5Message("will");

package/core/network/10-mqtt.js

@@ -68,12 +68,21 @@ module.exports = function(RED) {
     }
 
     /**
-     * Test a topic string is valid
+     * Test a topic string is valid for subscription
      * @param {string} topic
      * @returns `true` if it is a valid topic
      */
     function isValidSubscriptionTopic(topic) {
-        return /^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/.test(topic)
+        return /^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/.test(topic);
+    }
+
+    /**
+     * Test a topic string is valid for publishing
+     * @param {string} topic
+     * @returns `true` if it is a valid topic
+     */
+    function isValidPublishTopic(topic) {
+        return !/[\+#\b\f\n\r\t\v\0]/.test(topic);
     }
 
     /**
@@ -103,7 +112,7 @@ module.exports = function(RED) {
             if(src[propName] === "true" || src[propName] === true) {
                 dst[propName] = true;
             } else if(src[propName] === "false" || src[propName] === false) {
-                dst[propName] = true;
+                dst[propName] = false;
             }
         } else {
             if(def != undefined) dst[propName] = def;
@@ -288,7 +297,7 @@ module.exports = function(RED) {
                         //TODO: delete msg.responseTopic - to prevent it being resent?
                     }
                 }
-                topicOK = topicOK && !/[\+#\b\f\n\r\t\v\0]/.test(msg.topic);
+                topicOK = topicOK && isValidPublishTopic(msg.topic);
 
                 if (topicOK) {
                     node.brokerConn.publish(msg, done); // send the message
@@ -391,6 +400,7 @@ module.exports = function(RED) {
         node.options = {};
         node.queue = [];
         node.subscriptions = {};
+        node.clientListeners = []
         /** @type {mqtt.MqttClient}*/ this.client;
         node.setOptions = function(opts, init) {
             if(!opts || typeof opts !== "object") {
@@ -415,8 +425,12 @@ module.exports = function(RED) {
             setIfHasProperty(opts, node, "topicAliasMaximum", init);
             setIfHasProperty(opts, node, "maximumPacketSize", init);
             setIfHasProperty(opts, node, "receiveMaximum", init);
-            setIfHasProperty(opts, node, "userProperties", init);//https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
-            setIfHasProperty(opts, node, "userPropertiesType", init);
+            //https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html#_Toc3901116
+            if (hasProperty(opts, "userProperties")) {
+                node.userProperties = opts.userProperties;
+            } else if (hasProperty(opts, "userProps")) {
+                node.userProperties = opts.userProps;
+            }
 
             function createLWT(topic, payload, qos, retain, v5opts, v5SubPropName) {
                 let message = undefined;
@@ -465,7 +479,7 @@ module.exports = function(RED) {
                 };
                 if(hasProperty(opts, "willTopic")) {
                     //will v5 properties must be set in the "properties" sub object
-                    node.options.will = createLWT(opts.willTopic, opts.willPayload, opts.willQos, opts.willRetain, opts.willMsg, "properies");
+                    node.options.will = createLWT(opts.willTopic, opts.willPayload, opts.willQos, opts.willRetain, opts.willMsg, "properties");
                 };
             } else {
                 //update options
@@ -525,7 +539,7 @@ module.exports = function(RED) {
                     // Only for ws or wss, check if proxy env var for additional configuration
                     if (node.brokerurl.indexOf("wss://") > -1 || node.brokerurl.indexOf("ws://") > -1) {
                         // check if proxy is set in env
-                        let prox, noprox;
+                        let prox, noprox, noproxy;
                         if (process.env.http_proxy) { prox = process.env.http_proxy; }
                         if (process.env.HTTP_PROXY) { prox = process.env.HTTP_PROXY; }
                         if (process.env.no_proxy) { noprox = process.env.no_proxy.split(","); }
@@ -652,11 +666,16 @@ module.exports = function(RED) {
                 setStatusConnecting(node, true);
                 try {
                     node.serverProperties = {};
+                    if(node.client) {
+                        //belt and braces to avoid left over clients
+                        node.client.end(true);
+                        node._clientRemoveListeners();
+                    }
                     node.client = mqtt.connect(node.brokerurl, node.options);
                     node.client.setMaxListeners(0);
-                    let callbackDone = false; //prevent re-connects causing node.client.on('connect' firing callback multiple times
+                    let callbackDone = false; //prevent re-connects causing node._clientOn('connect' firing callback multiple times
                     // Register successful connect or reconnect handler
-                    node.client.on('connect', function (connack) {
+                    node._clientOn('connect', function (connack) {
                         node.closing = false;
                         node.connecting = false;
                         node.connected = true;
@@ -688,7 +707,7 @@ module.exports = function(RED) {
                         }
                         setStatusConnected(node, true);
                         // Remove any existing listeners before resubscribing to avoid duplicates in the event of a re-connection
-                        node.client.removeAllListeners('message');
+                        node._clientRemoveListeners('message');
 
                         // Re-subscribe to stored topics
                         for (var s in node.subscriptions) {
@@ -700,7 +719,7 @@ module.exports = function(RED) {
                                     if (node.subscriptions[s].hasOwnProperty(r)) {
                                         qos = Math.max(qos,node.subscriptions[s][r].qos);
                                         _options = node.subscriptions[s][r].options;
-                                        node.client.on('message',node.subscriptions[s][r].handler);
+                                        node._clientOn('message',node.subscriptions[s][r].handler);
                                     }
                                 }
                                 _options.qos = _options.qos || qos;
@@ -713,11 +732,11 @@ module.exports = function(RED) {
                             node.publish(node.birthMessage);
                         }
                     });
-                    node.client.on("reconnect", function() {
+                    node._clientOn("reconnect", function() {
                         setStatusConnecting(node, true);
                     });
                     //Broker Disconnect - V5 event
-                    node.client.on("disconnect", function(packet) {
+                    node._clientOn("disconnect", function(packet) {
                         //Emitted after receiving disconnect packet from broker. MQTT 5.0 feature.
                         const rc = (packet && packet.properties && packet.reasonCode) || packet.reasonCode;
                         const rs = packet && packet.properties && packet.properties.reasonString || "";
@@ -731,7 +750,7 @@ module.exports = function(RED) {
                         setStatusDisconnected(node, true);
                     });
                     // Register disconnect handlers
-                    node.client.on('close', function () {
+                    node._clientOn('close', function () {
                         if (node.connected) {
                             node.connected = false;
                             node.log(RED._("mqtt.state.disconnected",{broker:(node.clientid?node.clientid+"@":"")+node.brokerurl}));
@@ -743,39 +762,59 @@ module.exports = function(RED) {
 
                     // Register connect error handler
                     // The client's own reconnect logic will take care of errors
-                    node.client.on('error', function (error) {
+                    node._clientOn('error', function (error) {
                     });
                 }catch(err) {
                     console.log(err);
                 }
             }
         };
+
         node.disconnect = function (callback) {
-            const _callback = function (resetNodeConnectedState) {
-                setStatusDisconnected(node, true);
-                if(resetNodeConnectedState) {
-                    node.closing = true;
-                    node.connecting = false;
-                    node.connected = false;
+            const _callback = function () {
+                if(node.connected || node.connecting) {
+                    setStatusDisconnected(node, true);
                 }
+                if(node.client) { node._clientRemoveListeners(); }
+                node.connecting = false;
+                node.connected = false;
                 callback && typeof callback == "function" && callback();
             };
+            if(!node.client) { return _callback(); }
+            if(node.closing) { return _callback(); }
 
-            if(node.closing) {
-                return _callback(false);
-            }
-            var endCallBack = function endCallBack() {
-            }
+            let waitEnd = (client, ms) => {
+                return new Promise( (resolve, reject) => {
+                    node.closing = true;
+                    if(!client) { 
+                        resolve();
+                     } else {
+                        const t = setTimeout(() => {
+                            //clean end() has exceeded WAIT_END, lets force end!
+                            client && client.end(true);
+                            reject();
+                        }, ms);
+                        client.end(() => {
+                             clearTimeout(t);
+                             resolve()
+                         });
+                     }
+                });
+            };
             if(node.connected && node.closeMessage) {
                 node.publish(node.closeMessage, function (err) {
-                    node.client.end(endCallBack);
-                    _callback(true);
+                    waitEnd(node.client, 2000).then(() => {
+                        _callback();
+                    }).catch((e) => {
+                        _callback();
+                    })
                 });
-            } else if(node.connected) {
-                node.client.end(endCallBack);
-                _callback(true);
             } else {
-                _callback(false);
+                waitEnd(node.client, 2000).then(() => {
+                    _callback();
+                }).catch((e) => {
+                    _callback();
+                })
             }
         }
         node.subscriptionIds = {};
@@ -812,7 +851,7 @@ module.exports = function(RED) {
             };
             node.subscriptions[topic][ref] = sub;
             if (node.connected) {
-                node.client.on('message',sub.handler);
+                node._clientOn('message',sub.handler);
                 node.client.subscribe(topic, options);
             }
         };
@@ -823,7 +862,7 @@ module.exports = function(RED) {
             if (sub) {
                 if (sub[ref]) {
                     if(node.client) {
-                        node.client.removeListener('message',sub[ref].handler);
+                        node._clientRemoveListeners('message',sub[ref].handler);
                     }
                     delete sub[ref];
                 }
@@ -857,8 +896,18 @@ module.exports = function(RED) {
                     qos: msg.qos || 0,
                     retain: msg.retain || false
                 };
+                let topicOK = hasProperty(msg, "topic") && (typeof msg.topic === "string") && (isValidPublishTopic(msg.topic));
                 //https://github.com/mqttjs/MQTT.js/blob/master/README.md#mqttclientpublishtopic-message-options-callback
                 if(node.options.protocolVersion == 5) {
+                    const bsp = node.serverProperties || {};
+                    if (msg.userProperties && typeof msg.userProperties !== "object") {
+                        delete msg.userProperties;
+                    }
+                    if (hasProperty(msg, "topicAlias") && !isNaN(Number(msg.topicAlias))) {
+                        msg.topicAlias = parseInt(msg.topicAlias);
+                    } else {
+                        delete msg.topicAlias;
+                    }
                     options.properties = options.properties || {};
                     setStrProp(msg, options.properties, "responseTopic");
                     setBufferProp(msg, options.properties, "correlationData");
@@ -868,31 +917,75 @@ module.exports = function(RED) {
                     setIntProp(msg, options.properties, "topicAlias", 1, node.serverProperties.topicAliasMaximum || 0);
                     setBoolProp(msg, options.properties, "payloadFormatIndicator");
                     //FUTURE setIntProp(msg, options.properties, "subscriptionIdentifier", 1, 268435455);
-                    if (options.properties.topicAlias) {
-                        if (!node.topicAliases.hasOwnProperty(options.properties.topicAlias) && msg.topic == "") {
+
+                    //check & sanitise topic
+                    if (topicOK && options.properties.topicAlias) {
+                        let aliasValid = (bsp.topicAliasMaximum && bsp.topicAliasMaximum >= options.properties.topicAlias);
+                        if (!aliasValid) {
                             done("Invalid topicAlias");
                             return
                         }
                         if (node.topicAliases[options.properties.topicAlias] === msg.topic) {
-                            msg.topic = ""
+                            msg.topic = "";
                         } else {
-                            node.topicAliases[options.properties.topicAlias] = msg.topic
+                            node.topicAliases[options.properties.topicAlias] = msg.topic;
                         }
+                    } else if (!msg.topic && options.properties.responseTopic) {
+                        msg.topic = msg.responseTopic;
+                        topicOK = isValidPublishTopic(msg.topic);
+                        delete msg.responseTopic; //prevent responseTopic being resent?
                     }
                 }
 
-                node.client.publish(msg.topic, msg.payload, options, function(err) {
-                    done && done(err);
-                    return
-                });
+                if (topicOK) {
+                    node.client.publish(msg.topic, msg.payload, options, function(err) {
+                        done && done(err);
+                        return
+                    });
+                } else {
+                    const error = new Error(RED._("mqtt.errors.invalid-topic"));
+                    error.warn = true;
+                    done(error);
+                }
             }
         };
 
         node.on('close', function(done) {
-            node.closing = true;
-            node.disconnect(done);
+            node.disconnect(function() {
+                done();
+            });
         });
 
+        /**
+         * Add event handlers to the MQTT.js client and track them so that
+         * we do not remove any handlers that the MQTT client uses internally.  
+         * Use {@link node._clientRemoveListeners `node._clientRemoveListeners`} to remove handlers
+         * @param {string} event The name of the event
+         * @param {function} handler The handler for this event
+         */
+         node._clientOn = function(event, handler) {
+            node.clientListeners.push({event, handler})
+            node.client.on(event, handler)
+        } 
+
+        /**
+         * Remove event handlers from the MQTT.js client & only the events 
+         * that we attached in {@link node._clientOn `node._clientOn`}.  
+         * * If `event` is omitted, then all events matching `handler` are removed
+         * * If `handler` is omitted, then all events named `event` are removed
+         * * If both parameters are omitted, then all events are removed
+         * @param {string} [event] The name of the event (optional)
+         * @param {function} [handler] The handler for this event (optional)
+         */
+         node._clientRemoveListeners = function(event, handler) {
+            node.clientListeners = node.clientListeners.filter((l) => {
+                if (event && event !== l.event) { return true; }
+                if (handler && handler !== l.handler) { return true; }
+                node.client.removeListener(l.event, l.handler)
+                return false; //found and removed, filter out this one
+            })
+        }
+
     }
 
     RED.nodes.registerType("mqtt-broker",MQTTBrokerNode,{
@@ -1067,6 +1160,7 @@ module.exports = function(RED) {
                         node.brokerConn.unsubscribe(node.topic,node.id, removed);
                     }
                     node.brokerConn.deregister(node, done);
+                    node.brokerConn = null;
                 } else {
                     done();
                 }
@@ -1131,6 +1225,7 @@ module.exports = function(RED) {
             node.on('close', function(done) {
                 if (node.brokerConn) {
                     node.brokerConn.deregister(node,done);
+                    node.brokerConn = null;
                 } else {
                     done();
                 }

package/core/network/21-httprequest.html

@@ -91,6 +91,11 @@
         <label for="node-input-senderr" style="width: auto" data-i18n="httpin.senderr"></label>
     </div>
 
+    <div class="form-row">
+        <input type="checkbox" id="node-input-insecureHTTPParser" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-insecureHTTPParser", style="width: auto;" data-i18n="httpin.insecureHTTPParser"></label>
+    </div>
+
 
     <div class="form-row">
         <label for="node-input-ret"><i class="fa fa-arrow-left"></i> <span data-i18n="httpin.label.return"></span></label>
@@ -120,6 +125,7 @@
             tls: {type:"tls-config",required: false},
             persist: {value:false},
             proxy: {type:"http proxy",required: false},
+            insecureHTTPParser: {value: false},
             authType: {value: ""},
             senderr: {value: false}
         },
@@ -224,6 +230,12 @@
             } else {
                 $("#node-input-useProxy").prop("checked", false);
             }
+
+            if (node.insecureHTTPParser) {
+                $("node-intput-insecureHTTPParser").prop("checked", true)
+            } else {
+                $("node-intput-insecureHTTPParser").prop("checked", false)
+            }
             updateProxyOptions();
             $("#node-input-useProxy").on("click", function() {
                 updateProxyOptions();

package/core/network/21-httprequest.js

@@ -214,6 +214,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                 delete options.headers[h];
                             }
                         })
+
+                        if (node.insecureHTTPParser) {
+                            options.insecureHTTPParser = true
+                        }
                     }
                 ],
                 beforeRedirect: [

package/core/network/22-websocket.js

@@ -35,8 +35,6 @@ module.exports = function(RED) {
         }
     }
     var listenerNodes = {};
-    var activeListenerNodes = 0;
-
 
     // A node red node that sets up a local websocket server
     function WebSocketListenerNode(n) {
@@ -166,7 +164,6 @@ module.exports = function(RED) {
         }
 
         if (node.isServer) {
-            activeListenerNodes++;
             if (!serverUpgradeAdded) {
                 RED.server.on('upgrade', handleServerUpgrade);
                 serverUpgradeAdded = true
@@ -210,7 +207,7 @@ module.exports = function(RED) {
             startconn(); // start outbound connection
         }
 
-        node.on("close", function() {
+        node.on("close", function(done) {
             if (node.heartbeatInterval) {
                 clearInterval(node.heartbeatInterval);
             }
@@ -218,19 +215,25 @@ module.exports = function(RED) {
                 delete listenerNodes[node.fullPath];
                 node.server.close();
                 node._inputNodes = [];
-                activeListenerNodes--;
-                // if (activeListenerNodes === 0 && serverUpgradeAdded) {
-                //     RED.server.removeListener('upgrade', handleServerUpgrade);
-                //     serverUpgradeAdded = false;
-                // }
             }
             else {
                 node.closing = true;
                 node.server.close();
-                if (node.tout) {
-                    clearTimeout(node.tout);
-                    node.tout = null;
-                }
+                //wait 20*50 (1000ms max) for ws to close. 
+                //call done when readyState === ws.CLOSED (or 1000ms, whichever comes fist)
+                const closeMonitorInterval = 20;
+                let closeMonitorCount = 50;
+                let si = setInterval(() => {
+                    if(node.server.readyState === ws.CLOSED || closeMonitorCount <= 0) {
+                        if (node.tout) {
+                            clearTimeout(node.tout);
+                            node.tout = null;
+                        }
+                        clearInterval(si);
+                        return done();
+                    }
+                    closeMonitorCount--;
+                }, closeMonitorInterval);
             }
         });
     }

package/core/network/31-tcpin.js

@@ -135,7 +135,7 @@ module.exports = function(RED) {
                             buffer = buffer+data;
                             var parts = buffer.split(node.newline);
                             for (var i = 0; i<parts.length-1; i+=1) {
-                                msg = {topic:node.topic, payload:parts[i] + node.newline.trimEnd()};
+                                msg = {topic:node.topic, payload:parts[i]};
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -229,7 +229,7 @@ module.exports = function(RED) {
                             buffer = buffer+data;
                             var parts = buffer.split(node.newline);
                             for (var i = 0; i<parts.length-1; i+=1) {
-                                msg = {topic:node.topic, payload:parts[i] + node.newline.trimEnd(), ip:socket.remoteAddress, port:socket.remotePort};
+                                msg = {topic:node.topic, payload:parts[i], ip:socket.remoteAddress, port:socket.remotePort};
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -432,7 +432,7 @@ module.exports = function(RED) {
             });
         }
         else {
-            var connectedSockets = [];
+            const connectedSockets = new Set();
             node.status({text:RED._("tcpin.status.connections",{count:0})});
             let srv = net;
             let connOpts;
@@ -453,16 +453,16 @@ module.exports = function(RED) {
                 });
                 socket.on('close',function() {
                     node.log(RED._("tcpin.status.connection-closed",{host:socket.remoteAddress, port:socket.remotePort}));
-                    connectedSockets.splice(connectedSockets.indexOf(socket),1);
-                    node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});
+                    connectedSockets.delete(socket);
+                    node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.size})});
                 });
                 socket.on('error',function() {
                     node.log(RED._("tcpin.errors.socket-error",{host:socket.remoteAddress, port:socket.remotePort}));
-                    connectedSockets.splice(connectedSockets.indexOf(socket),1);
-                    node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});
+                    connectedSockets.delete(socket);
+                    node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.size})});
                 });
-                connectedSockets.push(socket);
-                node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});
+                connectedSockets.add(socket);
+                node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.size})});
             });
 
             node.on("input", function(msg, nodeSend, nodeDone) {
@@ -475,10 +475,10 @@ module.exports = function(RED) {
                     } else {
                         buffer = Buffer.from(""+msg.payload);
                     }
-                    for (var i = 0; i < connectedSockets.length; i += 1) {
-                        if (node.doend === true) { connectedSockets[i].end(buffer); }
-                        else { connectedSockets[i].write(buffer); }
-                    }
+                    connectedSockets.forEach(soc => {
+                        if (node.doend === true) { soc.end(buffer); }
+                        else { soc.write(buffer); }
+                    })
                 }
                 nodeDone();
             });
@@ -495,12 +495,10 @@ module.exports = function(RED) {
                 } else {
                     node.log(RED._("tcpin.status.listening-port",{port:node.port}));
                     node.on('close', function() {
-                        for (var c in connectedSockets) {
-                            if (connectedSockets.hasOwnProperty(c)) {
-                                connectedSockets[c].end();
-                                connectedSockets[c].unref();
-                            }
-                        }
+                        connectedSockets.forEach(soc => {
+                            soc.end();
+                            soc.unref();
+                        })
                         server.close();
                         node.log(RED._("tcpin.status.stopped-listening",{port:node.port}));
                     });

package/core/parsers/70-CSV.js

@@ -89,6 +89,9 @@ module.exports = function(RED) {
                                     else if (msg.payload[s][t].toString().indexOf(node.sep) !== -1) { // add quotes if any "commas"
                                         msg.payload[s][t] = node.quo + msg.payload[s][t].toString() + node.quo;
                                     }
+                                    else if (msg.payload[s][t].toString().indexOf("\n") !== -1) { // add quotes if any "\n"
+                                        msg.payload[s][t] = node.quo + msg.payload[s][t].toString() + node.quo;
+                                    }
                                 }
                                 ou += msg.payload[s].join(node.sep) + node.ret;
                             }
@@ -112,7 +115,7 @@ module.exports = function(RED) {
                                                     q = q.replace(/"/g, '""');
                                                     ou += node.quo + q + node.quo + node.sep;
                                                 }
-                                                else if (q.indexOf(node.sep) !== -1) { // add quotes if any "commas"
+                                                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;
                                                 }
                                                 else { ou += q + node.sep; } // otherwise just add
@@ -134,7 +137,7 @@ module.exports = function(RED) {
                                                 p = p.replace(/"/g, '""');
                                                 ou += node.quo + p + node.quo + node.sep;
                                             }
-                                            else if (p.indexOf(node.sep) !== -1) { // add quotes if any "commas"
+                                            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;
                                             }
                                             else { ou += p + node.sep; } // otherwise just add

package/core/parsers/70-JSON.html

@@ -21,7 +21,7 @@
         <label style="width:100%;"><span data-i18n="json.label.o2j"></span></label>
     </div>
     <div class="form-row node-json-to-json-options" style="padding-left: 20px;">
-        <input style="width:20px; vertical-align:top; margin-right: 5px;" type="checkbox" id="node-input-pretty"><label style="width: auto;" for="node-input-pretty" data-i18n="json.label.pretty"></span>
+        <input style="width:20px; vertical-align:top; margin-right: 5px;" type="checkbox" id="node-input-pretty"><label style="width: auto;" for="node-input-pretty" data-i18n="json.label.pretty"></label>
     </div>
 </script>
 

package/core/sequence/17-split.js

@@ -314,11 +314,13 @@ module.exports = function(RED) {
                         if (err) {
                             return done(err);
                         }
-                        msgInfo.send({payload: result});
+                        msgInfo.msg.payload = result;
+                        msgInfo.send(msgInfo.msg);
                         done();
                     });
                 } else {
-                    msgInfo.send({payload: result});
+                    msgInfo.msg.payload = result;
+                    msgInfo.send(msgInfo.msg);
                     done();
                 }
             } else {

package/core/sequence/19-batch.html

@@ -47,7 +47,7 @@
         <div class="form-row">
             <input type="checkbox" id="node-input-allowEmptySequence" style="margin-left:20px; margin-right: 10px; vertical-align:top; width:auto;">
             <label for="node-input-allowEmptySequence" style="width:auto;" data-i18n="batch.interval.empty"></label>
-	</div>
+        </div>
     </div>
 
     <div class="node-row-msg-concat">

package/examples/function/delay/06 - Simple Queue with release

@@ -0,0 +1,149 @@
+[
+    {
+        "id": "48d660b3a4109400",
+        "type": "inject",
+        "z": "9e5f48c16729e4f0",
+        "name": "inject",
+        "props": [
+            {
+                "p": "payload"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 185,
+        "y": 795,
+        "wires": [
+            [
+                "e0f9e206681f3504"
+            ]
+        ]
+    },
+    {
+        "id": "e0f9e206681f3504",
+        "type": "delay",
+        "z": "9e5f48c16729e4f0",
+        "name": "",
+        "pauseType": "rate",
+        "timeout": "5",
+        "timeoutUnits": "seconds",
+        "rate": "1",
+        "nbRateUnits": "30",
+        "rateUnits": "second",
+        "randomFirst": "1",
+        "randomLast": "5",
+        "randomUnits": "seconds",
+        "drop": false,
+        "allowrate": false,
+        "outputs": 1,
+        "x": 430,
+        "y": 795,
+        "wires": [
+            [
+                "e470f1d794e1bef9",
+                "af7cea1dfb797a75"
+            ]
+        ]
+    },
+    {
+        "id": "943543cf7a1958e4",
+        "type": "change",
+        "z": "9e5f48c16729e4f0",
+        "name": "set flush to 1",
+        "rules": [
+            {
+                "t": "set",
+                "p": "flush",
+                "pt": "msg",
+                "to": "1",
+                "tot": "num"
+            },
+            {
+                "t": "delete",
+                "p": "payload",
+                "pt": "msg"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 510,
+        "y": 915,
+        "wires": [
+            [
+                "e0f9e206681f3504"
+            ]
+        ]
+    },
+    {
+        "id": "e470f1d794e1bef9",
+        "type": "function",
+        "z": "9e5f48c16729e4f0",
+        "name": "Do something that takes a few seconds",
+        "func": "\n//send on the message between 3 and 6 seconds later\nsetTimeout(\n    function() { \n        node.send(msg) \n    }, \n    Math.random() * 3000 + 3000\n);\nreturn null;",
+        "outputs": 1,
+        "noerr": 0,
+        "initialize": "",
+        "finalize": "",
+        "libs": [],
+        "x": 760,
+        "y": 795,
+        "wires": [
+            [
+                "943543cf7a1958e4",
+                "859258551b8389b7"
+            ]
+        ]
+    },
+    {
+        "id": "af7cea1dfb797a75",
+        "type": "debug",
+        "z": "9e5f48c16729e4f0",
+        "name": "IN",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 710,
+        "y": 735,
+        "wires": []
+    },
+    {
+        "id": "859258551b8389b7",
+        "type": "debug",
+        "z": "9e5f48c16729e4f0",
+        "name": "OUT",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "payload",
+        "targetType": "msg",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 895,
+        "y": 735,
+        "wires": []
+    },
+    {
+        "id": "ecaaf26326da10ee",
+        "type": "comment",
+        "z": "9e5f48c16729e4f0",
+        "name": "Simple Queue with release",
+        "info": "This example shows how to use a delay node set to rate limit mode as a simple queue to feed a\nprocess that may take some time to complete. Once that process completes the feedback is then\nset to flush out the next message - thus running the \"loop\" as fast as possible with no overlaps.\n\n**Note**: only the `msg.flush` property msut be set - otherwise the other properties that are fed \nback will be added as another new message to the queue.",
+        "x": 235,
+        "y": 915,
+        "wires": []
+    }
+]

package/locales/en-US/messages.json

@@ -525,7 +525,8 @@
         },
         "status": {
             "requesting": "requesting"
-        }
+        },
+        "insecureHTTPParser": "Disable strict HTTP parsing"
     },
     "websocket": {
         "label": {

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

@@ -28,7 +28,7 @@
     <p>返却/sendの対象は次のとおりです:</p>
     <ul>
       <li>単一メッセージオブジェクト - 最初の出力に接続されたノードに渡されます</li>
-      <li>メッセージオブジェクトの配列 - 対応する出力に接続されたノードに渡されます</li>          
+      <li>メッセージオブジェクトの配列 - 対応する出力に接続されたノードに渡されます</li>
     </ul>
     <p>注: 初期化処理の実行はノードの初期化中に行われます。そのため、初期化処理タブにsendを記述した場合に後続ノードでメッセージを受け取れないことがあります。</p>
     <p>配列要素が配列の場合には、複数のメッセージを対応する出力に送出します。</p>

package/locales/ja/network/10-mqtt.html

@@ -89,7 +89,7 @@
        <dt class="optional">userProperties <span class="property-type">オブジェクト</span></dt>
        <dd><b>MQTTv5</b>: メッセージのユーザプロパティ</dd>
        <dt class="optional">messageExpiryInterval <span class="property-type">数値</span></dt>
-       <dd><b>MQTTv5</b>: 秒単位のメッセージの有効期限</dd>   
+       <dd><b>MQTTv5</b>: 秒単位のメッセージの有効期限</dd>
        <dt class="optional">topicAlias <span class="property-type">数値</span></dt>
        <dd><b>MQTTv5</b>: 使用するMQTTトピックエイリアス</dd>
     </dl>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "2.2.2",
+    "version": "2.2.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",