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

5
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");
* you may not use this file except in compliance with the License.
@ -140,6 +140,7 @@ module.exports = function(RED) {
var node = this;
var credentials = RED.nodes.getCredentials(n.id);
this.on("input",function(msg) {
node.status({fill:"blue",shape:"dot",text:"requesting"});
var url;
if (msg.url) {
url = msg.url;
@ -193,12 +194,14 @@ module.exports = function(RED) {
});
res.on('end',function() {
node.send(msg);
node.status({});
});
});
req.on('error',function(err) {
msg.payload = err.toString();
msg.statusCode = err.code;
node.send(msg);
node.status({fill:"red",shape:"ring",text:err.code});
});
if (payload) {
req.write(payload);

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");
* 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");
you may not use this file except in compliance with the License.

20
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");
* 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);
// 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"); }
catch(err) { }
@ -68,8 +67,8 @@ module.exports = function(RED) {
});
this.on("input", function(msg) {
//node.log("email :",this.id,this.topic," received",msg.payload);
if (msg != null) {
node.status({fill:"blue",shape:"dot",text:"sending"},true);
if (smtpTransport) {
smtpTransport.sendMail({
from: node.userid, // sender address
@ -79,8 +78,10 @@ module.exports = function(RED) {
}, function(error, response) {
if (error) {
node.error(error);
node.status({fill:"red",shape:"ring",text:"post error"},true);
} else {
node.log("Message sent: " + response.message);
node.status({},true);
}
});
}
@ -133,6 +134,7 @@ module.exports = function(RED) {
this.on("input", function(msg) {
imap.once('ready', function() {
node.status({fill:"blue",shape:"dot",text:"fetching"},true);
var pay = {};
imap.openBox('INBOX', true, function(err, box) {
if (box.messages.total > 0) {
@ -170,6 +172,7 @@ module.exports = function(RED) {
});
f.on('error', function(err) {
node.warn('fetch error: ' + err);
node.status({fill:"red",shape:"ring",text:"fetch error"},true);
});
f.on('end', function() {
if (JSON.stringify(pay) !== oldmail) {
@ -178,19 +181,26 @@ module.exports = function(RED) {
node.log('received new email: '+pay.topic);
}
else { node.log('duplicate not sent: '+pay.topic); }
//node.status({fill:"green",shape:"dot",text:"ok"},true);
node.status({},true);
imap.end();
});
}
else {
node.log("you have achieved inbox zero");
//node.status({fill:"green",shape:"dot",text:"ok"},true);
node.status({},true);
imap.end();
}
});
});
node.status({fill:"grey",shape:"dot",text:"connecting"},true);
imap.connect();
});
imap.on('error', function(err) {
node.log(err);
});
imap.connect();
node.status({fill:"red",shape:"ring",text:"connect error"},true);
});
this.on("error", function(err) {