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

Resync with master

Browse Source
This commit is contained in:
Nick O'Leary
2017-03-01 17:45:09 +00:00
parent cdd6b243ff 54ee655472
commit 73501f3ad3
24 changed files with 318 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nodes/core/core/58-debug.html
View File

@@ -170,7 +170,7 @@
this.handleDebugMessage = function(t,o) {
var sourceNode = RED.nodes.node(o.id) || RED.nodes.node(o.z);
if (sourceNode) {
o._source = {id:sourceNode.id,z:sourceNode.z};
o._source = {id:sourceNode.id,z:sourceNode.z,name:sourceNode.name};
}
RED.debug.handleDebugMessage(o);

5
nodes/core/core/75-exec.html
View File

@@ -47,10 +47,13 @@
<p>Calls out to a system command.<br/></p>
<p>Provides 3 outputs: stdout, stderr, and return code.</p>
<p>By default uses the <code>exec</code> system call which calls the command, then gets a callback
on completion, returning the complete result in one message, along with any errors.</p>
on completion, returning stdout as the payload to the first, the error code as the third
and, if available, stderr to the second output. If no error occurred, a zero is returned on the third output.</p>
<p>Optionally can use <code>spawn</code> instead, which returns the output from stdout and stderr
as the command runs (usually one line at a time). On completion it then returns a return code
(on the 3rd output).</p>
<p>The <code>exec</code> method spawns a subshell and therefore can be used for more complicated
commands involving pipes. However, it waits for completion of the whole command before returing anything.</p>
<p>The optional append gets added to the command after <code>msg.payload</code> - so you can do
things like pipe the result to another command.</p>
<p>Commands or parameters with spaces should be enclosed in quotes - <i>"This is a single parameter"</i></p>

11
nodes/core/core/75-exec.js
View File

@@ -115,12 +115,17 @@ module.exports = function(RED) {
child = exec(cl, {encoding: 'binary', maxBuffer:10000000}, function (error, stdout, stderr) {
msg.payload = new Buffer(stdout,"binary");
if (isUtf8(msg.payload)) { msg.payload = msg.payload.toString(); }
var msg2 = {payload:stderr};
var msg3 = null;
var msg2 = null;
if(stderr) {
msg2 = {payload: stderr};
}
var msg3 = {payload:0};
node.status({});
//console.log('[exec] stdout: ' + stdout);
//console.log('[exec] stderr: ' + stderr);
if (error !== null) {
msg3 = {payload:error};
msg3 = {payload:error.code};
node.status({fill:"red",shape:"dot",text:"error: "+error.code});
//console.log('[exec] error: ' + error);
}
if (!msg3) { node.status({}); }

44
nodes/core/core/80-template.js
View File

@@ -22,8 +22,8 @@ module.exports = function(RED) {
* Custom Mustache Context capable to resolve message property and node
* flow and global context
*/
function NodeContext(msg, nodeContext) {
this.msgContext = new mustache.Context(msg);
function NodeContext(msg, nodeContext,parent) {
this.msgContext = new mustache.Context(msg,parent);
this.nodeContext = nodeContext;
}
@@ -31,26 +31,34 @@ module.exports = function(RED) {
NodeContext.prototype.lookup = function (name) {
// try message first:
var value = this.msgContext.lookup(name);
if (value !== undefined) {
return value;
}
// try node context:
var dot = name.indexOf(".");
if (dot > 0) {
var contextName = name.substr(0, dot);
var variableName = name.substr(dot + 1);
if (contextName === "flow" && this.nodeContext.flow) {
return this.nodeContext.flow.get(variableName);
try {
var value = this.msgContext.lookup(name);
if (value !== undefined) {
return value;
}
else if (contextName === "global" && this.nodeContext.global) {
return this.nodeContext.global.get(variableName);
// try node context:
var dot = name.indexOf(".");
if (dot > 0) {
var contextName = name.substr(0, dot);
var variableName = name.substr(dot + 1);
if (contextName === "flow" && this.nodeContext.flow) {
return this.nodeContext.flow.get(variableName);
}
else if (contextName === "global" && this.nodeContext.global) {
return this.nodeContext.global.get(variableName);
}
}
}catch(err) {
throw err;
}
}
NodeContext.prototype.push = function push (view) {
return new NodeContext(view, this.nodeContext,this.msgContext);
};
function TemplateNode(n) {
RED.nodes.createNode(this,n);
this.name = n.name;
@@ -65,7 +73,7 @@ module.exports = function(RED) {
try {
var value;
if (node.syntax === "mustache") {
value = mustache.render(node.template, new NodeContext(msg, node.context()));
value = mustache.render(node.template,new NodeContext(msg, node.context()));
} else {
value = node.template;
}

2
nodes/core/core/lib/debug/debug-utils.js
View File

@@ -205,7 +205,7 @@ RED.debug = (function() {
var metaRow = $('<div class="debug-message-meta"></div>').appendTo(msg);
$('<span class="debug-message-date">'+ getTimestamp()+'</span>').appendTo(metaRow);
if (sourceNode) {
$('<a>',{href:"#",class:"debug-message-name"}).html('node: '+sourceNode.id)
$('<a>',{href:"#",class:"debug-message-name"}).html('node: '+(sourceNode.name||sourceNode.id))
.appendTo(metaRow)
.click(function(evt) {
evt.preventDefault();

2
nodes/core/hardware/36-rpi-gpio.js
View File

@@ -84,7 +84,7 @@ module.exports = function(RED) {
node.child.stdout.on('data', function (data) {
var d = data.toString().trim().split("\n");
for (var i = 0; i < d.length; i++) {
if (node.running && node.buttonState !== -1 && !isNaN(Number(d[i]))) {
if (node.running && node.buttonState !== -1 && !isNaN(Number(d[i])) && node.buttonState !== d[i]) {
node.send({ topic:"pi/"+node.pin, payload:Number(d[i]) });
}
node.buttonState = d[i];

6
nodes/core/hardware/nrgpio.py
View File

@@ -99,9 +99,9 @@ if len(sys.argv) > 2:
elif cmd == "in":
#print "Initialised pin "+str(pin)+" to IN"
bounce = int(sys.argv[4])
bounce = float(sys.argv[4])
def handle_callback(chan):
sleep(bounce/1000)
sleep(bounce/1000.0)
print GPIO.input(chan)
if sys.argv[3].lower() == "up":
@@ -112,7 +112,7 @@ if len(sys.argv) > 2:
GPIO.setup(pin,GPIO.IN)
print GPIO.input(pin)
GPIO.add_event_detect(pin, GPIO.BOTH, callback=handle_callback, bouncetime=bounce)
GPIO.add_event_detect(pin, GPIO.BOTH, callback=handle_callback, bouncetime=int(bounce))
while True:
try:

14
nodes/core/io/22-websocket.js
View File

@@ -36,6 +36,7 @@ module.exports = function(RED) {
node.closing = false;
function startconn() { // Connect to remote endpoint
node.tout = null;
var socket = new ws(node.path);
socket.setMaxListeners(0);
node.server = socket; // keep for closing
@@ -52,6 +53,7 @@ module.exports = function(RED) {
if (node.isServer) { delete node._clients[id]; node.emit('closed',Object.keys(node._clients).length); }
else { node.emit('closed'); }
if (!node.closing && !node.isServer) {
clearTimeout(node.tout);
node.tout = setTimeout(function() { startconn(); }, 3000); // try to reconnect every 3 secs... bit fast ?
}
});
@@ -61,6 +63,7 @@ module.exports = function(RED) {
socket.on('error', function(err) {
node.emit('erro');
if (!node.closing && !node.isServer) {
clearTimeout(node.tout);
node.tout = setTimeout(function() { startconn(); }, 3000); // try to reconnect every 3 secs... bit fast ?
}
});
@@ -123,7 +126,10 @@ module.exports = function(RED) {
else {
node.closing = true;
node.server.close();
if (node.tout) { clearTimeout(node.tout); }
if (node.tout) {
clearTimeout(node.tout);
node.tout = null;
}
}
});
}
@@ -205,7 +211,9 @@ module.exports = function(RED) {
this.error(RED._("websocket.errors.missing-conf"));
}
this.on('close', function() {
node.serverConfig.removeInputNode(node);
if (node.serverConfig) {
node.serverConfig.removeInputNode(node);
}
node.status({});
});
}
@@ -217,7 +225,7 @@ module.exports = function(RED) {
this.server = (n.client)?n.client:n.server;
this.serverConfig = RED.nodes.getNode(this.server);
if (!this.serverConfig) {
this.error(RED._("websocket.errors.missing-conf"));
return this.error(RED._("websocket.errors.missing-conf"));
}
else {
// TODO: nls

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

@@ -444,7 +444,7 @@ module.exports = function(RED) {
//node.log(RED._("tcpin.errors.client-connected"));
node.status({fill:"green",shape:"dot",text:"common.status.connected"});
if (clients[connection_id] && clients[connection_id].client) {
clients[connection_id].connected = true;
clients[connection_id].connected = true;
clients[connection_id].client.write(clients[connection_id].msg.payload);
}
});
@@ -454,10 +454,10 @@ 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 (node.out === "sit") { // if we are staying connected just send the buffer
if (clients[connection_id]) {
clients[connection_id].msg.payload = data;
node.send(clients[connection_id].msg);
node.send(RED.util.cloneMessage(clients[connection_id].msg));
}
}
else if (node.splitc === 0) {
@@ -533,7 +533,7 @@ module.exports = function(RED) {
//console.log("END");
node.status({fill:"grey",shape:"ring",text:"common.status.disconnected"});
if (clients[connection_id] && clients[connection_id].client) {
clients[connection_id].connected = false;
clients[connection_id].connected = false;
clients[connection_id].client = null;
}
});
@@ -541,7 +541,7 @@ module.exports = function(RED) {
clients[connection_id].client.on('close', function() {
//console.log("CLOSE");
if (clients[connection_id]) {
clients[connection_id].connected = false;
clients[connection_id].connected = false;
}
var anyConnected = false;