v2.0.5

Author: andris9

lib/mail-parser.js

@@ -9,7 +9,6 @@ const punycode = require('punycode');
 const FlowedDecoder = require('./flowed-decoder');
 const StreamHash = require('./stream-hash');
 const iconv = require('iconv-lite');
-const marked = require('marked');
 const htmlToText = require('html-to-text');
 const he = require('he');
 
@@ -502,13 +501,7 @@ class MailParser extends Transform {
                 if (node.contentType === 'text/plain') {
                     text.push(node.textContent);
                     if (!alternative && this.hasHtml) {
-                        html.push(marked(node.textContent, {
-                            breaks: true,
-                            sanitize: true,
-                            gfm: true,
-                            tables: true,
-                            smartypants: true
-                        }));
+                        html.push(textToHtml(node.textContent));
                     }
                 } else if (node.contentType === 'text/html') {
                     html.push(node.textContent);
@@ -533,13 +526,7 @@ class MailParser extends Transform {
         }
         if (text.length) {
             this.text = response.text = text.join('\n');
-            this.textAsHtml = response.textAsHtml = text.map(part => marked(part, {
-                breaks: true,
-                sanitize: true,
-                gfm: true,
-                tables: true,
-                smartypants: true
-            })).join('<br/>\n');
+            this.textAsHtml = response.textAsHtml = text.map(part => textToHtml(part)).join('<br/>\n');
         }
         return response;
     }
@@ -616,7 +603,7 @@ class MailParser extends Transform {
                         this.push(attachment);
                         this.attachmentList.push(attachment);
 
-                    } else if(node.disposition === 'inline') {
+                    } else if (node.disposition === 'inline') {
                         let chunks = [];
                         let chunklen = 0;
                         let contentStream = node.decoder;
@@ -791,3 +778,20 @@ class MailParser extends Transform {
 }
 
 module.exports = MailParser;
+
+function textToHtml(str) {
+
+    let text = '<p>' + he.
+    // encode special chars
+    encode(
+        str, {
+            useNamedReferences: true
+        }).
+    replace(/\r?\n/g, '\n').trim(). // normalize line endings
+    replace(/[ \t]+$/mg, '').trim(). // trim empty line endings
+    replace(/\n\n+/g, '</p><p>').trim(). // insert <p> to multiple linebreaks
+    replace(/\n/g, '<br/>') + // insert <br> to single linebreaks
+        '</p>';
+
+    return text;
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mailparser",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Parse e-mails",
   "main": "index.js",
   "scripts": {
@@ -10,12 +10,11 @@
   "license": "EUPL-1.1",
   "dependencies": {
     "addressparser": "1.0.1",
-    "he": "1.1.1",
+    "he": "^1.1.1",
     "html-to-text": "3.2.0",
-    "iconv-lite": "0.4.15",
+    "iconv-lite": "0.4.17",
     "libmime": "3.1.0",
-    "mailsplit": "4.0.2",
-    "marked": "0.3.6"
+    "mailsplit": "4.0.2"
   },
   "devDependencies": {
     "eslint-config-nodemailer": "^1.0.0",