From 8c19daf949dc59574ebfa99e27238a884c485d14 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 25 Feb 2022 15:56:13 +0000
Subject: [PATCH] TCP nodes- Add optional reattach delimiter to streaming
 strings

---
 .../@node-red/nodes/core/network/31-tcpin.html        |  8 ++++++--
 .../@node-red/nodes/core/network/31-tcpin.js          | 11 ++++++++---
 .../@node-red/nodes/locales/en-US/messages.json       |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
index 97c8eb4d7..01b4c606a 100644
--- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
+++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.html
@@ -50,7 +50,8 @@
     </div>
 
     <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 class="form-row">
@@ -76,6 +77,7 @@
             datatype:{value:"buffer"},
             newline:{value:""},
             topic: {value:""},
+            trim: {value:false},
             base64: {/*deprecated*/ value:false, required:true},
             tls: {type:"tls-config", value:'', required:false}
         },
@@ -286,7 +288,8 @@
         <span id="node-units"></span>
     </div>
     <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 class="form-row">
         <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"},
             splitc: {value:"0", required:true},
             newline: {value:""},
+            trim: {value:false},
             tls: {type:"tls-config", value:'', required:false}
         },
         inputs:1,
diff --git a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
index 24e6abf7e..99603abb4 100644
--- a/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
+++ b/packages/node_modules/@node-red/nodes/core/network/31-tcpin.js
@@ -88,6 +88,7 @@ module.exports = function(RED) {
         this.datatype = n.datatype||'buffer'; /* buffer,utf8,base64 */
         this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
         this.base64 = n.base64;
+        this.trim = n.trim || false;
         this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server");
         this.closing = false;
         this.connected = false;
@@ -135,7 +136,8 @@ 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]};
+                                if (node.trim == true) { msg.payload += node.newline.trimEnd(); }
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -229,7 +231,8 @@ 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};
+                                if (node.trim == true) { msg.payload += node.newline.trimEnd(); }
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -518,6 +521,7 @@ module.exports = function(RED) {
         this.out = n.out;
         this.ret = n.ret || "buffer";
         this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
+        this.trim = n.trim || false;
         this.splitc = n.splitc;
         if (n.tls) {
             var tlsNode = RED.nodes.getNode(n.tls);
@@ -653,7 +657,8 @@ module.exports = function(RED) {
                                         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();
+                                            m.payload = parts[p];
+                                            if (node.trim == true) { m.payload += node.newline.trimEnd(); }
                                             nodeSend(m);
                                         }
                                         chunk = parts[parts.length-1];
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index ecc5d905c..d917a3d22 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -583,7 +583,8 @@
             "ms": "ms",
             "chars": "chars",
             "close": "Close",
-            "optional": "(optional)"
+            "optional": "(optional)",
+            "reattach": "re-attach delimiter and trim"
         },
         "type": {
             "listen": "Listen on",