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

email node - add done capability to retrieving mail node.

Browse Source
This commit is contained in:
Dave Conway-Jones 2022-07-19 12:59:41 +01:00
parent 2b6fbcc5b0
commit 6830ce4fba
No known key found for this signature in database
GPG Key ID: 88BA2B8A411BE9FF
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
social/email/61-email.js
View File

@ -1,5 +1,7 @@
/* eslint-disable indent */ /* eslint-disable indent */
const { domainToUnicode } = require("url");
/** /**
* POP3 protocol - RFC1939 - https://www.ietf.org/rfc/rfc1939.txt * POP3 protocol - RFC1939 - https://www.ietf.org/rfc/rfc1939.txt
* *
@ -224,7 +226,7 @@ module.exports = function(RED) {
} }
var node = this; var node = this;
this.interval_id = null; node.interval_id = null;
// Process a new email message by building a Node-RED message to be passed onwards // Process a new email message by building a Node-RED message to be passed onwards
// in the message flow. The parameter called `msg` is the template message we // in the message flow. The parameter called `msg` is the template message we
@ -253,7 +255,7 @@ module.exports = function(RED) {
// Check the POP3 email mailbox for any new messages. For any that are found, // Check the POP3 email mailbox for any new messages. For any that are found,
// retrieve each message, call processNewMessage to process it and then delete // retrieve each message, call processNewMessage to process it and then delete
// the messages from the server. // the messages from the server.
function checkPOP3(msg) { function checkPOP3(msg,send,done) {
var currentMessage; var currentMessage;
var maxMessage; var maxMessage;
//node.log("Checking POP3 for new messages"); //node.log("Checking POP3 for new messages");
@ -270,6 +272,7 @@ module.exports = function(RED) {
if (currentMessage > maxMessage) { if (currentMessage > maxMessage) {
pop3Client.quit(); pop3Client.quit();
setInputRepeatTimeout(); setInputRepeatTimeout();
done();
return; return;
} }
pop3Client.retr(currentMessage); pop3Client.retr(currentMessage);
@ -294,6 +297,7 @@ module.exports = function(RED) {
pop3Client.on("error", function(err) { pop3Client.on("error", function(err) {
setInputRepeatTimeout(); setInputRepeatTimeout();
node.log("error: " + JSON.stringify(err)); node.log("error: " + JSON.stringify(err));
done();
}); });
pop3Client.on("connect", function() { pop3Client.on("connect", function() {
@ -309,13 +313,13 @@ module.exports = function(RED) {
node.log(util.format("login error: %s %j", status, rawData)); node.log(util.format("login error: %s %j", status, rawData));
pop3Client.quit(); pop3Client.quit();
setInputRepeatTimeout(); setInputRepeatTimeout();
done();
} }
}); });
pop3Client.on("retr", function(status, msgNumber, data, rawData) { pop3Client.on("retr", function(status, msgNumber, data, rawData) {
// node.log(util.format("retr: status=%s, msgNumber=%d, data=%j", status, msgNumber, data)); // node.log(util.format("retr: status=%s, msgNumber=%d, data=%j", status, msgNumber, data));
if (status) { if (status) {
// We have now received a new email message. Create an instance of a mail parser // We have now received a new email message. Create an instance of a mail parser
// and pass in the email message. The parser will signal when it has parsed the message. // and pass in the email message. The parser will signal when it has parsed the message.
simpleParser(data, {}, function(err, parsed) { simpleParser(data, {}, function(err, parsed) {
@ -334,6 +338,7 @@ module.exports = function(RED) {
node.log(util.format("retr error: %s %j", status, rawData)); node.log(util.format("retr error: %s %j", status, rawData));
pop3Client.quit(); pop3Client.quit();
setInputRepeatTimeout(); setInputRepeatTimeout();
done();
} }
}); });
@ -359,7 +364,7 @@ module.exports = function(RED) {
// Check the email sever using the IMAP protocol for new messages. // Check the email sever using the IMAP protocol for new messages.
var s = false; var s = false;
var ss = false; var ss = false;
function checkIMAP(msg) { function checkIMAP(msg,send,done) {
//console.log("Checking IMAP for new messages"); //console.log("Checking IMAP for new messages");
// We get back a 'ready' event once we have connected to imap // We get back a 'ready' event once we have connected to imap
s = true; s = true;
@ -392,6 +397,7 @@ module.exports = function(RED) {
imap.end(); imap.end();
s = false; s = false;
setInputRepeatTimeout(); setInputRepeatTimeout();
done(err);
return; return;
} }
else { else {
@ -407,6 +413,7 @@ module.exports = function(RED) {
imap.end(); imap.end();
s = false; s = false;
setInputRepeatTimeout(); setInputRepeatTimeout();
done(err);
return; return;
} }
else { else {
@ -417,6 +424,8 @@ module.exports = function(RED) {
imap.end(); imap.end();
s = false; s = false;
setInputRepeatTimeout(); setInputRepeatTimeout();
msg.payload = 0;
done();
return; return;
} }
@ -454,6 +463,8 @@ module.exports = function(RED) {
imap.end(); imap.end();
s = false; s = false;
setInputRepeatTimeout(); setInputRepeatTimeout();
msg.payload = results.length;
done();
}; };
if (node.disposition === "Delete") { if (node.disposition === "Delete") {
imap.addFlags(results, "\Deleted", cleanup); imap.addFlags(results, "\Deleted", cleanup);
@ -469,6 +480,7 @@ module.exports = function(RED) {
imap.end(); imap.end();
s = false; s = false;
setInputRepeatTimeout(); setInputRepeatTimeout();
done(err);
}); });
} }
}); // End of imap->search }); // End of imap->search
@ -478,6 +490,7 @@ module.exports = function(RED) {
node.error(e.toString(),e); node.error(e.toString(),e);
s = ss = false; s = ss = false;
imap.end(); imap.end();
done(e);
return; return;
} }
} }
@ -486,6 +499,7 @@ module.exports = function(RED) {
node.error(RED._("email.errors.bad_criteria"),msg); node.error(RED._("email.errors.bad_criteria"),msg);
s = ss = false; s = ss = false;
imap.end(); imap.end();
done();
return; return;
} }
} }
@ -497,11 +511,11 @@ module.exports = function(RED) {
// Perform a check of the email inboxes using either POP3 or IMAP // Perform a check of the email inboxes using either POP3 or IMAP
function checkEmail(msg) { function checkEmail(msg,send,done) {
if (node.protocol === "POP3") { if (node.protocol === "POP3") {
checkPOP3(msg); checkPOP3(msg,send,done);
} else if (node.protocol === "IMAP") { } else if (node.protocol === "IMAP") {
if (s === false && ss == false) { checkIMAP(msg); } if (s === false && ss == false) { checkIMAP(msg,send,done); }
} }
} // End of checkEmail } // End of checkEmail
@ -528,11 +542,12 @@ module.exports = function(RED) {
}); });
} }
this.on("input", function(msg) { node.on("input", function(msg, send, done) {
checkEmail(msg); send = send || function() { node.send.apply(node,arguments) };
checkEmail(msg,send,done);
}); });
this.on("close", function() { node.on("close", function() {
if (this.interval_id != null) { if (this.interval_id != null) {
clearTimeout(this.interval_id); clearTimeout(this.interval_id);
} }

4
social/email/package.json
View File

@ -1,11 +1,11 @@
{ {
"name": "node-red-node-email", "name": "node-red-node-email",
"version": "1.16.0", "version": "1.17.0",
"description": "Node-RED nodes to send and receive simple emails.", "description": "Node-RED nodes to send and receive simple emails.",
"dependencies": { "dependencies": {
"imap": "^0.8.19", "imap": "^0.8.19",
"mailparser": "^3.5.0", "mailparser": "^3.5.0",
"nodemailer": "^6.7.5", "nodemailer": "^6.7.7",
"smtp-server": "^3.11.0" "smtp-server": "^3.11.0"
}, },
"bundledDependencies": [ "bundledDependencies": [