From 877763aae9624fa5c6140eef9fb6a524ef146a3f Mon Sep 17 00:00:00 2001
From: Luis Mario Domenzain <luis.domenzain@parrot.com>
Date: Tue, 28 May 2019 17:55:07 +0200
Subject: [PATCH] use latest mailparser API (#546)

The API diverged between the original and mailparser-mit
---
 social/email/61-email.js  | 41 ++++++++++++++++++++-------------------
 social/email/package.json |  2 +-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/social/email/61-email.js b/social/email/61-email.js
index 02d0cfcd..efe656c7 100644
--- a/social/email/61-email.js
+++ b/social/email/61-email.js
@@ -14,7 +14,7 @@ module.exports = function(RED) {
     var nodemailer = require("nodemailer");
     var Imap = require('imap');
     var POP3Client = require("poplib");
-    var MailParser = require("mailparser").MailParser;
+    var SimpleParser = require("mailparser").simpleParser;
     var util = require("util");
 
     if (parseInt(process.version.split("v")[1].split(".")[0]) < 8) {
@@ -206,7 +206,9 @@ module.exports = function(RED) {
             msg.payload = mailMessage.text;
             msg.topic = mailMessage.subject;
             msg.date = mailMessage.date;
-            msg.header = mailMessage.headers;
+            msg.header = {};
+            mailMessage.headers.forEach((v, k) => {msg.header[k] = v;});
+
             if (mailMessage.html) { msg.html = mailMessage.html; }
             if (mailMessage.to && mailMessage.to.length > 0) { msg.to = mailMessage.to; }
             if (mailMessage.cc && mailMessage.cc.length > 0) { msg.cc = mailMessage.cc; }
@@ -285,13 +287,16 @@ module.exports = function(RED) {
 
                     // 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.
-                    var mailparser = new MailParser();
-                    mailparser.on("end", function(mailObject) {
-                        //node.log(util.format("mailparser: on(end): %j", mailObject));
-                        processNewMessage(msg, mailObject);
+                    SimpleParser(data, {}, function(err, parsed) {
+                        //node.log(util.format("SimpleParser: on(end): %j", mailObject));
+                        if (err){
+                            node.status({fill:"red", shape:"ring", text:"email.status.parseerror"});
+                            node.error(RED._("email.errors.parsefail", {folder:node.box}), err);
+                        }
+                        else {
+                            processNewMessage(msg, parsed);
+                        }
                     });
-                    mailparser.write(data);
-                    mailparser.end();
                     pop3Client.dele(msgNumber);
                 }
                 else {
@@ -379,22 +384,18 @@ module.exports = function(RED) {
                                 // For each fetched message returned ...
                                 fetch.on('message', function(imapMessage, seqno) {
                                     //node.log(RED._("email.status.message",{number:seqno}));
-                                    var messageText = "";
                                     //console.log("> Fetch message - msg=%j, seqno=%d", imapMessage, seqno);
                                     imapMessage.on('body', function(stream, info) {
                                         //console.log("> message - body - stream=?, info=%j", info);
-                                        stream.on('data', function(chunk) {
-                                            //console.log("> stream - data - chunk=??");
-                                            messageText += chunk.toString('utf8');
+                                        SimpleParser(stream, {}, function(err, parsed) {
+                                            if (err){
+                                                node.status({fill:"red", shape:"ring", text:"email.status.parseerror"});
+                                                node.error(RED._("email.errors.parsefail", {folder:node.box}),err);
+                                            }
+                                            else {
+                                                processNewMessage(msg, parsed);
+                                            }
                                         });
-                                        stream.once('end', function() {
-                                            var mailParser = new MailParser();
-                                            mailParser.on('end', function(mailMessage) {
-                                                processNewMessage(msg, mailMessage);
-                                            });
-                                            mailParser.write(messageText);
-                                            mailParser.end();
-                                        }); // End of msg->end
                                     }); // End of msg->body
                                 }); // End of fetch->message
 
diff --git a/social/email/package.json b/social/email/package.json
index 93689fe7..f6537ebf 100644
--- a/social/email/package.json
+++ b/social/email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-email",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "Node-RED nodes to send and receive simple emails",
   "dependencies": {
     "imap": "^0.8.19",