Skip to content

Fix regression on imap email-in trigger mode #1133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hardillb wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −11
Open

Fix regression on imap email-in trigger mode #1133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 17 additions & 11 deletions social/email/61-email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,7 @@ module.exports = function (RED) {
this.error(RED._("email.errors.notoken"));
}
}
this.fetch = n.fetch || 'auto'

var node = this;
node.interval_id = null;
Expand Down Expand Up @@ -439,14 +440,16 @@ module.exports = function (RED) {
authTimeout: tout
});
}
// Server notified about new mails during IDLE
imap.on('mail', function (numNew) {
fetchIMAP(); // new mail -> catch immediatly
});
// Server notified about new attributes on (e.g. -> UNSEEN) during IDLE
imap.on('update', function () {
fetchIMAP();
});
if (node.fetch === 'auto') {
// Server notified about new mails during IDLE
imap.on('mail', function (numNew) {
fetchIMAP(); // new mail -> catch immediatly
});
// Server notified about new attributes on (e.g. -> UNSEEN) during IDLE
imap.on('update', function () {
fetchIMAP();
});
}
imap.on('close', function (hadError) {
// var msg = 'IMAP connection closed';
if (hadError) {
Expand Down Expand Up @@ -554,7 +557,7 @@ module.exports = function (RED) {
//console.log("> search - err=%j, results=%j", err, results);
if (results.length === 0) {
//console.log(" [X] - Nothing to fetch");
if (imap.serverSupports && imap.serverSupports('IDLE')) {
if (imap.serverSupports && imap.serverSupports('IDLE') && node.fetch === 'auto') {
// IMAP IDLE
node.status({ fill: "green", shape: "ring", text: RED._("email.status.fetched", { number: "0" } )});
node.statusErr = false;
Expand Down Expand Up @@ -601,7 +604,7 @@ module.exports = function (RED) {
// When we have fetched all the messages
fetch.on('end', function () {
var cleanup = function () {
if (imap.serverSupports && imap.serverSupports('IDLE')) {
if (imap.serverSupports && imap.serverSupports('IDLE') && node.fetch === 'auto') {
// for IMAP IDLE, connection is expected to stay open
node.status({ fill: "green", shape: "ring", text: RED._("email.status.fetched", { number: results.length.toString() } )});
node.statusErr = false;
Expand Down Expand Up @@ -657,6 +660,7 @@ module.exports = function (RED) {
}

}

imap.connect();
} // End of checkIMAP

Expand All @@ -666,7 +670,9 @@ module.exports = function (RED) {
if (node.protocol === "POP3") {
checkPOP3(msg, send, done);
} else if (node.protocol === "IMAP") {
if (s === false && ss == false) { checkIMAP(msg, send, done); }
if (s === false && ss == false) {
checkIMAP(msg, send, done);
}
}
} // End of checkEmail

Expand Down