frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

add Status to email, http nodes (update copyright on tcp)

Browse Source
This commit is contained in:
Dave C-J 2014-05-13 11:39:59 +01:00
parent 0e8f0735cc
commit 6f0e619611
4 changed files with 115 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
nodes/core/io/21-httpin.js
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2013 IBM Corp. * Copyright 2013,2014 IBM Corp.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -140,70 +140,73 @@ module.exports = function(RED) {
var node = this; var node = this;
var credentials = RED.nodes.getCredentials(n.id); var credentials = RED.nodes.getCredentials(n.id);
this.on("input",function(msg) { this.on("input",function(msg) {
var url; node.status({fill:"blue",shape:"dot",text:"requesting"});
if (msg.url) { var url;
url = msg.url; if (msg.url) {
} else if (isTemplatedUrl) { url = msg.url;
url = mustache.render(nodeUrl,msg); } else if (isTemplatedUrl) {
url = mustache.render(nodeUrl,msg);
} else {
url = nodeUrl;
}
var method = (msg.method||nodeMethod).toUpperCase();
var opts = urllib.parse(url);
opts.method = method;
opts.headers = {};
if (msg.headers) {
for (var v in msg.headers) {
opts.headers[v.toLowerCase()] = msg.headers[v];
}
}
if (credentials) {
opts.auth = credentials.user+":"+(credentials.password||"");
}
var payload = null;
if (msg.payload && (method == "POST" || method == "PUT") ) {
if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
payload = msg.payload;
} else if (typeof msg.payload == "number") {
payload = msg.payload+"";
} else { } else {
url = nodeUrl; if (opts.headers['content-type'] == 'application/x-www-form-urlencoded') {
} payload = querystring.stringify(msg.payload);
var method = (msg.method||nodeMethod).toUpperCase();
var opts = urllib.parse(url);
opts.method = method;
opts.headers = {};
if (msg.headers) {
for (var v in msg.headers) {
opts.headers[v.toLowerCase()] = msg.headers[v];
}
}
if (credentials) {
opts.auth = credentials.user+":"+(credentials.password||"");
}
var payload = null;
if (msg.payload && (method == "POST" || method == "PUT") ) {
if (typeof msg.payload === "string" || Buffer.isBuffer(msg.payload)) {
payload = msg.payload;
} else if (typeof msg.payload == "number") {
payload = msg.payload+"";
} else { } else {
if (opts.headers['content-type'] == 'application/x-www-form-urlencoded') { payload = JSON.stringify(msg.payload);
payload = querystring.stringify(msg.payload); if (opts.headers['content-type'] == null) {
} else { opts.headers['content-type'] = "application/json";
payload = JSON.stringify(msg.payload);
if (opts.headers['content-type'] == null) {
opts.headers['content-type'] = "application/json";
}
} }
} }
if (opts.headers['content-length'] == null) {
opts.headers['content-length'] = Buffer.byteLength(payload);
}
} }
if (opts.headers['content-length'] == null) {
opts.headers['content-length'] = Buffer.byteLength(payload);
}
}
var req = ((/^https/.test(url))?https:http).request(opts,function(res) { var req = ((/^https/.test(url))?https:http).request(opts,function(res) {
res.setEncoding('utf8'); res.setEncoding('utf8');
msg.statusCode = res.statusCode; msg.statusCode = res.statusCode;
msg.headers = res.headers; msg.headers = res.headers;
msg.payload = ""; msg.payload = "";
res.on('data',function(chunk) { res.on('data',function(chunk) {
msg.payload += chunk; msg.payload += chunk;
});
res.on('end',function() {
node.send(msg);
});
}); });
req.on('error',function(err) { res.on('end',function() {
msg.payload = err.toString();
msg.statusCode = err.code;
node.send(msg); node.send(msg);
node.status({});
}); });
if (payload) { });
req.write(payload); req.on('error',function(err) {
} msg.payload = err.toString();
req.end(); msg.statusCode = err.code;
node.send(msg);
node.status({fill:"red",shape:"ring",text:err.code});
});
if (payload) {
req.write(payload);
}
req.end();
}); });
} }
RED.nodes.registerType("http request",HTTPRequest); RED.nodes.registerType("http request",HTTPRequest);

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

