frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into 0.17

This commit is contained in:
Nick O'Leary 2017-05-11 15:10:12 +01:00
parent e79da408a8 48958f392f
commit 7730d0a4f8
No known key found for this signature in database
GPG Key ID: 4F2157149161A6C9
4 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/js/ui/tab-info.js
View File

@ -213,7 +213,6 @@ RED.sidebar.info = (function() {
$('<tr class="node-info-subflow-row"><td>'+RED._("sidebar.info.instances")+"</td><td>"+userCount+'</td></tr>').appendTo(tableBody);
}
}
$(table).appendTo(nodeSection.content);
var infoText = "";

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

@ -63,7 +63,7 @@ module.exports = function(RED) {
if ((node.datatype) === "utf8" && node.newline !== "") {
buffer = buffer+data;
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._session = {type:"tcp",id:id};
node.send(msg);
@ -143,13 +143,13 @@ 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],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};
node.send(msg);
}
buffer = parts[parts.length-1];
} 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};
node.send(msg);
}
@ -164,7 +164,7 @@ module.exports = function(RED) {
socket.on('end', function() {
if (!node.stream || (node.datatype === "utf8" && node.newline !== "")) {
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};
node.send(msg);
}
@ -209,7 +209,6 @@ module.exports = function(RED) {
}
});
}
}
RED.nodes.registerType("tcp in",TcpIn);
@ -461,6 +460,7 @@ module.exports = function(RED) {
clients[connection_id].client.on('data', function(data) {
if (node.out === "sit") { // if we are staying connected just send the buffer
if (clients[connection_id]) {
if (!clients[connection_id].hasOwnProperty("msg")) { clients[connection_id].msg = {}; }
clients[connection_id].msg.payload = data;
node.send(RED.util.cloneMessage(clients[connection_id].msg));
}
@ -486,7 +486,7 @@ module.exports = function(RED) {
buf.copy(clients[connection_id].msg.payload,0,0,i+1);
node.send(clients[connection_id].msg);
if (clients[connection_id].client) {
node.status({});
node.status({});
clients[connection_id].client.destroy();
delete clients[connection_id];
}
@ -507,7 +507,7 @@ module.exports = function(RED) {
buf.copy(clients[connection_id].msg.payload,0,0,i);
node.send(clients[connection_id].msg);
if (clients[connection_id].client) {
node.status({});
node.status({});
clients[connection_id].client.destroy();
delete clients[connection_id];
}
@ -579,14 +579,16 @@ module.exports = function(RED) {
clients[connection_id].client.on('timeout',function() {
//console.log("TIMEOUT");
clients[connection_id].connected = false;
node.status({fill:"grey",shape:"dot",text:"tcpin.errors.connect-timeout"});
//node.warn(RED._("tcpin.errors.connect-timeout"));
if (clients[connection_id] && clients[connection_id].client) {
clients[connection_id].client.connect(port, host, function() {
clients[connection_id].connected = true;
node.status({fill:"green",shape:"dot",text:"common.status.connected"});
});
if (clients[connection_id]) {
clients[connection_id].connected = false;
node.status({fill:"grey",shape:"dot",text:"tcpin.errors.connect-timeout"});
//node.warn(RED._("tcpin.errors.connect-timeout"));
if (clients[connection_id].client) {
clients[connection_id].client.connect(port, host, function() {
clients[connection_id].connected = true;
node.status({fill:"green",shape:"dot",text:"common.status.connected"});
});
}
}
});
}
@ -600,7 +602,9 @@ module.exports = function(RED) {
this.on("close", function(done) {
node.done = done;
for (var client in clients) {
clients[client].client.destroy();
if (clients.hasOwnProperty("client")) {
clients[client].client.destroy();
}
}
node.status({});

2
red/runtime/nodes/Node.js
View File

@ -65,7 +65,7 @@ Node.prototype.updateWires = function(wires) {
}
Node.prototype.context = function() {
if (!this._context) {
this._context = context.get(this._alias||this.id,this.z);
this._context = context.get(this._alias||this.id,this.z);
}
return this._context;
}

6
red/runtime/nodes/context.js
View File

@ -47,9 +47,9 @@ function getContext(localId,flowId) {
var newContext = createContext(contextId);
if (flowId) {
newContext.flow = getContext(flowId);
if (globalContext) {
newContext.global = globalContext;
}
}
if (globalContext) {
newContext.global = globalContext;
}
contexts[contextId] = newContext;
return newContext;