core to Pi node-red-nodes info updates

to be more consistent style
This commit is contained in:
Dave Conway-Jones
2016-02-12 13:14:12 +00:00
parent 5a95e9c404
commit dd250a77bc
12 changed files with 46 additions and 49 deletions

View File

@@ -30,9 +30,10 @@
</script>
<script type="text/x-red" data-help-name="ping">
<p>Pings a machine and returns the trip time in mS.</p>
<p>Pings a machine and returns the trip time in mS as <code>msg.payload</code>.</p>
<p>Returns <b>false</b> if no response received within 5 seconds, or if the host is unresolveable.</p>
<p>Default ping is every 20 seconds but can be configured.</p>
<p><code>msg.topic</code> contains the target host ip.
</script>
<script type="text/javascript">

View File

@@ -1,5 +1,5 @@
/**
* Copyright 2013 IBM Corp.
* Copyright 2013,2016 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,46 +16,35 @@
module.exports = function(RED) {
"use strict";
var spawn = require('child_process').spawn;
var plat = require('os').platform();
var dns = require("dns")
var ping = require ("net-ping");
function PingNode(n) {
RED.nodes.createNode(this,n);
this.host = n.host;
this.timer = n.timer * 1000;
this.session = ping.createSession();
var node = this;
node.tout = setInterval(function() {
var ex;
if (plat == "linux") { ex = spawn('ping', ['-n', '-w', '5', '-c', '1', node.host]); }
else if (plat.match(/^win/)) { ex = spawn('ping', ['-n', '1', '-w', '5000', node.host]); }
else if (plat == "darwin") { ex = spawn('ping', ['-n', '-t', '5', '-c', '1', node.host]); }
else { node.error("Sorry - your platform - "+plat+" - is not recognised."); }
var res = false;
var line = "";
//var regex = /from.*time.(.*)ms/;
var regex = /=.*[<|=]([0-9]*).*TTL|ttl..*=([0-9\.]*)/;
ex.stdout.on('data', function (data) {
line += data.toString();
});
//ex.stderr.on('data', function (data) {
//console.log('[ping] stderr: ' + data);
//});
ex.on('close', function (code) {
var m = regex.exec(line)||"";
if (m !== '') {
if (m[1]) { res = Number(m[1]); }
if (m[2]) { res = Number(m[2]); }
}
var msg = { payload:false, topic:node.host };
if (code === 0) { msg = { payload:res, topic:node.host }; }
try { node.send(msg); }
catch(e) {}
dns.lookup(node.host, function(err, address, family) {
if (typeof address === 'undefined') { address = node.host; }
node.session.pingHost(address, function(error, target, sent, rcvd) {
var msg = { payload:false, topic:target };
if (error) {
msg.error = error.toString();
} else {
msg.payload = rcvd - sent;
}
node.send(msg);
node.session.close();
});
});
}, node.timer);
this.on("close", function() {
if (this.tout) { clearInterval(this.tout); }
if (node.tout) { clearInterval(this.tout); }
if (node.session) { node.session.close(); }
});
}
RED.nodes.registerType("ping",PingNode);

View File

@@ -1,7 +1,8 @@
node-red-node-ping
==================
A <a href="http://nodered.org" target="_new">Node-RED</a> node to ping a remote server, for use as a keep-alive check.
A <a href="http://nodered.org" target="_new">Node-RED</a> node to ping a
remote server, for use as a keep-alive check.
Install
-------
@@ -18,12 +19,14 @@ The fix is to allow it as follows
sudo setcap cap_net_raw=ep /bin/ping
sudo setcap cap_net_raw=ep /bin/ping6
Usage
-----
Pings a machine and returns the trip time in mS.
Pings a machine and returns the trip time in mS as **msg.payload**.
Returns boolean **false** if no response received within 5 seconds, or if the host is unresolveable.
Returns boolean `false` if no response received, or if the host is unresolveable.
**msg.wrror** will contain any error message if necessary.
**msg.topic** contains the ip address of the target host.
Default ping is every 20 seconds but can be configured.

View File

@@ -1,8 +1,9 @@
{
"name" : "node-red-node-ping",
"version" : "0.0.7",
"version" : "0.0.9",
"description" : "A Node-RED node to ping a remote server, for use as a keep-alive check.",
"dependencies" : {
"net-ping":"1.1.*"
},
"repository" : {
"type":"git",

View File

@@ -30,7 +30,7 @@
<p>Can either <ul><li>wait for a "split" character (default \n). Also accepts hex notation (0x0a).</li>
<li>Wait for a timeout in milliseconds for the first character received</li>
<li>Wait to fill a fixed sized buffer</li></ul></p>
<p>It then outputs <b>msg.payload</b> as either a UTF8 ascii string or a binary Buffer object.</p>
<p>It then outputs <code>msg.payload</code> as either a UTF8 ascii string or a binary Buffer object.</p>
<p>If no split character is specified, or a timeout or buffer size of 0, then a stream of single characters is sent - again either as ascii chars or size 1 binary buffers.</p>
</script>
@@ -68,8 +68,9 @@
<script type="text/x-red" data-help-name="serial out">
<p>Provides a connection to an outbound serial port.</p>
<p>Only the <b>msg.payload</b> is sent.</p>
<p>Only the <code>msg.payload</code> is sent.</p>
<p>Optionally the new line character used to split the input can be appended to every message sent out to the serial port.</p>
<p>Binary payloads can be sent by using a Buffer object.</p>
</script>
<script type="text/javascript">

View File

@@ -1,6 +1,6 @@
{
"name" : "node-red-node-serialport",
"version" : "0.1.0",
"version" : "0.1.1",
"description" : "Node-RED nodes to talk to an serial port",
"dependencies" : {
"serialport" : "2.0.*"