@ -1,5 +1,5 @@
/** /**
* Copyright 2013 IBM Corp. * Copyright 2013,2014 IBM Corp.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
nodes/core/social/61-email.html
View File

@ -1,5 +1,5 @@
<!-- <!--
Copyright 2013 IBM Corp. Copyright 2013,2014 IBM Corp.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

24
nodes/core/social/61-email.js
View File

@ -1,5 +1,5 @@
/** /**
* Copyright 2013 IBM Corp. * Copyright 2013,2014 IBM Corp.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,7 +26,6 @@ module.exports = function(RED) {
//console.log(nodemailer.Transport.transports.SMTP.wellKnownHosts); //console.log(nodemailer.Transport.transports.SMTP.wellKnownHosts);
// module.exports = { service: "Gmail", user: "blahblah@gmail.com", pass: "password", server: "imap.gmail.com", port: "993" }
try { var globalkeys = RED.settings.email || require(process.env.NODE_RED_HOME+"/../emailkeys.js"); } try { var globalkeys = RED.settings.email || require(process.env.NODE_RED_HOME+"/../emailkeys.js"); }
catch(err) { } catch(err) { }
@ -68,8 +67,8 @@ module.exports = function(RED) {
}); });
this.on("input", function(msg) { this.on("input", function(msg) {
//node.log("email :",this.id,this.topic," received",msg.payload);
if (msg != null) { if (msg != null) {
node.status({fill:"blue",shape:"dot",text:"sending"},true);
if (smtpTransport) { if (smtpTransport) {
smtpTransport.sendMail({ smtpTransport.sendMail({
from: node.userid, // sender address from: node.userid, // sender address
@ -79,8 +78,10 @@ module.exports = function(RED) {
}, function(error, response) { }, function(error, response) {
if (error) { if (error) {
node.error(error); node.error(error);
node.status({fill:"red",shape:"ring",text:"post error"},true);
} else { } else {
node.log("Message sent: " + response.message); node.log("Message sent: " + response.message);
node.status({},true);
} }
}); });
} }
@ -133,6 +134,7 @@ module.exports = function(RED) {
this.on("input", function(msg) { this.on("input", function(msg) {
imap.once('ready', function() { imap.once('ready', function() {
node.status({fill:"blue",shape:"dot",text:"fetching"},true);
var pay = {}; var pay = {};
imap.openBox('INBOX', true, function(err, box) { imap.openBox('INBOX', true, function(err, box) {
if (box.messages.total > 0) { if (box.messages.total > 0) {
@ -170,6 +172,7 @@ module.exports = function(RED) {
}); });
f.on('error', function(err) { f.on('error', function(err) {
node.warn('fetch error: ' + err); node.warn('fetch error: ' + err);
node.status({fill:"red",shape:"ring",text:"fetch error"},true);
}); });
f.on('end', function() { f.on('end', function() {
if (JSON.stringify(pay) !== oldmail) { if (JSON.stringify(pay) !== oldmail) {
@ -178,21 +181,28 @@ module.exports = function(RED) {
node.log('received new email: '+pay.topic); node.log('received new email: '+pay.topic);
} }
else { node.log('duplicate not sent: '+pay.topic); } else { node.log('duplicate not sent: '+pay.topic); }
//node.status({fill:"green",shape:"dot",text:"ok"},true);
node.status({},true);
imap.end(); imap.end();
}); });
} }
else { else {
node.log("you have achieved inbox zero"); node.log("you have achieved inbox zero");
//node.status({fill:"green",shape:"dot",text:"ok"},true);
node.status({},true);
imap.end(); imap.end();
} }
}); });
}); });
imap.on('error', function(err) { node.status({fill:"grey",shape:"dot",text:"connecting"},true);
node.log(err);
});
imap.connect(); imap.connect();
}); });
imap.on('error', function(err) {
node.log(err);
node.status({fill:"red",shape:"ring",text:"connect error"},true);
});
this.on("error", function(err) { this.on("error", function(err) {
node.log("error: ",err); node.log("error: ",err);
}); });
@ -207,7 +217,7 @@ module.exports = function(RED) {
node.emit("input",{}); node.emit("input",{});
} }
if (Imap != null) { if (Imap != null) {
RED.nodes.registerType("e-mail in",EmailInNode); RED.nodes.registerType("e-mail in",EmailInNode);
} }
var querystring = require('querystring'); var querystring = require('querystring');