email-bounce-parser 1.0.16 → 1.0.17

package/README.md

@@ -39,7 +39,7 @@ console.log(result);
 ### Parse a bounce email
 
 `read(body)` parses the bounce email and extracts available information (error code and type, server, original recipient, etc.):
-* `body` must be a string representing the bounce email body (as returned by [mailparser](https://github.com/nodemailer/mailparser), for example)
+* `body` must be a string representing the bounce email **text** body (not HTML body). You can use [mailparser](https://github.com/nodemailer/mailparser) for example.
 
 ```js
 const EmailBounceParse = require("email-bounce-parser");

package/lib/parser.js

@@ -65,8 +65,8 @@ var REGEXES = {
     /\(in reply to end of ([A-Z\s]+) command\)$/m, // "in reply to end of DATA command"
     /\(in reply to ([A-Z\s]+) command\)$/m, // "in reply to RCPT TO command"
     /timed out while sending ([A-Z\s]+)$/m, // "timed out while sending (RCPT TO)", "timed out while sending RCPT TO"
-    /error after ([A-Z\s]+)/m, // "LMTP error after RCPT TO"
-    /while sending end of ([a-z\s]+)/m // "while sending end of data"
+    /error after ([A-Z\s]+)/i, // "LMTP error after RCPT TO"
+    /while sending end of ([a-z\s]+)/i // "while sending end of data"
   ],
 
   email_server : [
@@ -96,7 +96,16 @@ var REGEXES = {
 
   error_lax : [
     /^(?:\<.+?\> \(expanded from \<.+?\>\)\:)(.+)/m, // "<john@acme.com> (expanded from <john@digiflex.com>):  Domain name not found"
-    /^(?:\<.+?\>\:)(.+)/m // "<john@acme.com>: Domain name not found"
+    /^(?:\<.+?\>\:)(.+)/m, // "<john@acme.com>: Domain name not found"
+  ],
+
+  error_label_cleanup_recipient : [
+    /^\<.+?\> \(expanded from \<.+?\>\)\:/m, // "<john@acme.com> (expanded from <john@digiflex.com>):  Domain name not found"
+    /^\<.+?\>\:/m, // "<john@acme.com>: Domain name not found"
+  ],
+
+  error_label_cleanup_command : [
+    /\(in reply to (?:end of)?[A-Z\s]+ command\)$/m // "in reply to DATA command" or "in reply to end of DATA command"
   ],
 
   recipient : [
@@ -126,7 +135,8 @@ var REGEXES = {
 
   enhanced_types_server_unknown : [
     /(does not accept mail)/i,
-    /(domain name not found)/i
+    /(domain name not found)/i,
+    /(no route to host)/i
   ],
 
   enhanced_types_server_timeout : [
@@ -567,6 +577,13 @@ class Parser {
 
     _label = trimString(_label);
 
+    // Strip recipient (at the beginning) and command (at the end), in case \
+    //   they are still present
+    _label = loopRegexes(this.__regexes.error_label_cleanup_recipient, _label, "replace");
+    _label = loopRegexes(this.__regexes.error_label_cleanup_command, _label, "replace");
+
+    _label = trimString(_label);
+
     return _label;
   }
 

package/lib/utils.js

@@ -23,6 +23,8 @@ var loopRegexes = function(
   regexes, str, mode = "match", highestPosition = true
 ) {
   var _match;
+  var _minLength = mode === "split" ? 1 : 0;
+  var _maxLength = str.length;
 
   for (var _i = 0; _i < regexes.length; _i++) {
     var _regex = regexes[_i];
@@ -40,15 +42,12 @@ var loopRegexes = function(
       _match = _currentMatch;
 
       // A successfull replace must return a smaller string than the input
-      var _maxLength = str.length;
-
       if (_match.length < _maxLength) {
         break;
       }
     } else if (mode === "split" || mode === "match") {
-      // A successfull split must return an array with at least two items
-      var _minLength = mode === "split" ? 1 : 0;
 
+      // A successfull split must return an array with at least two items
       if ((_currentMatch || []).length > _minLength) {
         if (highestPosition === true) {
           // No previous match?
@@ -80,7 +79,7 @@ var loopRegexes = function(
     }
   }
 
-  return (_match || []);
+  return (mode === "replace") ? (_match || "") : (_match || []);
 }
 
 
@@ -91,7 +90,7 @@ var loopRegexes = function(
  * @return {string} The trimed string
  */
 var trimString = function(str) {
-  return ((str || "").trim() || null)
+  return ((str || "").trim() || "");
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email-bounce-parser",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Parses bounce emails and extract errors",
   "author": "Eliott Vincent <eliott@crisp.chat>",
   "main": "lib/index.js",