@node-red/nodes 2.1.0-beta.2 → 2.1.3

package/core/common/20-inject.html

@@ -539,12 +539,10 @@
                     var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"})
                         .css("width","calc(70% - 30px)")
                         .appendTo(row)
-                        .typedInput({default:'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});
+                        .typedInput({default:prop.vt || 'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});
 
                     propertyName.typedInput('value',prop.p);
-
                     propertyValue.typedInput('value',prop.v);
-                    propertyValue.typedInput('type',prop.vt);
                 },
                 removable: true,
                 sortable: true
@@ -564,7 +562,7 @@
                 var topic = {
                     p:'topic',
                     v: node.topic ? node.topic : '',
-                    vt:'string'
+                    vt:'str'
                 }
                 node.props = [payload,topic];
             }
@@ -580,6 +578,11 @@
                         newProp.v =  node.topic ? node.topic : '';
                     }
                 }
+                if (newProp.vt === "string") {
+                    // Fix bug in pre 2.1 where an old Inject node might have
+                    // a migrated rule with type 'string' not 'str'
+                    newProp.vt = "str";
+                }
                 eList.editableList('addItem',newProp);
             }
 

package/core/common/60-link.html

@@ -52,7 +52,7 @@
         treeList = $("<div>")
             .css({width: "100%", height: "100%"})
             .appendTo(".node-input-link-row")
