@node-red/nodes 2.1.4 → 2.2.0

package/core/network/31-tcpin.js

@@ -16,13 +16,46 @@
 
 module.exports = function(RED) {
     "use strict";
-    var reconnectTime = RED.settings.socketReconnectTime||10000;
-    var socketTimeout = RED.settings.socketTimeout||null;
+    let reconnectTime = RED.settings.socketReconnectTime || 10000;
+    let socketTimeout = RED.settings.socketTimeout || null;
     const msgQueueSize = RED.settings.tcpMsgQueueSize || 1000;
     const Denque = require('denque');
-    var net = require('net');
+    const net = require('net');
+    const tls = require('tls');
+
+    let connectionPool = {};
+
+    function normalizeConnectArgs(listArgs) {
+      const args = net._normalizeArgs(listArgs);
+      const options = args[0];
+      const cb = args[1];
+
+      // If args[0] was options, then normalize dealt with it.
+      // If args[0] is port, or args[0], args[1] is host, port, we need to
+      // find the options and merge them in, normalize's options has only
+      // the host/port/path args that it knows about, not the tls options.
+      // This means that options.host overrides a host arg.
+      if (listArgs[1] !== null && typeof listArgs[1] === 'object') {
+        ObjectAssign(options, listArgs[1]);
+      } else if (listArgs[2] !== null && typeof listArgs[2] === 'object') {
+        ObjectAssign(options, listArgs[2]);
+      }
+
+      return cb ? [options, cb] : [options];
+    }
 
-    var connectionPool = {};
+    function getAllowUnauthorized() {
+      const allowUnauthorized = process.env.NODE_TLS_REJECT_UNAUTHORIZED === '0';
+
+      if (allowUnauthorized) {
+        process.emitWarning(
+          'Setting the NODE_TLS_REJECT_UNAUTHORIZED ' +
+          'environment variable to \'0\' makes TLS connections ' +
+          'and HTTPS requests insecure by disabling ' +
+          'certificate verification.');
+      }
+      return allowUnauthorized;
+    }
 
     /**
      * Enqueue `item` in `queue`
@@ -53,13 +86,14 @@ module.exports = function(RED) {
         this.topic = n.topic;
         this.stream = (!n.datamode||n.datamode=='stream'); /* stream,single*/
         this.datatype = n.datatype||'buffer'; /* buffer,utf8,base64 */
-        this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r");
+        this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
         this.base64 = n.base64;
         this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server");
         this.closing = false;
         this.connected = false;
         var node = this;
         var count = 0;
+        if (n.tls) { var tlsNode = RED.nodes.getNode(n.tls); }
 
         if (!node.server) {
             var buffer = null;
@@ -70,13 +104,25 @@ module.exports = function(RED) {
                 node.log(RED._("tcpin.status.connecting",{host:node.host,port:node.port}));
                 node.status({fill:"grey",shape:"dot",text:"common.status.connecting"});
                 var id = RED.util.generateId();
-                client = net.connect(node.port, node.host, function() {
-                    buffer = (node.datatype == 'buffer') ? Buffer.alloc(0) : "";
-                    node.connected = true;
-                    node.log(RED._("tcpin.status.connected",{host:node.host,port:node.port}));
-                    node.status({fill:"green",shape:"dot",text:"common.status.connected",_session:{type:"tcp",id:id}});
-                });
-                client.setKeepAlive(true,120000);
+                var connOpts = {host: node.host};
+                if (n.tls) {
+                    var connOpts = tlsNode.addTLSOptions({host: node.host});
+                    client = tls.connect(node.port, connOpts, function() {
+                        buffer = (node.datatype == 'buffer') ? Buffer.alloc(0) : "";
+                        node.connected = true;
+                        node.log(RED._("status.connected", {host: node.host, port: node.port}));
+                        node.status({fill:"green",shape:"dot",text:"common.status.connected",_session:{type:"tcp",id:id}});
+                    });
+                }
+                else {
+                    client = net.connect(node.port, node.host, function() {
+                        buffer = (node.datatype == 'buffer') ? Buffer.alloc(0) : "";
+                        node.connected = true;
+                        node.log(RED._("tcpin.status.connected",{host:node.host,port:node.port}));
+                        node.status({fill:"green",shape:"dot",text:"common.status.connected",_session:{type:"tcp",id:id}});
+                    });
+                }
+                client.setKeepAlive(true, 120000);
                 connectionPool[id] = client;
 
                 client.on('data', function (data) {
@@ -89,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]};
+                                msg = {topic:node.topic, payload:parts[i] + node.newline.trimEnd()};
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -150,7 +196,13 @@ module.exports = function(RED) {
             });
         }
         else {
-            var server = net.createServer(function (socket) {
+            let srv = net;
+            let connOpts;
+            if (n.tls) {
+                srv = tls;
+                connOpts = tlsNode.addTLSOptions({});
+            }
+            var server = srv.createServer(connOpts, function (socket) {
                 socket.setKeepAlive(true,120000);
                 if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
                 var id = RED.util.generateId();
@@ -177,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], ip:socket.remoteAddress, port:socket.remotePort};
+                                msg = {topic:node.topic, payload:parts[i] + node.newline.trimEnd(), ip:socket.remoteAddress, port:socket.remotePort};
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -269,8 +321,9 @@ module.exports = function(RED) {
         this.closing = false;
         this.connected = false;
         var node = this;
+        if (n.tls) { var tlsNode = RED.nodes.getNode(n.tls); }
 
-        if (!node.beserver||node.beserver=="client") {
+        if (!node.beserver || node.beserver == "client") {
             var reconnectTimeout;
             var client = null;
             var end = false;
@@ -278,11 +331,24 @@ module.exports = function(RED) {
             var setupTcpClient = function() {
                 node.log(RED._("tcpin.status.connecting",{host:node.host,port:node.port}));
                 node.status({fill:"grey",shape:"dot",text:"common.status.connecting"});
-                client = net.connect(node.port, node.host, function() {
-                    node.connected = true;
-                    node.log(RED._("tcpin.status.connected",{host:node.host,port:node.port}));
-                    node.status({fill:"green",shape:"dot",text:"common.status.connected"});
-                });
+                if (n.tls) {
+                    // connOpts = tlsNode.addTLSOptions(connOpts);
+                    // client = tls.connect(connOpts, function() {
+                    var connOpts = tlsNode.addTLSOptions({host: node.host});
+                    client = tls.connect(node.port, connOpts, function() {
+                        // buffer = (node.datatype == 'buffer') ? Buffer.alloc(0) : "";
+                        node.connected = true;
+                        node.log(RED._("status.connected", {host: node.host, port: node.port}));
+                        node.status({fill:"green",shape:"dot",text:"common.status.connected"});
+                    });
+                }
+                else {
+                    client = net.connect(node.port, node.host, function() {
+                        node.connected = true;
+                        node.log(RED._("tcpin.status.connected",{host:node.host,port:node.port}));
+                        node.status({fill:"green",shape:"dot",text:"common.status.connected"});
+                    });
+                }
                 client.setKeepAlive(true,120000);
                 client.on('error', function (err) {
                     node.log(RED._("tcpin.errors.error",{error:err.toString()}));
@@ -368,7 +434,13 @@ module.exports = function(RED) {
         else {
             var connectedSockets = [];
             node.status({text:RED._("tcpin.status.connections",{count:0})});
-            var server = net.createServer(function (socket) {
+            let srv = net;
+            let connOpts;
+            if (n.tls) {
+                srv = tls;
+                connOpts = tlsNode.addTLSOptions({});
+            }
+            var server = srv.createServer(connOpts, function (socket) {
                 socket.setKeepAlive(true,120000);
                 if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
                 node.log(RED._("tcpin.status.connection-from",{host:socket.remoteAddress, port:socket.remotePort}));
@@ -445,7 +517,11 @@ module.exports = function(RED) {
         this.port = Number(n.port);
         this.out = n.out;
         this.ret = n.ret || "buffer";
+        this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
         this.splitc = n.splitc;
+        if (n.tls) {
+            var tlsNode = RED.nodes.getNode(n.tls);
+        }
 
         if (this.out === "immed") { this.splitc = -1; this.out = "time"; }
         if (this.out !== "char") { this.splitc = Number(this.splitc); }
@@ -500,12 +576,48 @@ module.exports = function(RED) {
                 }
                 else { buf = Buffer.alloc(65536); } // set it to 64k... hopefully big enough for most TCP packets.... but only hopefully
 
-                clients[connection_id].client = net.Socket();
+                var connOpts = {host:host, port:port};
+                if (n.tls) {
+                    connOpts = tlsNode.addTLSOptions(connOpts);
+                    const allowUnauthorized = getAllowUnauthorized();
+
+                    let options = {
+                        rejectUnauthorized: !allowUnauthorized,
+                        ciphers: tls.DEFAULT_CIPHERS,
+                        checkServerIdentity: tls.checkServerIdentity,
+                        minDHSize: 1024,
+                        ...connOpts
+                    };
+
+                    if (!options.keepAlive) { options.singleUse = true; }
+
+                    const context = options.secureContext || tls.createSecureContext(options);
+
+                    clients[connection_id].client = new tls.TLSSocket(options.socket, {
+                        allowHalfOpen: options.allowHalfOpen,
+                        pipe: !!options.path,
+                        secureContext: context,
+                        isServer: false,
+                        requestCert: false, // true,
+                        rejectUnauthorized: false, // options.rejectUnauthorized !== false,
+                        session: options.session,
+                        ALPNProtocols: options.ALPNProtocols,
+                        requestOCSP: options.requestOCSP,
+                        enableTrace: options.enableTrace,
+                        pskCallback: options.pskCallback,
+                        highWaterMark: options.highWaterMark,
+                        onread: options.onread,
+                        signal: options.signal,
+                    });
+                }
+                else {
+                    clients[connection_id].client = net.Socket();
+                }
                 if (socketTimeout !== null) { clients[connection_id].client.setTimeout(socketTimeout);}
 
                 if (host && port) {
                     clients[connection_id].connecting = true;
-                    clients[connection_id].client.connect(port, host, function() {
+                    clients[connection_id].client.connect(connOpts, function() {
                         //node.log(RED._("tcpin.errors.client-connected"));
                         node.status({fill:"green",shape:"dot",text:"common.status.connected"});
                         if (clients[connection_id] && clients[connection_id].client) {
@@ -528,17 +640,32 @@ module.exports = function(RED) {
                 else {
                     node.warn(RED._("tcpin.errors.no-host"));
                 }
-
+                var chunk = "";
                 clients[connection_id].client.on('data', function(data) {
                     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 = RED.util.cloneMessage(data);
                             if (node.ret === "string") {
-                                try { msg.payload = msg.payload.toString(); }
-                                catch(e) { node.error("Failed to create string", msg); }
+                                try {
+                                    if (node.newline && node.newline !== "" ) {
+                                        chunk += msg.payload.toString();
+                                        let parts = chunk.split(node.newline);
+                                        for (var p=0; p<parts.length-1; p+=1) {
+                                            let m = RED.util.cloneMessage(msg);
+                                            m.payload = parts[p] + node.newline.trimEnd();
+                                            nodeSend(m);
+                                        }
+                                        chunk = parts[parts.length-1];
+                                    }
+                                    else {
+                                        msg.payload = msg.payload.toString();
+                                        nodeSend(msg);
+                                    }
+                                }
+                                catch(e) { node.error(RED._("tcpin.errors.bad-string"), msg); }
                             }
-                            nodeSend(msg);
+                            else { nodeSend(msg); }
                         }
                     }
                     // else if (node.splitc === 0) {
@@ -675,7 +802,13 @@ module.exports = function(RED) {
                         //node.warn(RED._("tcpin.errors.connect-timeout"));
                         if (clients[connection_id].client) {
                             clients[connection_id].connecting = true;
-                            clients[connection_id].client.connect(port, host, function() {
+
+                            var connOpts = {host:host, port:port};
+                            if (n.tls) {
+                                connOpts = tlsNode.addTLSOptions(connOpts);
+                            }
+
+                            clients[connection_id].client.connect(connOpts, function() {
                                 clients[connection_id].connected = true;
                                 clients[connection_id].connecting = false;
                                 node.status({fill:"green",shape:"dot",text:"common.status.connected"});

package/core/parsers/70-JSON.js

@@ -49,7 +49,11 @@ module.exports = function(RED) {
             }
             var value = RED.util.getMessageProperty(msg,node.property);
             if (value !== undefined) {
-                if (typeof value === "string") {
+                if (typeof value === "string" || Buffer.isBuffer(value)) {
+                    // if (Buffer.isBuffer(value) && node.action !== "obj") {
+                    //     node.warn(RED._("json.errors.dropped")); done();
+                    // }
+                    // else
                     if (node.action === "" || node.action === "obj") {
                         try {
                             RED.util.setMessageProperty(msg,node.property,JSON.parse(value));

package/core/storage/10-file.js

@@ -71,9 +71,7 @@ module.exports = function(RED) {
                         node.error(RED._("file.errors.deletefail",{error:err.toString()}),msg);
                     }
                     else {
-                        if (RED.settings.verbose) {
-                            node.log(RED._("file.status.deletedfile",{file:filename}));
-                        }
+                        node.debug(RED._("file.status.deletedfile",{file:filename}));
                         nodeSend(msg);
                     }
                     done();

package/examples/common/link/03 - Link call.json

@@ -0,0 +1,156 @@
+[
+    {
+        "id": "62ea32aa.d73aac",
+        "type": "comment",
+        "z": "6312c0588348b2d4",
+        "name": "Example: Link Call Node",
+        "info": "Link call node can call link in node then get result from link out node.",
+        "x": 230,
+        "y": 180,
+        "wires": []
+    },
+    {
+        "id": "c588bc36.87fec",
+        "type": "comment",
+        "z": "6312c0588348b2d4",
+        "name": "↓ call link in node",
+        "info": "",
+        "x": 440,
+        "y": 220,
+        "wires": []
+    },
+    {
+        "id": "cd31efb4d2c6967e",
+        "type": "link call",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "links": [
+            "dbc46892c8d14c37"
+        ],
+        "timeout": "30",
+        "x": 420,
+        "y": 260,
+        "wires": [
+            [
+                "c3db64d1d2260340"
+            ]
+        ]
+    },
+    {
+        "id": "dbc46892c8d14c37",
+        "type": "link in",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "links": [],
+        "x": 315,
+        "y": 340,
+        "wires": [
+            [
+                "e10575d73f2e5352"
+            ]
+        ]
+    },
+    {
+        "id": "6b61792143b3b0a3",
+        "type": "inject",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "props": [
+            {
+                "p": "payload"
+            },
+            {
+                "p": "topic",
+                "vt": "str"
+            }
+        ],
+        "repeat": "",
+        "crontab": "",
+        "once": false,
+        "onceDelay": 0.1,
+        "topic": "",
+        "payload": "",
+        "payloadType": "date",
+        "x": 240,
+        "y": 260,
+        "wires": [
+            [
+                "cd31efb4d2c6967e"
+            ]
+        ]
+    },
+    {
+        "id": "e10575d73f2e5352",
+        "type": "change",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "rules": [
+            {
+                "t": "set",
+                "p": "payload",
+                "pt": "msg",
+                "to": "Hello, World!",
+                "tot": "str"
+            }
+        ],
+        "action": "",
+        "property": "",
+        "from": "",
+        "to": "",
+        "reg": false,
+        "x": 450,
+        "y": 340,
+        "wires": [
+            [
+                "cf8438e7137bc0f0"
+            ]
+        ]
+    },
+    {
+        "id": "cf8438e7137bc0f0",
+        "type": "link out",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "mode": "return",
+        "links": [],
+        "x": 595,
+        "y": 340,
+        "wires": []
+    },
+    {
+        "id": "c3db64d1d2260340",
+        "type": "debug",
+        "z": "6312c0588348b2d4",
+        "name": "",
+        "active": true,
+        "tosidebar": true,
+        "console": false,
+        "tostatus": false,
+        "complete": "false",
+        "statusVal": "",
+        "statusType": "auto",
+        "x": 600,
+        "y": 260,
+        "wires": []
+    },
+    {
+        "id": "6d077dfa0987febb",
+        "type": "comment",
+        "z": "6312c0588348b2d4",
+        "name": "↑called from link call node",
+        "info": "",
+        "x": 410,
+        "y": 380,
+        "wires": []
+    },
+    {
+        "id": "53b9a0adfd8c4217",
+        "type": "comment",
+        "z": "6312c0588348b2d4",
+        "name": "↑return to link call node",
+        "info": "",
+        "x": 680,
+        "y": 380,
+        "wires": []
+    }
+]

package/examples/storage/{file/01 - Write string to a file.json → read file/01 - Read string from a file.json }

@@ -2,7 +2,7 @@
     {
         "id": "84222b92.d65d18",
         "type": "inject",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "props": [
             {
@@ -20,8 +20,8 @@
         "topic": "",
         "payload": "Hello, World!",
         "payloadType": "str",
-        "x": 230,
-        "y": 200,
+        "x": 190,
+        "y": 180,
         "wires": [
             [
                 "b4b9f603.739598"
@@ -31,25 +31,25 @@
     {
         "id": "7b014430.dfd94c",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "Write string to a file, then read from the file",
-        "info": "File node can write string to a file.",
-        "x": 260,
-        "y": 120,
+        "info": "Read file node can read string from a file.",
+        "x": 220,
+        "y": 100,
         "wires": []
     },
     {
         "id": "b4b9f603.739598",
         "type": "file",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "appendNewline": true,
         "createDir": false,
         "overwriteFile": "true",
         "encoding": "none",
-        "x": 420,
-        "y": 200,
+        "x": 380,
+        "y": 180,
         "wires": [
             [
                 "6dc01cac.5c4bf4"
@@ -59,7 +59,7 @@
     {
         "id": "2587adb9.7e60f2",
         "type": "debug",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "active": true,
         "tosidebar": true,
@@ -68,22 +68,22 @@
         "complete": "false",
         "statusVal": "",
         "statusType": "auto",
-        "x": 810,
-        "y": 200,
+        "x": 770,
+        "y": 180,
         "wires": []
     },
     {
         "id": "6dc01cac.5c4bf4",
         "type": "file in",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "",
         "filename": "/tmp/hello.txt",
         "format": "utf8",
         "chunk": false,
         "sendError": false,
         "encoding": "none",
-        "x": 620,
-        "y": 200,
+        "x": 580,
+        "y": 180,
         "wires": [
             [
                 "2587adb9.7e60f2"
@@ -93,21 +93,21 @@
     {
         "id": "f4b4309a.3b78a",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "↑read result from file",
         "info": "",
-        "x": 630,
-        "y": 240,
+        "x": 590,
+        "y": 220,
         "wires": []
     },
     {
         "id": "672d3693.3cabd8",
         "type": "comment",
-        "z": "4b63452d.672afc",
+        "z": "6312c0588348b2d4",
         "name": "↓write to /tmp/hello.txt",
         "info": "",
-        "x": 440,
-        "y": 160,
+        "x": 400,
+        "y": 140,
         "wires": []
     }
 ]