mailparser 3.6.2 → 3.6.4

package/lib/mail-parser.js

@@ -273,8 +273,13 @@ class MailParser extends Transform {
 
     cleanup(done) {
         let finish = () => {
-            let t = this.getTextContent();
-            this.push(t);
+            try {
+                let t = this.getTextContent();
+                this.push(t);
+            } catch (err) {
+                return this.emit('error', err);
+            }
+
             done();
         };
 
@@ -504,14 +509,18 @@ class MailParser extends Transform {
     }
 
     decodeAddresses(addresses) {
+        let processedAddress = new WeakSet();
         for (let i = 0; i < addresses.length; i++) {
             let address = addresses[i];
             address.name = (address.name || '').toString().trim();
 
-            if (!address.address && /^(=\?([^?]+)\?[Bb]\?[^?]*\?=)(\s*=\?([^?]+)\?[Bb]\?[^?]*\?=)*$/.test(address.name)) {
+            if (!address.address && /^(=\?([^?]+)\?[Bb]\?[^?]*\?=)(\s*=\?([^?]+)\?[Bb]\?[^?]*\?=)*$/.test(address.name) && !processedAddress.has(address)) {
                 let parsed = addressparser(this.libmime.decodeWords(address.name));
                 if (parsed.length) {
-                    parsed.forEach(entry => addresses.push(entry));
+                    parsed.forEach(entry => {
+                        processedAddress.add(entry);
+                        addresses.push(entry);
+                    });
                 }
 
                 // remove current element
@@ -749,9 +758,11 @@ class MailParser extends Transform {
                 }
             }
             alternative = alternative || node.contentType === 'multipart/alternative';
-            node.children.forEach(subNode => {
-                processNode(alternative, level + 1, subNode);
-            });
+            if (node.children) {
+                node.children.forEach(subNode => {
+                    processNode(alternative, level + 1, subNode);
+                });
+            }
         };
 
         processNode(false, 0, this.tree);
@@ -1038,11 +1049,9 @@ class MailParser extends Transform {
         html.replace(/\bcid:([^'"\s]{1,256})/g, (match, cid) => {
             for (let i = 0, len = this.attachmentList.length; i < len; i++) {
                 if (this.attachmentList[i].cid === cid && /^image\/[\w]+$/i.test(this.attachmentList[i].contentType)) {
-                    if (/^image\/[\w]+$/i.test(this.attachmentList[i].contentType)) {
-                        cids.set(cid, {
-                            attachment: this.attachmentList[i]
-                        });
-                    }
+                    cids.set(cid, {
+                        attachment: this.attachmentList[i]
+                    });
                     break;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mailparser",
-    "version": "3.6.2",
+    "version": "3.6.4",
     "description": "Parse e-mails",
     "main": "index.js",
     "scripts": {
@@ -18,20 +18,20 @@
     "dependencies": {
         "encoding-japanese": "2.0.0",
         "he": "1.2.0",
-        "html-to-text": "9.0.2",
+        "html-to-text": "9.0.4",
         "iconv-lite": "0.6.3",
-        "libmime": "5.2.0",
+        "libmime": "5.2.1",
         "linkify-it": "4.0.1",
         "mailsplit": "5.4.0",
-        "nodemailer": "6.8.0",
-        "tlds": "1.235.0"
+        "nodemailer": "6.9.1",
+        "tlds": "1.236.0"
     },
     "devDependencies": {
-        "ajv": "8.11.2",
-        "eslint": "8.29.0",
+        "ajv": "8.12.0",
+        "eslint": "8.35.0",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.5.0",
-        "grunt": "1.5.3",
+        "eslint-config-prettier": "8.6.0",
+        "grunt": "1.6.1",
         "grunt-cli": "1.4.3",
         "grunt-contrib-nodeunit": "4.0.0",
         "grunt-eslint": "24.0.1",