mailparser 0.6.1 → 0.6.2

package/README.md

@@ -9,6 +9,12 @@ MailParser
 Handles even large attachments with ease - attachments can be parsed
 in chunks and streamed if needed.
 
+### Community version
+
+This module is unmaintained. For an upgrade see [Mailparser2](https://gitlab.com/nodemailer/mailparser2). The upgraded version is more effective, has vastly better stream handling through Streams3 interface and is able to build up more accurate versions of HTML and Text contents.
+
+### Usage
+
 **MailParser** parses raw source of e-mail messages into a structured object.
 
 No need to worry about charsets or decoding *quoted-printable* or

package/lib/mailparser.js

@@ -269,6 +269,7 @@ MailParser.prototype._process = function(finalPart) {
 MailParser.prototype._processStateHeader = function(line) {
     var attachment, lastPos = this._currentNode.headers.length - 1,
         textContent = false,
+        rootNode,
         extension;
 
     // Check if the header ends and body starts
@@ -309,7 +310,7 @@ MailParser.prototype._processStateHeader = function(line) {
             this._currentNode.meta.generatedFileName = this._generateFileName(this._currentNode.meta.fileName, this._currentNode.meta.contentType);
 
             this._currentNode.meta.contentId = this._currentNode.meta.contentId ||
-                crypto.createHash("md5").update(this._currentNode.meta.generatedFileName).digest("hex") + "@mailparser";
+                crypto.createHash("md5").update(new Buffer(this._currentNode.meta.generatedFileName, 'utf-8')).digest("hex") + "@mailparser";
 
             extension = this._currentNode.meta.generatedFileName.split(".").pop().toLowerCase();
 
@@ -330,8 +331,14 @@ MailParser.prototype._processStateHeader = function(line) {
                     this._currentNode.stream = new Streams.BinaryStream();
                 }
                 attachment.stream = this._currentNode.stream;
+                
+                rootNode = this._currentNode;
+                
+                while (rootNode.parentNode) {
+                    rootNode = rootNode.parentNode;
+                }
 
-                this.emit("attachment", attachment, this._currentNode.parentNode || this._currentNode);
+                this.emit("attachment", attachment, rootNode);
             } else {
                 this._currentNode.content = undefined;
             }
@@ -790,10 +797,10 @@ MailParser.prototype._detectFilename = function(value) {
 
     if (fileName) {
         parts = fileName.split("'");
-        encoding = parts.shift();
+        encoding = (parts.length > 1) ? parts[0] : "us-ascii";
         name = parts.pop();
         if (name) {
-            return this._replaceMimeWords(this._replaceMimeWords("=?" + (encoding || "us-ascii") + "?Q?" + name.replace(/%/g, "=") + "?="));
+            return this._replaceMimeWords(this._replaceMimeWords("=?" + encoding + "?Q?" + name.replace(/%/g, "=") + "?="));
         }
     }
     return "";
@@ -866,7 +873,7 @@ MailParser.prototype._parsePriority = function(value) {
             case "low":
                 return "low";
             case "urgent":
-            case "hight":
+            case "high":
                 return "high";
         }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mailparser",
   "description": "Asynchronous and non-blocking parser for mime encoded e-mail messages",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "author": "Andris Reinman",
   "maintainers": [{
     "name": "andris",
@@ -17,13 +17,13 @@
   "main": "./lib/mailparser",
   "license": "MIT",
   "dependencies": {
-    "mimelib": "^0.2.19",
-    "encoding": "^0.1.11",
+    "mimelib": "^0.3.0",
+    "encoding": "^0.1.12",
     "mime": "^1.3.4",
-    "uue": "^3.0.0"
+    "uue": "^3.1.0"
   },
   "devDependencies": {
-    "nodeunit": "^0.9.1"
+    "nodeunit": "^0.10.2"
   },
   "keywords": [
     "e-mail",

package/test/mailparser.js

@@ -501,6 +501,24 @@ exports["Attachment filename"] = {
             test.done();
         });
     },
+    "Content-Disposition filename*X": function(test) {
+        var encodedText = "Content-Type: application/octet-stream\r\n" +
+            "Content-Transfer-Encoding: QUOTED-PRINTABLE\r\n" +
+            "Content-Disposition: attachment;\r\n" +
+            "    filename*0=OA;\r\n" +
+            "    filename*1=U;\r\n" +
+            "    filename*2=.txt\r\n" +
+            "\r\n" +
+            "=00=01=02=03=FD=FE=FF",
+            mail = new Buffer(encodedText, "utf-8");
+
+        var mailparser = new MailParser();
+        mailparser.end(mail);
+        mailparser.on("end", function(mail) {
+            test.equal(mail.attachments && mail.attachments[0] && mail.attachments[0].content && mail.attachments[0].fileName, "OAU.txt");
+            test.done();
+        });
+    },
     "Content-Disposition filename*X*": function(test) {
         var encodedText = "Content-Type: application/octet-stream\r\n" +
             "Content-Transfer-Encoding: QUOTED-PRINTABLE\r\n" +
@@ -551,6 +569,23 @@ exports["Attachment filename"] = {
             test.done();
         });
     },
+    "Content-Type ; name": function(test) {
+        var encodedText = "Content-Type: ; name=\"test\"\r\n" +
+            "Content-Transfer-Encoding: QUOTED-PRINTABLE\r\n" +
+            "\r\n" +
+            "=00=01=02=03=FD=FE=FF",
+            mail = new Buffer(encodedText, "utf-8");
+
+        var mailparser = new MailParser();
+
+        mailparser.write(mail);
+        mailparser.end();
+
+        mailparser.on("end", function(mail) {
+            test.equal(mail.attachments && mail.attachments[0] && mail.attachments[0].fileName, "test");
+            test.done();
+        });
+    },
     "Content-Type name*": function(test) {
         var encodedText = "Content-Type: application/octet-stream;\r\n" +
             "    name*=UTF-8''%C3%95%C3%84%C3%96%C3%9C\r\n" +
@@ -1493,7 +1528,7 @@ exports["Attachment info"] = {
 };
 
 exports["Advanced nested HTML"] = function(test) {
-    var mail = fs.readFileSync(__dirname + "/nested.eml");
+    var mail = fs.readFileSync(__dirname + "/ali.eml");
 
     test.expect(2);
     var mailparser = new MailParser();
@@ -1504,6 +1539,7 @@ exports["Advanced nested HTML"] = function(test) {
 
     mailparser.end();
     mailparser.on("end", function(mail) {
+        console.log(require('util').inspect(mail, false, 22));
         test.equal(mail.text, "\nDear Sir,\n\nGood evening.\n\n\n \n\n\n\nThe footer\n");
         test.equal(mail.html, "<p>Dear Sir</p>\n<p>Good evening.</p>\n<p></p><p>The footer</p>\n");
         test.done();