-            .treeList({})
+            .treeList({autoSelect:false})
             .on('treelistitemmouseover',function(e,item) {
                 if (item.node) {
                     item.node.highlighted = true;
@@ -157,7 +157,7 @@
     function onEditSave(node) {
         var flows = treeList.treeList('data');
         node.links = [];
-        if (node.type !== "link out" || $("node-input-mode").val() === 'link') {
+        if (node.type !== "link out" || $("#node-input-mode").val() === 'link') {
             flows.forEach(function(f) {
                 f.children.forEach(function(n) {
                     if (n.selected) {

package/core/function/10-switch.html

@@ -117,30 +117,35 @@
         return r;
     }
 
-    function createValueField(row){
-        return $('<input/>',{class:"node-input-rule-value",type:"text",style:"width: 100%;"}).appendTo(row).typedInput({default:'str',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+    function createValueField(row, defaultType){
+        return $('<input/>',{class:"node-input-rule-value",type:"text",style:"width: 100%;"}).appendTo(row)
+            .typedInput({default:defaultType||'str',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
     }
 
-    function createNumValueField(row){
-        return $('<input/>',{class:"node-input-rule-num-value",type:"text",style:"width: 100%;"}).appendTo(row).typedInput({default:'num',types:['flow','global','num','jsonata','env']});
+    function createNumValueField(row, defaultType){
+        return $('<input/>',{class:"node-input-rule-num-value",type:"text",style:"width: 100%;"}).appendTo(row)
+            .typedInput({default:defaultType||'num',types:['flow','global','num','jsonata','env']});
     }
 
     function createExpValueField(row){
-        return $('<input/>',{class:"node-input-rule-exp-value",type:"text",style:"width: 100%;"}).appendTo(row).typedInput({default:'jsonata',types:['jsonata']});
+        return $('<input/>',{class:"node-input-rule-exp-value",type:"text",style:"width: 100%;"}).appendTo(row)
+            .typedInput({default:'jsonata',types:['jsonata']});
     }
 
-    function createBtwnValueField(row){
-        return $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"width: 100%;"}).appendTo(row).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+    function createBtwnValueField(row, defaultType){
+        return $('<input/>',{class:"node-input-rule-btwn-value",type:"text",style:"width: 100%;"}).appendTo(row)
+                .typedInput({default:defaultType||'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
     }
 
-    function createBtwnValue2Field(row3, andLabel){
+    function createBtwnValue2Field(row3, andLabel, defaultType){
         $('<div/>',{class:"node-input-rule-btwn-label", style:"width: 120px; text-align: right;"}).text(" "+andLabel+" ").appendTo(row3);
         var row3InputCell = $('<div/>',{style:"flex-grow:1; margin-left: 5px;"}).appendTo(row3);
-        return $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"width: 100%"}).appendTo(row3InputCell).typedInput({default:'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
+        return $('<input/>',{class:"node-input-rule-btwn-value2",type:"text",style:"width: 100%"}).appendTo(row3InputCell)
+            .typedInput({default:defaultType||'num',types:['msg','flow','global','str','num','jsonata','env',previousValueType]});
     }
 
-    function createTypeValueField(){
-        return $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"width: 100%;"}).appendTo(row).typedInput({default:'string',types:[
+    function createTypeValueField(row, defaultType){
+        return $('<input/>',{class:"node-input-rule-type-value",type:"text",style:"width: 100%;"}).appendTo(row).typedInput({default:defaultType || 'string',types:[
             {value:"string",label:RED._("common.type.string"),hasValue:false,icon:"red/images/typedInput/az.png"},
             {value:"number",label:RED._("common.type.number"),hasValue:false,icon:"red/images/typedInput/09.png"},
             {value:"boolean",label:RED._("common.type.boolean"),hasValue:false,icon:"red/images/typedInput/bool.png"},
@@ -211,6 +216,7 @@
                             var lastRule = $("#node-input-rule-container").editableList('getItemAt',i-1);
                             var exportedRule = exportRule(lastRule.element);
                             opt.r.vt = exportedRule.vt;
+                            opt.r.v = "";
                             // We could copy the value over as well and preselect it (see the 'activeElement' code below)
                             // But not sure that feels right. Is copying over the last value 'expected' behaviour?
                             // It would make sense for an explicit 'copy' action, but not sure where the copy button would
@@ -278,24 +284,12 @@
                     selectField.on("change", function() {
                         var fieldToFocus;
                         var type = selectField.val();
-                        if (valueField){
-                            valueField.typedInput('hide');
-                        }
-                        if (expValueField){
-                            expValueField.typedInput('hide');
-                        }
-                        if (numValueField){
-                            numValueField.typedInput('hide');
-                        }
-                        if (typeValueField){
-                            typeValueField.typedInput('hide');
-                        }
-                        if (btwnValueField){
-                            btwnValueField.typedInput('hide');
-                        }
-                        if (btwnValue2Field){
-                            btwnValue2Field.typedInput('hide');
-                        }
+                        if (valueField) { valueField.typedInput('hide'); }
+                        if (expValueField) { expValueField.typedInput('hide'); }
+                        if (numValueField) { numValueField.typedInput('hide'); }
+                        if (typeValueField) { typeValueField.typedInput('hide'); }
+                        if (btwnValueField) { btwnValueField.typedInput('hide'); }
+                        if (btwnValue2Field) { btwnValue2Field.typedInput('hide'); }
 
                         if ((type === "btwn") || (type === "index")) {
                             if (!btwnValueField){
@@ -318,7 +312,7 @@
 
                         } else if (type === "istype") {
                             if (!typeValueField){
-                                typeValueField = createTypeValueField();
+                                typeValueField = createTypeValueField(rowInputCell);
                             }
                             typeValueField.typedInput('show');
                             fieldToFocus = typeValueField;
@@ -361,48 +355,26 @@
                         // }
                     });
                     selectField.val(rule.t);
+
                     if ((rule.t == "btwn") || (rule.t == "index")) {
-                        if (!btwnValueField){
-                            btwnValueField = createBtwnValueField(rowInputCell);
-                        }
+                        btwnValueField = createBtwnValueField(rowInputCell,rule.vt||'num');
                         btwnValueField.typedInput('value',rule.v);
-                        btwnValueField.typedInput('type',rule.vt||'num');
-
-                        if (!btwnValue2Field){
-                            btwnValue2Field = createBtwnValue2Field(row3, andLabel);
-                        }
+                        btwnValue2Field = createBtwnValue2Field(row3, andLabel,rule.v2t||'num');
                         btwnValue2Field.typedInput('value',rule.v2);
-                        btwnValue2Field.typedInput('type',rule.v2t||'num');
                     } else if ((rule.t === "head") || (rule.t === "tail")) {
-                        if (!numValueField){
-                            numValueField = createNumValueField(row);
-                        }
+                        numValueField = createNumValueField(rowInputCell,rule.vt||'num');
                         numValueField.typedInput('value',rule.v);
-                        numValueField.typedInput('type',rule.vt||'num');
                     } else if (rule.t === "istype") {
-                        if (!typeValueField){
-                            typeValueField =createTypeValueField();
-                        }
+                        typeValueField = createTypeValueField(rowInputCell,rule.vt);
                         typeValueField.typedInput('value',rule.vt);
-                        typeValueField.typedInput('type',rule.vt);
                     } else if (rule.t === "jsonata_exp") {
-                        if (!expValueField){
-                            expValueField = createExpValueField(row);
-                        }
+                        expValueField = createExpValueField(rowInputCell,rule.vt||'jsonata');
                         expValueField.typedInput('value',rule.v);
-                        expValueField.typedInput('type',rule.vt||'jsonata');
                     } else if (typeof rule.v != "undefined") {
-                        if (!valueField){
-                            valueField = createValueField(rowInputCell);
-                        }
+                        valueField = createValueField(rowInputCell,rule.vt||'str');
                         valueField.typedInput('value',rule.v);
-                        valueField.typedInput('type',rule.vt||'str');
-                    }
-                    if (rule.case) {
-                        caseSensitive.prop('checked',true);
-                    } else {
-                        caseSensitive.prop('checked',false);
                     }
+                    caseSensitive.prop('checked',!!rule.case);
                     selectField.change();
 
                     var currentOutputs = JSON.parse(outputCount.val()||"{}");

package/core/function/15-change.html

@@ -115,12 +115,12 @@
             var regex = this._("change.label.regex");
             var deepCopyLabel = this._("change.label.deepCopy");
 
-            function createPropertyValue(row2_1,row2_2) {
+            function createPropertyValue(row2_1, row2_2, defaultType) {
                 var propValInput = $('<input/>',{class:"node-input-rule-property-value",type:"text"})
                     .appendTo(row2_1)
-                    .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','date','jsonata','env']});
+                    .typedInput({default:defaultType||'str',types:['msg','flow','global','str','num','bool','json','bin','date','jsonata','env']});
 
-                var dcLabel = $('<label style="padding-left: 130px; display: flex; align-items: center "></label>').appendTo(row2_2);
+                var dcLabel = $('<label style="padding-left: 130px;"></label>').appendTo(row2_2);
                 var deepCopy = $('<input type="checkbox" class="node-input-rule-property-deepCopy" style="width: auto; margin: 0 6px 0 0">').appendTo(dcLabel)
                 $('<span>').text(deepCopyLabel).appendTo(dcLabel)
 
@@ -129,20 +129,20 @@
                 })
                 return [propValInput, deepCopy];
             }
-            function createFromValue(row3_1) {
+            function createFromValue(row3_1, defaultType) {
                 return $('<input/>',{class:"node-input-rule-property-search-value",type:"text"})
                 .appendTo(row3_1)
-                .typedInput({default:'str',types:['msg','flow','global','str','re','num','bool','env']});
+                .typedInput({default:defaultType||'str',types:['msg','flow','global','str','re','num','bool','env']});
             }
-            function createToValue(row3_2) {
+            function createToValue(row3_2, defaultType) {
                 return $('<input/>',{class:"node-input-rule-property-replace-value",type:"text"})
                 .appendTo(row3_2)
-                .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','env']});
+                .typedInput({default:defaultType||'str',types:['msg','flow','global','str','num','bool','json','bin','env']});
             }
-            function createMoveValue(row4) {
+            function createMoveValue(row4, defaultType) {
                 return $('<input/>',{class:"node-input-rule-property-move-value",type:"text"})
                 .appendTo(row4)
-                .typedInput({default:'msg',types:['msg','flow','global']});
+                .typedInput({default:defaultType||'msg',types:['msg','flow','global']});
             }
 
             $('#node-input-rule-container').css('min-height','150px').css('min-width','450px').editableList({
@@ -268,33 +268,22 @@
                     propertyName.typedInput('value',rule.p);
                     propertyName.typedInput('type',rule.pt);
                     if (rule.t == "set") {
-                        if(!propertyValue) {
-                            var parts = createPropertyValue(row2_1, row2_2);
-                            propertyValue = parts[0];
-                            deepCopy = parts[1];
-                        }
+                        var parts = createPropertyValue(row2_1, row2_2, rule.tot);
+                        propertyValue = parts[0];
+                        deepCopy = parts[1];
                         propertyValue.typedInput('value',rule.to);
-                        propertyValue.typedInput('type',rule.tot);
                         deepCopy.prop("checked", !!rule.dc);
                     }
                     if (rule.t == "move") {
-                        if(!moveValue) {
-                            moveValue = createMoveValue(row4);
-                        }
+                        moveValue = createMoveValue(row4,rule.tot);
                         moveValue.typedInput('value',rule.to);
-                        moveValue.typedInput('type',rule.tot);
                     }
                     if (rule.t == "change") {
-                        if(!fromValue) {
-                            fromValue = createFromValue(row3_1);
-                        }
+                        fromValue = createFromValue(row3_1, rule.fromt);
                         fromValue.typedInput('value',rule.from);
-                        fromValue.typedInput('type',rule.fromt);
-                        if (!toValue) {
-                            toValue = createToValue(row3_2);
-                        }
+
+                        toValue = createToValue(row3_2,rule.tot);
                         toValue.typedInput('value',rule.to);
-                        toValue.typedInput('type',rule.tot);
                     }
                     selectField.change();
                     container[0].appendChild(fragment);

package/core/network/10-mqtt.js

@@ -1040,7 +1040,7 @@ module.exports = function(RED) {
 
                             //subscribe to sub.topic & hook up subscriptionHandler
                             node.brokerConn.subscribe(sub.topic, options, function (topic, payload, packet) {
-                                subscriptionHandler(node, sub.datatype, topic, payload, packet);
+                                subscriptionHandler(node, sub.datatype || node.datatype, topic, payload, packet);
                             }, node.id);
                             node.dynamicSubs[sub.topic] = sub; //save for later unsubscription & 'list' action
                         })

package/core/network/31-tcpin.html

@@ -196,6 +196,13 @@
     </div>
     <div class="form-row">
         <label for="node-input-out"><i class="fa fa-sign-out"></i> <span data-i18n="tcpin.label.return"></span></label>
+        <select type="text" id="node-input-ret" style="width:54%;">
+            <option value="buffer" data-i18n="tcpin.output.buffer"></option>
+            <option value="string" data-i18n="tcpin.output.string"></option>
+        </select>
+    </div>
+    <div class="form-row">
+        <label for="node-input-out"> </label>
         <select type="text" id="node-input-out" style="width:54%;">
             <option value="time" data-i18n="tcpin.return.timeout"></option>
             <option value="char" data-i18n="tcpin.return.character"></option>
@@ -220,6 +227,7 @@
             server: {value:""},
             port: {value:"",validate:RED.validators.regex(/^(\d*|)$/)},
             out: {value:"time",required:true},
+            ret: {value:"buffer"},
             splitc: {value:"0",required:true},
             name: {value:""}
         },
@@ -234,6 +242,10 @@
         },
         oneditprepare: function() {
             var previous = null;
+            if ($("#node-input-ret").val() == undefined) {
+                $("#node-input-ret").val("buffer");
+                this.ret = "buffer";
+            }
             $("#node-input-out").on('focus', function () { previous = this.value; }).on("change", function() {
                 $("#node-input-splitc").show();
                 if (previous === null) { previous = $("#node-input-out").val(); }

package/core/network/31-tcpin.js

@@ -311,7 +311,7 @@ module.exports = function(RED) {
             }
             setupTcpClient();
 
-            node.on("input", function(msg,nodeSend,nodeDone) {
+            node.on("input", function(msg, nodeSend, nodeDone) {
                 if (node.connected && msg.payload != null) {
                     if (Buffer.isBuffer(msg.payload)) {
                         client.write(msg.payload);
@@ -444,6 +444,7 @@ module.exports = function(RED) {
         this.server = n.server;
         this.port = Number(n.port);
         this.out = n.out;
+        this.ret = n.ret || "buffer";
         this.splitc = n.splitc;
 
         if (this.out === "immed") { this.splitc = -1; this.out = "time"; }
@@ -488,7 +489,7 @@ module.exports = function(RED) {
                 connected: false,
                 connecting: false
             };
-            enqueue(clients[connection_id].msgQueue, {msg:msg,nodeSend:nodeSend, nodeDone: nodeDone});
+            enqueue(clients[connection_id].msgQueue, {msg:msg, nodeSend:nodeSend, nodeDone:nodeDone});
             clients[connection_id].lastMsg = msg;
 
             if (!clients[connection_id].connecting && !clients[connection_id].connected) {
@@ -532,8 +533,12 @@ module.exports = function(RED) {
                     if (node.out === "sit") { // if we are staying connected just send the buffer
                         if (clients[connection_id]) {
                             const msg = clients[connection_id].lastMsg || {};
-                            msg.payload = data;
-                            nodeSend(RED.util.cloneMessage(msg));
+                            msg.payload = RED.util.cloneMessage(data);
+                            if (node.ret === "string") {
+                                try { msg.payload = msg.payload.toString(); }
+                                catch(e) { node.error("Failed to create string", msg); }
+                            }
+                            nodeSend(msg);
                         }
                     }
                     // else if (node.splitc === 0) {
@@ -556,6 +561,10 @@ module.exports = function(RED) {
                                                 const msg = clients[connection_id].lastMsg || {};
                                                 msg.payload = Buffer.alloc(i+1);
                                                 buf.copy(msg.payload,0,0,i+1);
+                                                if (node.ret === "string") {
+                                                    try { msg.payload = msg.payload.toString(); }
+                                                    catch(e) { node.error("Failed to create string", msg); }
+                                                }
                                                 nodeSend(msg);
                                                 if (clients[connection_id].client) {
                                                     node.status({});
@@ -578,6 +587,10 @@ module.exports = function(RED) {
                                         const msg = clients[connection_id].lastMsg || {};
                                         msg.payload = Buffer.alloc(i);
                                         buf.copy(msg.payload,0,0,i);
+                                        if (node.ret === "string") {
+                                            try { msg.payload = msg.payload.toString(); }
+                                            catch(e) { node.error("Failed to create string", msg); }
+                                        }
                                         nodeSend(msg);
                                         if (clients[connection_id].client) {
                                             node.status({});
@@ -597,6 +610,10 @@ module.exports = function(RED) {
                                         const msg = clients[connection_id].lastMsg || {};
                                         msg.payload = Buffer.alloc(i);
                                         buf.copy(msg.payload,0,0,i);
+                                        if (node.ret === "string") {
+                                            try { msg.payload = msg.payload.toString(); }
+                                            catch(e) { node.error("Failed to create string", msg); }
+                                        }
                                         nodeSend(msg);
                                         if (clients[connection_id].client) {
                                             node.status({});

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "2.1.0-beta.2",
+    "version": "2.1.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

package/icons/link-call-arrow-up.svg

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="10.583mm" height="15.875mm" version="1.1" viewBox="0 0 10.583 15.875" xmlns="http://www.w3.org/2000/svg">
- <path d="m5.2917 1.8521-3.9688 2.9104h1.8521v2.0789c0.45142-0.69251 1.2323-1.1529 2.1167-1.1529 0.88347 0 1.6645 0.45944 2.1167 1.1508v-2.0769h1.8521zm0 4.7625c-0.8893 0-1.5994 0.71008-1.5994 1.5994 0 0.8893 0.71008 1.5999 1.5994 1.5999s1.6015-0.7106 1.6015-1.5999c0-0.8893-0.71215-1.5994-1.6015-1.5994zm-2.1167 2.9724 1e-7 3.6422h4.2333l-1e-7 -3.6401c-0.4522 0.69139-1.2332 1.1503-2.1167 1.1503-0.88433 0-1.6652-0.45988-2.1167-1.1524z" fill="#fff"/>
-</svg>

package/icons/link-return-arrow-down.svg

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg width="10.583mm" height="15.875mm" version="1.1" viewBox="0 0 10.583 15.875" xmlns="http://www.w3.org/2000/svg">
- <path d="m5.2917 14.023-3.9688-2.9104h1.8521v-2.0789c0.45142 0.69251 1.2323 1.1529 2.1167 1.1529 0.88347 0 1.6645-0.45944 2.1167-1.1508v2.0769h1.8521zm0-4.7625c-0.8893 0-1.5994-0.71008-1.5994-1.5994 0-0.8893 0.71008-1.5999 1.5994-1.5999s1.6015 0.7106 1.6015 1.5999c0 0.8893-0.71215 1.5994-1.6015 1.5994zm-2.1167-2.9724 1e-7 -3.6422h4.2333l-1e-7 3.6401c-0.4522-0.69139-1.2332-1.1503-2.1167-1.1503-0.88433 0-1.6652 0.45988-2.1167 1.1524z" fill="#fff"/>
-</svg>