mailparser 3.2.0 → 3.3.3

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2020 Andris Reinman
+Copyright (c) 2020 - 2021 Andris Reinman
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -13,4 +13,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/lib/mail-parser.js

@@ -14,6 +14,7 @@ const he = require('he');
 const linkify = require('linkify-it')();
 const tlds = require('tlds');
 const encodingJapanese = require('encoding-japanese');
+const anyDateParser = require('any-date-parser');
 
 linkify
     .tlds(tlds) // Reload with full tlds list
@@ -156,6 +157,8 @@ class MailParser extends Transform {
 
         this.boundaries = [];
 
+        this.textTypes = ['text/plain', 'text/html'].concat(!this.options.keepDeliveryStatus ? 'message/delivery-status' : []);
+
         this.decoder = this.getDecoder();
 
         this.splitter.on('readable', () => {
@@ -310,13 +313,18 @@ class MailParser extends Transform {
                         }
                     });
                     break;
-                case 'date':
-                    value = new Date(value);
-                    if (isNaN(value)) {
-                        // date parsing failed :S
-                        value = new Date();
+                case 'date': {
+                    let dateValue = new Date(value);
+                    if (isNaN(dateValue)) {
+                        dateValue = anyDateParser.fromString(value);
+                        if (isNaN(dateValue)) {
+                            // date parsing failed :S
+                            dateValue = new Date();
+                        }
                     }
+                    value = dateValue;
                     break;
+                }
                 case 'subject':
                     try {
                         value = this.libmime.decodeWords(value);
@@ -561,13 +569,13 @@ class MailParser extends Transform {
                 disposition = 'attachment';
             }
 
-            if (!disposition && !['text/plain', 'text/html', 'message/delivery-status'].includes(contentType)) {
+            if (!disposition && !this.textTypes.includes(contentType)) {
                 newNode.disposition = 'attachment';
             } else {
                 newNode.disposition = disposition || 'inline';
             }
 
-            newNode.isAttachment = !['text/plain', 'text/html', 'message/delivery-status'].includes(contentType) || newNode.disposition !== 'inline';
+            newNode.isAttachment = !this.textTypes.includes(contentType) || newNode.disposition !== 'inline';
 
             newNode.encoding = ['quoted-printable', 'base64'].includes(encoding) ? encoding : 'binary';
 
@@ -715,7 +723,7 @@ class MailParser extends Transform {
                     if (!alternative && this.hasHtml) {
                         html.push(this.textToHtml(node.textContent));
                     }
-                } else if (node.contentType === 'message/delivery-status') {
+                } else if (node.contentType === 'message/delivery-status' && !this.options.keepDeliveryStatus) {
                     text.push(node.textContent);
                     if (!alternative && this.hasHtml) {
                         html.push(this.textToHtml(node.textContent));
@@ -865,7 +873,7 @@ class MailParser extends Transform {
                         this.hasText = true;
                     } else if (node.contentType === 'text/html') {
                         this.hasHtml = true;
-                    } else if (node.contentType === 'message/delivery-status') {
+                    } else if (node.contentType === 'message/delivery-status' && !this.options.keepDeliveryStatus) {
                         this.hasText = true;
                     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailparser",
-    "version": "3.2.0",
+    "version": "3.3.3",
     "description": "Parse e-mails",
     "main": "index.js",
     "scripts": {
@@ -16,26 +16,27 @@
     ],
     "license": "MIT",
     "dependencies": {
+        "any-date-parser": "1.5.1",
         "encoding-japanese": "1.0.30",
         "he": "1.2.0",
-        "html-to-text": "7.0.0",
-        "iconv-lite": "0.6.2",
+        "html-to-text": "8.0.0",
+        "iconv-lite": "0.6.3",
         "libmime": "5.0.0",
-        "linkify-it": "3.0.2",
-        "mailsplit": "5.0.1",
-        "nodemailer": "6.5.0",
-        "tlds": "1.219.0"
+        "linkify-it": "3.0.3",
+        "mailsplit": "5.2.0",
+        "nodemailer": "6.6.5",
+        "tlds": "1.222.0"
     },
     "devDependencies": {
-        "ajv": "8.0.4",
-        "eslint": "7.23.0",
+        "ajv": "8.6.3",
+        "eslint": "7.32.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.1.0",
-        "grunt": "1.3.0",
-        "grunt-cli": "1.4.1",
+        "eslint-config-prettier": "8.3.0",
+        "grunt": "1.4.1",
+        "grunt-cli": "1.4.3",
         "grunt-contrib-nodeunit": "3.0.0",
         "grunt-eslint": "23.0.0",
-        "iconv": "3.0.0",
+        "iconv": "3.0.1",
         "random-message": "1.1.0"
     },
     "repository": {