From 8a4062281504e769e8348c793b6bcf460eacca28 Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Wed, 23 Mar 2022 22:07:43 +0000
Subject: [PATCH] tcp node - undo trim if we re-add split chars

and fix tests
---
 .../node_modules/@node-red/nodes/core/network/31-tcpin.js   | 6 +++---
 .../@node-red/nodes/locales/en-US/messages.json             | 2 +-
 test/nodes/core/network/31-tcpin_spec.js                    | 2 +-
 test/nodes/core/network/31-tcprequest_spec.js               | 2 +-
 test/nodes/core/parsers/70-JSON_spec.js                     | 4 ++--
 test/nodes/core/parsers/70-XML_spec.js                      | 6 +++---
 6 files changed, 11 insertions(+), 11 deletions(-)

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 99603abb4..531b3ac2d 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
@@ -137,7 +137,7 @@ module.exports = function(RED) {
                             var parts = buffer.split(node.newline);
                             for (var i = 0; i<parts.length-1; i+=1) {
                                 msg = {topic:node.topic, payload:parts[i]};
-                                if (node.trim == true) { msg.payload += node.newline.trimEnd(); }
+                                if (node.trim == true) { msg.payload += node.newline; }
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -232,7 +232,7 @@ module.exports = function(RED) {
                             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};
-                                if (node.trim == true) { msg.payload += node.newline.trimEnd(); }
+                                if (node.trim == true) { msg.payload += node.newline; }
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
@@ -658,7 +658,7 @@ module.exports = function(RED) {
                                         for (var p=0; p<parts.length-1; p+=1) {
                                             let m = RED.util.cloneMessage(msg);
                                             m.payload = parts[p];
-                                            if (node.trim == true) { m.payload += node.newline.trimEnd(); }
+                                            if (node.trim == true) { m.payload += node.newline; }
                                             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 d917a3d22..35fbfa0cf 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
@@ -584,7 +584,7 @@
             "chars": "chars",
             "close": "Close",
             "optional": "(optional)",
-            "reattach": "re-attach delimiter and trim"
+            "reattach": "re-attach delimiter"
         },
         "type": {
             "listen": "Listen on",
diff --git a/test/nodes/core/network/31-tcpin_spec.js b/test/nodes/core/network/31-tcpin_spec.js
index a694991ff..3d514c4e4 100644
--- a/test/nodes/core/network/31-tcpin_spec.js
+++ b/test/nodes/core/network/31-tcpin_spec.js
@@ -130,7 +130,7 @@ describe('TCP in Node', function() {
     it('should recv data (Stream/String/Delimiter:o\\n) and reattach o', function(done) {
         var flow = [{id:"n1", type:"tcp in", server:"server", host:"localhost", port:port, datamode:"stream", datatype:"utf8", newline:"o\n", trim:true, topic:"", base64:false, wires:[["n2"]] },
                     {id:"n2", type:"helper"}];
-        testTCP0(flow, ["foo\nbar"], ["foo", "bar"], done);
+        testTCP0(flow, ["foo\nbar"], ["foo\n", "bar"], done);
     });
 
 
diff --git a/test/nodes/core/network/31-tcprequest_spec.js b/test/nodes/core/network/31-tcprequest_spec.js
index e61e4f7d7..154aa4165 100644
--- a/test/nodes/core/network/31-tcprequest_spec.js
+++ b/test/nodes/core/network/31-tcprequest_spec.js
@@ -293,7 +293,7 @@ describe('TCP Request Node', function() {
                 payload: "bar<A>\nfoo",
                 topic: 'boo'
             }], {
-                payload: "ACK:foobar<A>",
+                payload: "ACK:foobar<A>\n",
                 topic: 'boo'
             }, done);
         });
diff --git a/test/nodes/core/parsers/70-JSON_spec.js b/test/nodes/core/parsers/70-JSON_spec.js
index 32c5062e8..c3a2216e0 100644
--- a/test/nodes/core/parsers/70-JSON_spec.js
+++ b/test/nodes/core/parsers/70-JSON_spec.js
@@ -45,7 +45,7 @@ describe('JSON node', function() {
                 msg.payload.employees[0].should.have.property('lastName', 'Smith');
                 done();
             });
-            var jsonString = '{"employees":[{"firstName":"John", "lastName":"Smith"}]}';
+            var jsonString = ' {"employees":[{"firstName":"John", "lastName":"Smith"}]}\r\n ';
             jn1.receive({payload:jsonString,topic: "bar"});
         });
     });
@@ -63,7 +63,7 @@ describe('JSON node', function() {
                 msg.payload.employees[0].should.have.property('lastName', 'Smith');
                 done();
             });
-            var jsonString = Buffer.from('{"employees":[{"firstName":"John", "lastName":"Smith"}]}');
+            var jsonString = Buffer.from(' {"employees":[{"firstName":"John", "lastName":"Smith"}]}\r\n ');
             jn1.receive({payload:jsonString,topic: "bar"});
         });
     });
diff --git a/test/nodes/core/parsers/70-XML_spec.js b/test/nodes/core/parsers/70-XML_spec.js
index e8b281855..c5e13f952 100644
--- a/test/nodes/core/parsers/70-XML_spec.js
+++ b/test/nodes/core/parsers/70-XML_spec.js
@@ -56,7 +56,7 @@ describe('XML node', function() {
                 should.equal(msg.payload.employees.lastName[0], 'Smith');
                 done();
             });
-            var string = '<employees><firstName>John</firstName><lastName>Smith</lastName></employees>';
+            var string = '  <employees><firstName>John</firstName><lastName>Smith</lastName></employees>\r\n  ';
             n1.receive({payload:string,topic: "bar"});
         });
     });
@@ -76,7 +76,7 @@ describe('XML node', function() {
                 should.equal(msg.foo.employees.lastName[0], 'Smith');
                 done();
             });
-            var string = '<employees><firstName>John</firstName><lastName>Smith</lastName></employees>';
+            var string = '  <employees><firstName>John</firstName><lastName>Smith</lastName></employees>\r\n ';
             n1.receive({foo:string,topic: "bar"});
         });
     });
@@ -96,7 +96,7 @@ describe('XML node', function() {
                 should.equal(msg.payload.employees.lastName[0], 'Smith');
                 done();
             });
-            var string = '<employees><firstName>John</firstName><lastName>Smith</lastName></employees>';
+            var string = '  <employees><firstName>John</firstName><lastName>Smith</lastName></employees>\r\n  ';
             n1.receive({payload:string, topic:"bar", options:{trim:true}});
         });
     });