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

Make tcp send msg more consistent

Browse Source 
to close #1236
This commit is contained in:
Dave Conway-Jones 2017-04-20 12:22:36 +01:00
parent e574f4516f
commit b756a8edef
No known key found for this signature in database
GPG Key ID: 81B04231572A9A2D
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nodes/core/io/31-tcpin.js
View File

@ -63,7 +63,7 @@ module.exports = function(RED) {
if ((node.datatype) === "utf8" && node.newline !== "") { if ((node.datatype) === "utf8" && node.newline !== "") {
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]}; msg = {topic:node.topic, payload:parts[i]};
msg._session = {type:"tcp",id:id}; msg._session = {type:"tcp",id:id};
node.send(msg); node.send(msg);
@ -143,13 +143,13 @@ 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],ip:socket.remoteAddress,port:socket.remotePort}; msg = {topic:node.topic, payload:parts[i], ip:socket.remoteAddress, port:socket.remotePort};
msg._session = {type:"tcp",id:id}; msg._session = {type:"tcp",id:id};
node.send(msg); node.send(msg);
} }
buffer = parts[parts.length-1]; buffer = parts[parts.length-1];
} else { } else {
msg = {topic:node.topic, payload:data}; msg = {topic:node.topic, payload:data, ip:socket.remoteAddress, port:socket.remotePort};
msg._session = {type:"tcp",id:id}; msg._session = {type:"tcp",id:id};
node.send(msg); node.send(msg);
} }
@ -164,7 +164,7 @@ module.exports = function(RED) {
socket.on('end', function() { socket.on('end', function() {
if (!node.stream || (node.datatype === "utf8" && node.newline !== "")) { if (!node.stream || (node.datatype === "utf8" && node.newline !== "")) {
if (buffer.length > 0) { if (buffer.length > 0) {
var msg = {topic:node.topic, payload:buffer}; var msg = {topic:node.topic, payload:buffer, ip:socket.remoteAddress, port:socket.remotePort};
msg._session = {type:"tcp",id:id}; msg._session = {type:"tcp",id:id};
node.send(msg); node.send(msg);
} }
@ -209,7 +209,6 @@ module.exports = function(RED) {
} }
}); });
} }
} }
RED.nodes.registerType("tcp in",TcpIn); RED.nodes.registerType("tcp in",TcpIn);
@ -456,15 +455,14 @@ module.exports = function(RED) {
clients[connection_id].client.on('data', function(data) { clients[connection_id].client.on('data', function(data) {
if (node.out === "sit") { // if we are staying connected just send the buffer if (node.out === "sit") { // if we are staying connected just send the buffer
if (clients[connection_id]) { if (clients[connection_id]) {
if (!clients[connection_id].hasOwnProperty("msg")) { clients[connection_id].msg = {}; }
clients[connection_id].msg.payload = data; clients[connection_id].msg.payload = data;
node.send(RED.util.cloneMessage(clients[connection_id].msg)); node.send(RED.util.cloneMessage(clients[connection_id].msg));
} }
} }
else if (node.splitc === 0) { else if (node.splitc === 0) {
if (clients[connection_id]) { clients[connection_id].msg.payload = data;
clients[connection_id].msg.payload = data; node.send(clients[connection_id].msg);
node.send(clients[connection_id].msg);
}
} }
else { else {
for (var j = 0; j < data.length; j++ ) { for (var j = 0; j < data.length; j++ ) {
@ -483,7 +481,8 @@ module.exports = function(RED) {
buf.copy(clients[connection_id].msg.payload,0,0,i+1); buf.copy(clients[connection_id].msg.payload,0,0,i+1);
node.send(clients[connection_id].msg); node.send(clients[connection_id].msg);
if (clients[connection_id].client) { if (clients[connection_id].client) {
node.status({}); clients[connection_id].client.destroy(); node.status({});
clients[connection_id].client.destroy();
delete clients[connection_id]; delete clients[connection_id];
} }
} }
@ -503,7 +502,8 @@ module.exports = function(RED) {
buf.copy(clients[connection_id].msg.payload,0,0,i); buf.copy(clients[connection_id].msg.payload,0,0,i);
node.send(clients[connection_id].msg); node.send(clients[connection_id].msg);
if (clients[connection_id].client) { if (clients[connection_id].client) {
node.status({}); clients[connection_id].client.destroy(); node.status({});
clients[connection_id].client.destroy();
delete clients[connection_id]; delete clients[connection_id];
} }
i = 0; i = 0;
@ -520,7 +520,8 @@ module.exports = function(RED) {
buf.copy(clients[connection_id].msg.payload,0,0,i); buf.copy(clients[connection_id].msg.payload,0,0,i);
node.send(clients[connection_id].msg); node.send(clients[connection_id].msg);
if (clients[connection_id].client) { if (clients[connection_id].client) {
node.status({}); clients[connection_id].client.destroy(); node.status({});
clients[connection_id].client.destroy();
delete clients[connection_id]; delete clients[connection_id];
} }
i = 0; i = 0;
@ -594,7 +595,9 @@ module.exports = function(RED) {
this.on("close", function(done) { this.on("close", function(done) {
node.done = done; node.done = done;
for (var client in clients) { for (var client in clients) {
clients[client].client.destroy(); if (clients.hasOwnProperty("client")) {
clients[client].client.destroy();
}
} }
node.status({}); node.status({});