@node-red/nodes 2.2.2 → 3.0.0-beta.3

package/core/function/80-template.html

@@ -18,7 +18,7 @@
                 <option value="handlebars">mustache</option>
                 <option value="html">HTML</option>
                 <option value="json">JSON</option>
-                <option value="javascript">Javascript</option>
+                <option value="javascript">JavaScript</option>
                 <option value="css">CSS</option>
                 <option value="markdown">Markdown</option>
                 <option value="python">Python</option>
@@ -56,7 +56,9 @@
         category: 'function',
         defaults: {
             name: {value:""},
-            field: {value:"payload", validate:RED.validators.typedInput("fieldType")},
+            field: {value:"payload",
+                    label:"payload",
+                    validate:RED.validators.typedInput("fieldType", false)},
             fieldType: {value:"msg"},
             format: {value:"handlebars"},
             syntax: {value:"mustache"},
@@ -73,7 +75,8 @@
             return this.name?"node_label_italic":"";
         },
         oneditprepare: function() {
-            var that = this;
+            const that = this;
+            const stateId = RED.editor.generateViewStateId("node", this, "");
             if (!this.field) {
                 this.field = 'payload';
                 $("#node-input-field").val("payload");
@@ -90,10 +93,10 @@
                 types: ['msg','flow','global'],
                 typeField: $("#node-input-fieldType")
             });
-
             this.editor = RED.editor.createEditor({
                 id: 'node-input-template-editor',
                 mode: 'ace/mode/html',
+                stateId: stateId,
                 value: $("#node-input-template").val()
             });
             RED.library.create({
@@ -103,7 +106,6 @@
                 fields:['name','format','output','syntax'],
                 ext: "txt"
             });
-            this.editor.focus();
 
             $("#node-input-format").on("change", function() {
                 var mod = "ace/mode/"+$("#node-input-format").val();
@@ -113,20 +115,22 @@
                 });
             });
             RED.popover.tooltip($("#node-template-expand-editor"), RED._("node-red:common.label.expand"));
