frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow TCP node option to break connections per message (and auto

Browse Source 
reconnect) - eg for file trnasfer to indicate EOF.

Change to FA icons.
This commit is contained in:
Dave C-J
2014-09-03 20:06:29 +01:00
parent e136080888
commit fc679adefb
2 changed files with 172 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,11 +34,13 @@ module.exports = function(RED) {
this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server");
this.closing = false;
var node = this;
var count = 0;
if (!node.server) {
var buffer = null;
var client;
var reconnectTimeout;
var end = false;
var setupTcpClient = function() {
node.log("connecting to "+node.host+":"+node.port);
node.status({fill:"grey",shape:"dot",text:"connecting"});
@@ -81,16 +83,25 @@ module.exports = function(RED) {
if (!node.stream || (node.datatype == "utf8" && node.newline != "" && buffer.length > 0)) {
var msg = {topic:node.topic,payload:buffer};
msg._session = {type:"tcp",id:id};
node.send(msg);
if (buffer.length !== 0) {
end = true; // only ask for fast re-connect if we actually got something
node.send(msg);
}
buffer = null;
}
});
client.on('close', function() {
delete connectionPool[id];
node.log("connection lost to "+node.host+":"+node.port);
node.status({fill:"red",shape:"ring",text:"disconnected"});
if (!node.closing) {
reconnectTimeout = setTimeout(setupTcpClient, reconnectTime);
if (end) { // if we were asked to close then try to reconnect once very quick.
end = false;
reconnectTimeout = setTimeout(setupTcpClient, 20);
}
else {
node.log("connection lost to "+node.host+":"+node.port);
reconnectTimeout = setTimeout(setupTcpClient, reconnectTime);
}
}
});
client.on('error', function(err) {
@@ -109,13 +120,13 @@ module.exports = function(RED) {
if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
var id = (1+Math.random()*4294967295).toString(16);
connectionPool[id] = socket;
node.status({text:++count+" connections"});
var buffer = (node.datatype == 'buffer')? new Buffer(0):"";
socket.on('data', function (data) {
if (node.datatype != 'buffer') {
data = data.toString(node.datatype);
}
if (node.stream) {
if ((typeof data) === "string" && node.newline != "") {
buffer = buffer+data;
@@ -140,10 +151,12 @@ module.exports = function(RED) {
}
});
socket.on('end', function() {
if (!node.stream || (node.datatype == "utf8" && node.newline != "" && buffer.length > 0)) {
var msg = {topic:node.topic,payload:buffer};
msg._session = {type:"tcp",id:id};
node.send(msg);
if (!node.stream || (node.datatype === "utf8" && node.newline !== "")) {
if (buffer.length > 0) {
var msg = {topic:node.topic,payload:buffer};
msg._session = {type:"tcp",id:id};
node.send(msg);
}
buffer = null;
}
});
@@ -153,6 +166,7 @@ module.exports = function(RED) {
});
socket.on('close', function() {
delete connectionPool[id];
node.status({text:--count+" connections"});
});
socket.on('error',function(err) {
node.log(err);
@@ -186,6 +200,7 @@ module.exports = function(RED) {
this.host = n.host;
this.port = n.port * 1;
this.base64 = n.base64;
this.doend = n.end || false;
this.beserver = n.beserver;
this.name = n.name;
this.closing = false;
@@ -195,6 +210,7 @@ module.exports = function(RED) {
var reconnectTimeout;
var client = null;
var connected = false;
var end = false;
var setupTcpClient = function() {
node.log("connecting to "+node.host+":"+node.port);
@@ -210,12 +226,18 @@ module.exports = function(RED) {
client.on('end', function (err) {
});
client.on('close', function() {
node.log("connection lost to "+node.host+":"+node.port);
node.status({fill:"red",shape:"ring",text:"disconnected"});
connected = false;
client.destroy();
if (!node.closing) {
reconnectTimeout = setTimeout(setupTcpClient,reconnectTime);
if (end) {
end = false;
reconnectTimeout = setTimeout(setupTcpClient,20);
}
else {
node.log("connection lost to "+node.host+":"+node.port);
reconnectTimeout = setTimeout(setupTcpClient,reconnectTime);
}
}
});
}
@@ -230,6 +252,10 @@ module.exports = function(RED) {
} else {
client.write(new Buffer(""+msg.payload));
}
if (node.doend === true) {
end = true;
client.end();
}
}
});
@@ -256,11 +282,13 @@ module.exports = function(RED) {
});
} else {
var connectedSockets = [];
node.status({text:"0 connections"});
var server = net.createServer(function (socket) {
if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
var remoteDetails = socket.remoteAddress+":"+socket.remotePort;
node.log("connection from "+remoteDetails);
connectedSockets.push(socket);
node.status({text:connectedSockets.length+" connections"});
socket.on('timeout', function() {
node.log('timeout closed socket port '+node.port);
socket.end();
@@ -268,12 +296,15 @@ module.exports = function(RED) {
socket.on('close',function() {
node.log("connection closed from "+remoteDetails);
connectedSockets.splice(connectedSockets.indexOf(socket),1);
node.status({text:connectedSockets.length+" connections"});
});
socket.on('error',function() {
node.log("socket error from "+remoteDetails);
connectedSockets.splice(connectedSockets.indexOf(socket),1);
node.status({text:connectedSockets.length+" connections"});
});
});
node.on("input", function(msg) {
if (msg.payload != null) {
var buffer;
@@ -285,7 +316,8 @@ module.exports = function(RED) {
buffer = new Buffer(""+msg.payload);
}
for (var i = 0; i<connectedSockets.length;i+=1) {
connectedSockets[i].write(buffer);
if (node.doend === true) { connectedSockets[i].end(buffer); }
else { connectedSockets[i].write(buffer); }
}
}
});
@@ -325,94 +357,110 @@ module.exports = function(RED) {
if (this.out == "count") { buf = new Buffer(this.splitc); }
else { buf = new Buffer(32768); } // set it to 32k... hopefully big enough for most.... but only hopefully
this.connected = false;
var node = this;
var client;
this.on("input", function(msg) {
var i = 0;
if (!(msg.payload instanceof Buffer)) {
if ((!Buffer.isBuffer(msg.payload)) && (typeof msg.payload !== "string")) {
msg.payload = msg.payload.toString();
}
client = net.Socket();
client.setTimeout(socketTimeout);
client.connect(node.port, node.server, function() {
//node.log('client connected');
client.write(msg.payload);
});
client.on('data', function(data) {
//node.log("data", data.length, data);
if (!node.connected) {
client = net.Socket();
client.setTimeout(socketTimeout);
node.status({});
client.connect(node.port, node.server, function() {
//node.log('client connected');
node.status({fill:"green",shape:"dot",text:"connected"});
node.connected = true;
client.write(msg.payload);
});
if (node.splitc === 0) {
node.send({"payload": data});
}
else {
for (var j = 0; j < data.length; j++ ) {
if (node.out == "time") {
// do the timer thing
if (node.tout) {
i += 1;
buf[i] = data[j];
client.on('data', function(data) {
//node.log("data:"+ data.length+":"+ data);
if (node.splitc === 0) {
node.send({"payload": data});
}
else if (node.out === "sit") { // if we are staying connected just send the buffer
node.send({"payload": data});
}
else {
for (var j = 0; j < data.length; j++ ) {
if (node.out === "time") {
// do the timer thing
if (node.tout) {
i += 1;
buf[i] = data[j];
}
else {
node.tout = setTimeout(function () {
node.tout = null;
var m = new Buffer(i+1);
buf.copy(m,0,0,i+1);
node.send({"payload": m});
client.end();
m = null;
}, node.splitc);
i = 0;
buf[0] = data[j];
}
}
// count bytes into a buffer...
else if (node.out == "count") {
buf[i] = data[j];
i += 1;
if ( i >= node.serialConfig.count) {
node.send({"payload": buf});
client.end();
i = 0;
}
}
// look for a char
else {
node.tout = setTimeout(function () {
node.tout = null;
var m = new Buffer(i+1);
buf.copy(m,0,0,i+1);
buf[i] = data[j];
i += 1;
if (data[j] == node.splitc) {
var m = new Buffer(i);
buf.copy(m,0,0,i);
node.send({"payload": m});
client.end();
m = null;
}, node.splitc);
i = 0;
buf[0] = data[j];
}
}
// count bytes into a buffer...
else if (node.out == "count") {
buf[i] = data[j];
i += 1;
if ( i >= node.serialConfig.count) {
node.send({"payload": buf});
client.end();
i = 0;
}
}
// look for a char
else {
buf[i] = data[j];
i += 1;
if (data[j] == node.splitc) {
var m = new Buffer(i);
buf.copy(m,0,0,i);
node.send({"payload": m});
client.end();
m = null;
i = 0;
i = 0;
}
}
}
}
}
});
});
client.on('end', function() {
//node.log('client disconnected');
});
client.on('error', function() {
node.log('connect failed');
if (client) { client.end(); }
});
client.on('timeout',function() {
node.log('connect timeout');
if (client) {
client.end();
setTimeout(function() {
client.connect(node.port, node.server, function() {
//node.log('client connected');
client.write(msg.payload);
});
},reconnectTime);
}
client.on('end', function() {
//node.log('client disconnected');
node.connected = false;
node.status({});
client = null;
});
});
client.on('error', function() {
node.log('connect failed');
node.status({fill:"red",shape:"ring",text:"error"});
if (client) { client.end(); }
});
client.on('timeout',function() {
node.log('connect timeout');
if (client) {
client.end();
setTimeout(function() {
client.connect(node.port, node.server, function() {
//node.log('client connected');
node.connected = true;
client.write(msg.payload);
});
},reconnectTime);
}
});
}
else { client.write(msg.payload); }
});
this.on("close", function() {