Briq
/
red-briq-nodes
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Aggiungi timeout socket configurabile ai nodi TCP

master
Guido Longoni 2026-05-06 12:16:19 +02:00
parent e1cdaca4d1
commit 597cc781c4
2 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
red/tcp/tcp.html
View File

@ -44,6 +44,11 @@
<label><i class="fa fa-clock-o"></i> <span>Keepalive</span></label>
<input type="text" id="node-input-keepalive" style="text-align:end; width:200px !important">
</div>
<div class="form-row">
<label><i class="fa fa-hourglass-half"></i> <span>Socket timeout</span></label>
<input type="text" id="node-input-socketTimeout" placeholder="default" style="text-align:end; width:120px !important">
<span>ms</span>
</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;">
@ -72,6 +77,7 @@
datatype: { value: "buffer" },
newline: { value: "" },
keepalive: { value: "120000" },
socketTimeout: { value: "" },
topic: { value: "" },
base64: {/*deprecated*/ value: false, required: true }
},
@ -109,6 +115,7 @@
$("#node-input-datatype").change(updateOptions);
$("#node-input-datamode").change(updateOptions);
$("#node-input-keepalive").spinner({ min: 1 });
$("#node-input-socketTimeout").spinner({ min: 0 });
}
});
</script>
@ -141,6 +148,12 @@
<label for="node-input-base64" style="width: 70%;"><span data-i18n="tcpin.label.decode-base64"></span></label>
</div>
<div class="form-row">
<label><i class="fa fa-hourglass-half"></i> <span>Socket timeout</span></label>
<input type="text" id="node-input-socketTimeout" placeholder="default" style="text-align:end; width:120px !important">
<span>ms</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>
<input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@ -157,6 +170,7 @@
beserver: { value: "client", required: true },
base64: { value: false, required: true },
end: { value: false, required: true },
socketTimeout: { value: "" },
name: { value: "" }
},
inputs: 1,
@ -188,6 +202,7 @@
};
updateOptions();
$("#node-input-beserver").change(updateOptions);
$("#node-input-socketTimeout").spinner({ min: 0 });
}
});
</script>
@ -212,6 +227,11 @@
<input type="text" id="node-input-splitc" style="width:50px;">
<span id="node-units"></span>
</div>
<div class="form-row">
<label><i class="fa fa-hourglass-half"></i> <span>Socket timeout</span></label>
<input type="text" id="node-input-socketTimeout" placeholder="default" style="text-align:end; width:120px !important">
<span>ms</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>
<input type="text" id="node-input-name" data-i18n="[placeholder]common.label.name">
@ -227,6 +247,7 @@
port: { value: "", validate: RED.validators.regex(/^(\d*|)$/) },
out: { value: "time", required: true },
splitc: { value: "0", required: true },
socketTimeout: { value: "" },
name: { value: "" }
},
inputs: 1,
@ -263,6 +284,7 @@
$("#node-units").text("");
}
});
$("#node-input-socketTimeout").spinner({ min: 0 });
}
});
</script>

31
red/tcp/tcp.js
View File

@ -17,13 +17,27 @@
module.exports = function(RED) {
"use strict";
var reconnectTime = RED.settings.socketReconnectTime||10000;
var socketTimeout = RED.settings.socketTimeout||null;
var socketTimeout = parseSocketTimeout(RED.settings.socketTimeout, null);
const msgQueueSize = RED.settings.tcpMsgQueueSize || 1000;
const Denque = require('denque');
var net = require('net');
var connectionPool = {};
function parseSocketTimeout(value, defaultValue) {
if (value === undefined || value === null || value === "") {
return defaultValue;
}
value = Number(value);
return Number.isFinite(value) && value >= 0 ? value : defaultValue;
}
function applySocketTimeout(socket, timeout) {
if (timeout !== null && timeout > 0) {
socket.setTimeout(timeout);
}
}
/**
* Enqueue `item` in `queue`
* @param {Denque} queue - Queue
@ -56,6 +70,7 @@ module.exports = function(RED) {
this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r");
this.base64 = n.base64;
this.keepalive = parseInt(n.keepalive) || 120000;
this.socketTimeout = parseSocketTimeout(n.socketTimeout, socketTimeout);
this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server");
this.closing = false;
this.connected = false;
@ -77,7 +92,8 @@ module.exports = function(RED) {
node.log(RED._("tcpin.status.connected",{host:node.host,port:node.port}));
node.status({fill:"green",shape:"dot",text:"common.status.connected"});
});
client.setKeepAlive(true, this.keepalive);
client.setKeepAlive(true, node.keepalive);
applySocketTimeout(client, node.socketTimeout);
connectionPool[id] = client;
client.on('data', function (data) {
@ -152,8 +168,8 @@ module.exports = function(RED) {
}
else {
var server = net.createServer(function (socket) {
socket.setKeepAlive(true, this.keepalive);
if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
socket.setKeepAlive(true, node.keepalive);
applySocketTimeout(socket, node.socketTimeout);
var id = (1+Math.random()*4294967295).toString(16);
var fromi;
var fromp;
@ -267,6 +283,7 @@ module.exports = function(RED) {
this.doend = n.end || false;
this.beserver = n.beserver;
this.name = n.name;
this.socketTimeout = parseSocketTimeout(n.socketTimeout, socketTimeout);
this.closing = false;
this.connected = false;
var node = this;
@ -285,6 +302,7 @@ module.exports = function(RED) {
node.status({fill:"green",shape:"dot",text:"common.status.connected"});
});
client.setKeepAlive(true,120000);
applySocketTimeout(client, node.socketTimeout);
client.on('error', function (err) {
node.log(RED._("tcpin.errors.error",{error:err.toString()}));
});
@ -371,7 +389,7 @@ module.exports = function(RED) {
node.status({text:RED._("tcpin.status.connections",{count:0})});
var server = net.createServer(function (socket) {
socket.setKeepAlive(true,120000);
if (socketTimeout !== null) { socket.setTimeout(socketTimeout); }
applySocketTimeout(socket, node.socketTimeout);
node.log(RED._("tcpin.status.connection-from",{host:socket.remoteAddress, port:socket.remotePort}));
connectedSockets.push(socket);
node.status({text:RED._("tcpin.status.connections",{count:connectedSockets.length})});
@ -443,6 +461,7 @@ module.exports = function(RED) {
this.port = Number(n.port);
this.out = n.out;
this.splitc = n.splitc;
this.socketTimeout = parseSocketTimeout(n.socketTimeout, socketTimeout);
if (this.out === "immed") { this.splitc = -1; this.out = "time"; }
if (this.out !== "char") { this.splitc = Number(this.splitc); }
@ -498,7 +517,7 @@ module.exports = function(RED) {
else { buf = Buffer.alloc(65536); } // set it to 64k... hopefully big enough for most TCP packets.... but only hopefully
clients[connection_id].client = net.Socket();
if (socketTimeout !== null) { clients[connection_id].client.setTimeout(socketTimeout);}
applySocketTimeout(clients[connection_id].client, node.socketTimeout);
if (host && port) {
clients[connection_id].connecting = true;