-            $("#node-template-expand-editor").on("click", function(e) {
+            $("#node-template-expand-editor").on("click", function (e) {
                 e.preventDefault();
-                var value = that.editor.getValue();
+                const value = that.editor.getValue();
+                that.editor.saveView();
                 RED.editor.editText({
                     mode: $("#node-input-format").val(),
                     value: value,
+                    stateId: stateId,
                     width: "Infinity",
-                    cursor: that.editor.getCursorPosition(),
-                    complete: function(v,cursor) {
+                    focus: true,
+                    complete: function (v, cursor) {
                         that.editor.setValue(v, -1);
-                        that.editor.gotoLine(cursor.row+1,cursor.column,false);
-                        setTimeout(function() {
+                        setTimeout(function () {
+                            that.editor.restoreView();
                             that.editor.focus();
-                        },300);
+                        }, 250);
                     }
                 })
             })

package/core/function/89-delay.html

@@ -111,14 +111,54 @@
         defaults: {
             name: {value:""},
             pauseType: {value:"delay", required:true},
-            timeout: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
+            timeout: {
+                value:"5", required:true,
+                label:RED._("node-red:delay.label.delay"),
+                validate:function(v,opt) {
+                    if (RED.validators.number(v) && (v >= 0)) {
+                        return true;
+                    }
+                    return RED._("node-red:delay.errors.invalid-timeout");
+                }},
             timeoutUnits: {value:"seconds"},
-            rate: {value:"1", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
-            nbRateUnits: {value:"1", required:false,
-                          validate:function(v) { return v === undefined || (RED.validators.number(v) && (v >= 0)); }},
+            rate: {
+                value:"1",
+                required:true,
+                label:RED._("node-red:delay.label.rate"),
+                validate:function(v,opt) {
+                    if (RED.validators.number(v) && (v >= 0)) {
+                        return true;
+                    }
+                    return RED._("node-red:delay.errors.invalid-rate");
+                }
+            },
+            nbRateUnits: {
+                value:"1",
+                required:false,
+                validate:function(v,opt) {
+                    if (v === undefined || (RED.validators.number(v) && (v >= 0))) {
+                        return true;
+                    }
+                    return RED._("node-red:delay.errors.invalid-rate-unit");
+                }
+            },
             rateUnits: {value: "second"},
-            randomFirst: {value:"1", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
-            randomLast: {value:"5", required:true, validate:function(v) { return RED.validators.number(v) && (v >= 0); }},
+            randomFirst: {
+                value:"1", required:true,
+                validate:function(v,opt) {
+                    if (RED.validators.number(v) && (v >= 0)) {
+                        return true;
+                    }
+                    return RED._("node-red:delay.errors.invalid-random-first");
+                }},
+            randomLast: {
+                value:"5", required:true,
+                validate:function(v,opt) {
+                    if (RED.validators.number(v) && (v >= 0)) {
+                        return true;
+                    }
+                    return RED._("node-red:delay.errors.invalid-random-last");
+                }},
             randomUnits: {value: "seconds"},
             drop: {value:false},
             allowrate: {value:false},

package/core/function/89-trigger.html

@@ -87,17 +87,25 @@
         color:"#E6E0F8",
         defaults: {
             name: {value:""},
-            op1: {value:"1", validate: RED.validators.typedInput("op1type")},
-            op2: {value:"0", validate: RED.validators.typedInput("op2type")},
+            op1: {value:"1",
+                  label: RED._("node-red:trigger.send"),
+                  validate: RED.validators.typedInput("op1type", false)},
+            op2: {value:"0",
+                  label: RED._("node-red:trigger.then-send"),
+                  validate: RED.validators.typedInput("op2type", false)},
             op1type: {value:"val"},
             op2type: {value:"val"},
-            duration: {value:"250",required:true,validate:RED.validators.number()},
+            duration: {
+                value:"250", required:true,
+                label:RED._("node-red:trigger.label.duration"),
+                validate:RED.validators.number(false)},
             extend: {value:"false"},
             overrideDelay: {value:"false"},
             units: {value:"ms"},
             reset: {value:""},
             bytopic: {value:"all"},
-            topic: {value:"topic",required:true},
+            topic: {value:"topic", required:true,
+                    label:RED._("node-red:trigger.label.topic")},
             outputs: {value:1}
         },
         inputs:1,

package/core/function/rbe.html

@@ -49,12 +49,16 @@
         defaults: {
             name: {value:""},
             func: {value:"rbe"},
-            gap: {value:"",validate:RED.validators.regex(/^(\d*[.]*\d*|)(%|)$/)},
+            gap: {value:"",
+                  label: RED._("node-red:rbe.label.gap"),
+                  validate:RED.validators.regex(/^(\d*[.]*\d*|)(%|)$/)},
             start: {value:""},
             inout: {value:"out"},
             septopics: {value:true},
-            property: {value:"payload",required:true},
-            topi: {value:"topic",required:true}
+            property: {value:"payload", required:true,
+                       label:RED._("node-red:rbe.label.property")},
+            topi: {value:"topic", required:true,
+                   label:RED._("node-red:rbe.label.topic")}
         },
         inputs:1,
         outputs:1,

package/core/network/05-tls.html

@@ -83,19 +83,25 @@
         category: 'config',
         defaults: {
             name: {value:""},
-            cert: {value:"", validate: function(v) {
+            cert: {value:"", validate: function(v,opt) {
                 var currentKey = $("#node-config-input-key").val();
                 if (currentKey === undefined) {
                     currentKey = this.key;
                 }
-                return currentKey === '' || v != '';
+                if (currentKey === '' || v != '') {
+                    return true;
+                }
+                return RED._("node-red:tls.error.invalid-cert");
             }},
-            key: {value:"", validate: function(v) {
+            key: {value:"", validate: function(v,opt) {
                 var currentCert = $("#node-config-input-cert").val();
                 if (currentCert === undefined) {
                     currentCert = this.cert;
                 }
-                return currentCert === '' || v != '';
+                if (currentCert === '' || v != '') {
+                    return true;
+                }
+                return RED._("node-red:tls.error.invalid-key");
             }},
             ca: {value:""},
             certname: {value:""},

package/core/network/06-httpproxy.html

@@ -50,7 +50,16 @@
         category: 'config',
         defaults: {
             name: {value:''},
-            url: {value:'',validate:function(v) { return (v && (v.indexOf('://') !== -1) && (v.trim().indexOf('http') === 0)); }},
+            url: {
+                value:'',
+                validate:function(v, opt) {
+                    if ((v && (v.indexOf('://') !== -1) &&
+                         (v.trim().indexOf('http') === 0))) {
+                        return true;
+                    }
+                    return RED._("node-red:httpin.errors.invalid-url");
+                }
+            },
             noproxy: {value:[]}
         },
         credentials: {

package/core/network/10-mqtt.html

@@ -65,6 +65,11 @@
         /* opacity: 0.3;
         pointer-events: none; */
     }
+    .form-row.form-row-mqtt-datatype-tip > .form-tips {
+        width: calc(70% - 18px);
+        display: inline-block;
+        margin-top: -8px;
+    }
 
 </style>
 
@@ -121,6 +126,7 @@
     <div class="form-row">
         <label for="node-input-datatype"><i class="fa fa-sign-out"></i> <span data-i18n="mqtt.label.output"></span></label>
         <select id="node-input-datatype" style="width:70%;">
+            <option value="auto-detect" data-i18n="mqtt.output.auto-detect"></option>
             <option value="auto" data-i18n="mqtt.output.auto"></option>
             <option value="buffer" data-i18n="mqtt.output.buffer"></option>
             <option value="utf8" data-i18n="mqtt.output.string"></option>
@@ -128,6 +134,10 @@
             <option value="base64" data-i18n="mqtt.output.base64"></option>
         </select>
     </div>
+    <div class="form-row form-row-mqtt-datatype-tip">
+        <label> &nbsp; </label>
+        <div class="form-tips" id="mqtt-in-datatype-depreciated-tip"><span data-i18n="mqtt.label.auto-mode-depreciated"></span></div>
+    </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@@ -442,44 +452,67 @@
         }
         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: {
             name: {value:""},
             broker: {value:"",required:true},
-            port: {value:1883,required:false,validate:RED.validators.number(true)},
-            tls: {type:"tls-config",required: false},
-            clientid: {value:"", validate: function(v) {
+            port: {
+                value:1883,required:false,
+                label: RED._("node-red:mqtt.label.port"),
+                validate:RED.validators.number(true)},
+            tls: {type:"tls-config",required: false,
+                  label:RED._("node-red:mqtt.label.use-tls") },
+            clientid: {value:"", validate: function(v, opt) {
+                var ok = false;
                 if ($("#node-config-input-clientid").length) {
                     // Currently editing the node
-                    return $("#node-config-input-cleansession").is(":checked") || (v||"").length > 0;
+                    ok = $("#node-config-input-cleansession").is(":checked") || (v||"").length > 0;
                 } else {
-                    return (this.cleansession===undefined || this.cleansession) || (v||"").length > 0;
+                    ok = (this.cleansession===undefined || this.cleansession) || (v||"").length > 0;
                 }
+                if (ok) {
+                    return ok;
+                }
+                return RED._("node-red:mqtt.errors.invalid-client-id");
             }},
             autoConnect: {value: true},
             usetls: {value: false},
             verifyservercert: { value: false},
             compatmode: { value: false},
             protocolVersion: { value: 4},
-            keepalive: {value:60,validate:RED.validators.number()},
+            keepalive: {
+                value:60,
+                label: RED._("node-red:mqtt.label.keepalive"),
+                validate:RED.validators.number(false)},
             cleansession: {value: true},
-            birthTopic: {value:""},
+            birthTopic: {value:"", validate:validateMQTTPublishTopic},
             birthQos: {value:"0"},
             birthRetain: {value:false},
             birthPayload: {value:""},
             birthMsg: { value: {}},
-            closeTopic: {value:""},
+            closeTopic: {value:"", validate:validateMQTTPublishTopic},
             closeQos: {value:"0"},
             closeRetain: {value:false},
             closePayload: {value:""},
             closeMsg: { value: {}},
-            willTopic: {value:""},
+            willTopic: {value:"", validate:validateMQTTPublishTopic},
             willQos: {value:"0"},
             willRetain: {value:false},
             willPayload: {value:""},
             willMsg: { value: {}},
+            userProps: { value: ""},
             sessionExpiry: {value:0}
         },
         credentials: {
@@ -609,6 +642,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 +752,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");
@@ -740,18 +782,21 @@
             name: {value:""},
             topic: {
                 value:"",
-                validate: function(v) {
+                validate: function(v, opt) {
                     var isDynamic = this.inputs === 1;
                     var topicTypeSelect = $("#node-input-topicType");
                     if (topicTypeSelect.length) {
                         isDynamic = topicTypeSelect.val()==='dynamic'
                     }
-                    return isDynamic || ((!!v) && RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)(v));
+                    if (isDynamic || ((!!v) && RED.validators.regex(/^(#$|(\+|[^+#]*)(\/(\+|[^+#]*))*(\/(\+|#|[^+#]*))?$)/)(v))) {
+                        return true;
+                    }
+                    return RED._("node-red:mqtt.errors.invalid-topic");
                 }
             },
             qos: {value: "2"},
-            datatype: {value:"auto",required:true},
-            broker: {type:"mqtt-broker", required:true},
+            datatype: {value:"auto-detect",required:true},
+            broker: {type:"mqtt-broker", required:true, label:RED._("node-red:mqtt.label.broker")},
             // subscriptionIdentifier: {value:0},
             nl: {value:false},
             rap: {value:true},
@@ -787,6 +832,16 @@
                 $("div.form-row-mqtt5").toggleClass("form-row-mqtt5-active",!!v5);
                 $("div.form-row.form-row-mqtt-static").toggleClass("form-row-mqtt-static-disabled", !!dynamic)
             }
+
+            $("#node-input-datatype").on("change", function() {
+                if($(this).val() === "auto") {
+                    $(".form-row.form-row-mqtt-datatype-tip").show();
+                } else {
+                    $(".form-row.form-row-mqtt-datatype-tip").hide();
+                }
+            })
+            $("#node-input-datatype").trigger("change");
+
             $("#node-input-broker").on("change",function(d){
                 updateVisibility();
             });
@@ -807,7 +862,7 @@
                 $("#node-input-qos").val("2");
             }
             if (this.datatype === undefined) {
-                $("#node-input-datatype").val("auto");
+                $("#node-input-datatype").val("auto-detect");
             }
         },
         oneditsave: function() {
@@ -821,7 +876,7 @@
         category: 'network',
         defaults: {
             name: {value:""},
-            topic: {value:""},
+            topic: {value:"", validate:validateMQTTPublishTopic},
             qos: {value:""},
             retain: {value:""},
             respTopic: {value:""},
@@ -829,7 +884,8 @@
             userProps: {value:''},
             correl: {value:''},
             expiry: {value:''},
-            broker: {type:"mqtt-broker", required:true}
+            broker: {type:"mqtt-broker", required:true,
+                     label:RED._("node-red:mqtt.label.broker") }
         },
         color:"#d8bfd8",
         inputs:1,