v3.4.0

andris9 · andris9 · commit e437f1d97635 · 2021-10-11T15:15:22.000+03:00
diff --git a/examples/simple.js b/examples/simple.js
@@ -6,7 +6,7 @@ const util = require('util');
 const fs = require('fs');
 const simpleParser = require('../lib/simple-parser.js');
 
-let input = fs.createReadStream(__dirname + '/simple.eml');
+let input = fs.createReadStream(process.argv[2] || __dirname + '/simple.eml');
 
 simpleParser(input)
     .then(mail => {
diff --git a/lib/mail-parser.js b/lib/mail-parser.js
@@ -14,7 +14,6 @@ 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
@@ -316,11 +315,8 @@ class MailParser extends Transform {
                 case 'date': {
                     let dateValue = new Date(value);
                     if (isNaN(dateValue)) {
-                        dateValue = anyDateParser.fromString(value);
-                        if (isNaN(dateValue)) {
-                            // date parsing failed :S
-                            dateValue = new Date();
-                        }
+                        // date parsing failed :S
+                        dateValue = new Date();
                     }
                     value = dateValue;
                     break;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "mailparser",
-    "version": "3.3.3",
+    "version": "3.4.0",
     "description": "Parse e-mails",
     "main": "index.js",
     "scripts": {
@@ -16,25 +16,24 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "any-date-parser": "1.5.1",
         "encoding-japanese": "1.0.30",
         "he": "1.2.0",
         "html-to-text": "8.0.0",
         "iconv-lite": "0.6.3",
         "libmime": "5.0.0",
         "linkify-it": "3.0.3",
-        "mailsplit": "5.2.0",
-        "nodemailer": "6.6.5",
-        "tlds": "1.222.0"
+        "mailsplit": "5.3.1",
+        "nodemailer": "6.7.0",
+        "tlds": "1.224.0"
     },
     "devDependencies": {
         "ajv": "8.6.3",
-        "eslint": "7.32.0",
+        "eslint": "8.0.0",
         "eslint-config-nodemailer": "1.2.0",
         "eslint-config-prettier": "8.3.0",
         "grunt": "1.4.1",
         "grunt-cli": "1.4.3",
-        "grunt-contrib-nodeunit": "3.0.0",
+        "grunt-contrib-nodeunit": "4.0.0",
         "grunt-eslint": "23.0.0",
         "iconv": "3.0.1",
         "random-message": "1.1.0"
diff --git a/test/simple-parser-test.js b/test/simple-parser-test.js
@@ -151,7 +151,7 @@ test`
         test.done();
     });
 };
-
+/*
 module.exports['Parse invalid date'] = test => {
     let source = Buffer.from(
         `Date: Tue, 06 Jul 2021 19:21:59 CEST
@@ -169,24 +169,24 @@ test`
         test.done();
     });
 };
-
+*/
 const RFC_2822_date = {
-    '01 Apr 2013 20:18:36 -0500'      : '2013-04-02T01:18:36.000Z',
-    '            01/03/2006'          : '2006-01-03T08:00:00.000Z',
-    '03/11/2014 11:44 AM (GMT-06:00)' : '2014-03-11T18:44:00.000Z',
+    // commented cases where new Date(val) uses local timezone
+    '01 Apr 2013 20:18:36 -0500': '2013-04-02T01:18:36.000Z',
+    //'            01/03/2006': '2006-01-03T08:00:00.000Z',
+    //'03/11/2014 11:44 AM (GMT-06:00)': '2014-03-11T18:44:00.000Z',
     // '2008-10-23, 1:52PM CDT'       : '2008-10-23T13:42:00.000Z',
-    '21 Jan 2013 13:03:51 -0600'      : '2013-01-21T19:03:51.000Z',
-    '4 December 2005'                 : '2005-12-04T08:00:00.000Z',
-    'Fri, 02 Dec 2011 09:27:26 -0600' : '2011-12-02T15:27:26.000Z',
+    '21 Jan 2013 13:03:51 -0600': '2013-01-21T19:03:51.000Z',
+    //'4 December 2005': '2005-12-04T08:00:00.000Z',
+    'Fri, 02 Dec 2011 09:27:26 -0600': '2011-12-02T15:27:26.000Z',
     'Fri, 07 Mar 2008 02:35:23 -0800 (PST)': '2008-03-07T10:35:23.000Z',
-    'Fri, 07 Mar 2014 11:01:40 UTC'   : '2014-03-07T11:01:40.000Z',
-    'January 6, 2009 4:44:14 PM CST'  : '2009-01-06T22:44:14.000Z',
-    'Sun, 8 Jan 2017 20:37:44 +0200'  : '2017-01-08T18:37:44.000Z',
-}
+    'Fri, 07 Mar 2014 11:01:40 UTC': '2014-03-07T11:01:40.000Z',
+    'January 6, 2009 4:44:14 PM CST': '2009-01-06T22:44:14.000Z',
+    'Sun, 8 Jan 2017 20:37:44 +0200': '2017-01-08T18:37:44.000Z'
+};
 
 for (const d in RFC_2822_date) {
     module.exports[`Parses email date: ${d}`] = test => {
-
         simpleParser(Buffer.from(`Date: ${d}\r\nSubject: test\r\n\r\ntest`), {}, (err, mail) => {
             test.ifError(err);
             test.ok(mail);
@@ -195,5 +195,5 @@ for (const d in RFC_2822_date) {
 
             test.done();
         });
-    }
-};
+    };
+}
