frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

TCP nodes- Add optional reattach delimiter to streaming strings

Browse Source
This commit is contained in:
Dave Conway-Jones 2022-02-25 15:56:13 +00:00
parent 0533c08438
commit 8c19daf949
No known key found for this signature in database
GPG Key ID: 88BA2B8A411BE9FF
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/node_modules/@node-red/nodes/core/network/31-tcpin.html vendored
View File

@ -50,7 +50,8 @@
</div> </div>
<div id="node-row-newline" class="form-row hidden" style="padding-left:110px;"> <div id="node-row-newline" class="form-row hidden" style="padding-left:110px;">
<span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"> <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"><br/>
<input type="checkbox" id="node-input-trim" style="display:inline-block; width:auto; vertical-align:top;"> <span data-i18n="tcpin.label.reattach"></span>
</div> </div>
<div class="form-row"> <div class="form-row">
@ -76,6 +77,7 @@
datatype:{value:"buffer"}, datatype:{value:"buffer"},
newline:{value:""}, newline:{value:""},
topic: {value:""}, topic: {value:""},
trim: {value:false},
base64: {/*deprecated*/ value:false, required:true}, base64: {/*deprecated*/ value:false, required:true},
tls: {type:"tls-config", value:'', required:false} tls: {type:"tls-config", value:'', required:false}
}, },
@ -286,7 +288,8 @@
<span id="node-units"></span> <span id="node-units"></span>
</div> </div>
<div id="node-row-newline" class="form-row hidden" style="padding-left:162px;"> <div id="node-row-newline" class="form-row hidden" style="padding-left:162px;">
<span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"> <span data-i18n="tcpin.label.delimited"></span> <input type="text" id="node-input-newline" style="width:110px;" data-i18n="[placeholder]tcpin.label.optional"><br/>
<input type="checkbox" id="node-input-trim" style="display:inline-block; width:auto; vertical-align:top;"> <span data-i18n="tcpin.label.reattach"></span>
</div> </div>
<div class="form-row"> <div class="form-row">
<label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label> <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@ -306,6 +309,7 @@
ret: {value:"buffer"}, ret: {value:"buffer"},
splitc: {value:"0", required:true}, splitc: {value:"0", required:true},
newline: {value:""}, newline: {value:""},
trim: {value:false},
tls: {type:"tls-config", value:'', required:false} tls: {type:"tls-config", value:'', required:false}
}, },
inputs:1, inputs:1,

11
packages/node_modules/@node-red/nodes/core/network/31-tcpin.js vendored
View File

@ -88,6 +88,7 @@ module.exports = function(RED) {
this.datatype = n.datatype||'buffer'; /* buffer,utf8,base64 */ this.datatype = n.datatype||'buffer'; /* buffer,utf8,base64 */
this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t"); this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
this.base64 = n.base64; this.base64 = n.base64;
this.trim = n.trim || false;
this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server"); this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server");
this.closing = false; this.closing = false;
this.connected = false; this.connected = false;
@ -135,7 +136,8 @@ module.exports = function(RED) {
buffer = buffer+data; buffer = buffer+data;
var parts = buffer.split(node.newline); var parts = buffer.split(node.newline);
for (var i = 0; i<parts.length-1; i+=1) { 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]};
if (node.trim == true) { msg.payload += node.newline.trimEnd(); }
msg._session = {type:"tcp",id:id}; msg._session = {type:"tcp",id:id};
node.send(msg); node.send(msg);
} }
@ -229,7 +231,8 @@ module.exports = function(RED) {
buffer = buffer+data; buffer = buffer+data;
var parts = buffer.split(node.newline); var parts = buffer.split(node.newline);
for (var i = 0; i<parts.length-1; i+=1) { 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};
if (node.trim == true) { msg.payload += node.newline.trimEnd(); }
msg._session = {type:"tcp",id:id}; msg._session = {type:"tcp",id:id};
node.send(msg); node.send(msg);
} }
@ -518,6 +521,7 @@ module.exports = function(RED) {
this.out = n.out; this.out = n.out;
this.ret = n.ret || "buffer"; this.ret = n.ret || "buffer";
this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t"); this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
this.trim = n.trim || false;
this.splitc = n.splitc; this.splitc = n.splitc;
if (n.tls) { if (n.tls) {
var tlsNode = RED.nodes.getNode(n.tls); var tlsNode = RED.nodes.getNode(n.tls);
@ -653,7 +657,8 @@ module.exports = function(RED) {
let parts = chunk.split(node.newline); let parts = chunk.split(node.newline);
for (var p=0; p<parts.length-1; p+=1) { for (var p=0; p<parts.length-1; p+=1) {
let m = RED.util.cloneMessage(msg); let m = RED.util.cloneMessage(msg);
m.payload = parts[p] + node.newline.trimEnd(); m.payload = parts[p];
if (node.trim == true) { m.payload += node.newline.trimEnd(); }
nodeSend(m); nodeSend(m);
} }
chunk = parts[parts.length-1]; chunk = parts[parts.length-1];

3
packages/node_modules/@node-red/nodes/locales/en-US/messages.json vendored
View File

@ -583,7 +583,8 @@
"ms": "ms", "ms": "ms",
"chars": "chars", "chars": "chars",
"close": "Close", "close": "Close",
"optional": "(optional)" "optional": "(optional)",
"reattach": "re-attach delimiter and trim"
}, },
"type": { "type": {
"listen": "Listen on", "listen": "Listen on",