From 0398ef3b9099cc9ca249a73d9461e6a80775904e Mon Sep 17 00:00:00 2001
From: Dave Conway-Jones <conway@uk.ibm.com>
Date: Fri, 25 Feb 2022 16:06:44 +0000
Subject: [PATCH] undo regression in tcp-in node (missed one)

and add test
---
 .../node_modules/@node-red/nodes/core/network/31-tcpin.js   | 2 +-
 test/nodes/core/network/31-tcpin_spec.js                    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

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 9e81d5056..a2f033fa3 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
@@ -135,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] + node.newline.trimEnd()};
+                                msg = {topic:node.topic, payload:parts[i]};
                                 msg._session = {type:"tcp",id:id};
                                 node.send(msg);
                             }
diff --git a/test/nodes/core/network/31-tcpin_spec.js b/test/nodes/core/network/31-tcpin_spec.js
index cbe7ced2a..f9cd9dc91 100644
--- a/test/nodes/core/network/31-tcpin_spec.js
+++ b/test/nodes/core/network/31-tcpin_spec.js
@@ -121,6 +121,12 @@ describe('TCP in Node', function() {
         testTCP0(flow, ["foo\nbar"], ["foo", "bar"], done);
     });
 
+    it('should recv data (Stream/String/Delimiter:o\\n)', function(done) {
+        var flow = [{id:"n1", type:"tcp in", server:"server", host:"localhost", port:port, datamode:"stream", datatype:"utf8", newline:"o\n", topic:"", base64:false, wires:[["n2"]] },
+                    {id:"n2", type:"helper"}];
+        testTCP0(flow, ["foo\nbar"], ["fo", "bar"], done);
+    });
+
     it('should recv data (Stream/String/No delimiter)', function(done) {
         var flow = [{id:"n1", type:"tcp in", server:"server", host:"localhost", port:port, datamode:"stream", datatype:"utf8", newline:"", topic:"", base64:false, wires:[["n2"]] },
                     {id:"n2", type:"helper"}];