email-bounce-parser 1.0.15 → 1.0.16

package/lib/parser.js

@@ -8,6 +8,7 @@ var ERROR_CODES_TYPES = {
   "421"        : "service_not_available",
   "421 4.3.0"  : "temporary_system_problem",
   "421 4.4.5"  : "server_busy",
+  "421 4.7.28" : "ip_blocked_spam",
   "432 4.7.12" : "password_needed",
   "450"        : "action_not_taken_mailbox_unavailable",
   "450 4.2.1"  : "action_not_taken_mailbox_rate_limited",
@@ -84,7 +85,7 @@ var REGEXES = {
     /said\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+) \(in reply to/,
     /said\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?)-(.+)/,
     /(\d{3}\-\'\d\.\d\.\d\d?) (.+)/,
-    /LMTP error after (?:.+?)\:\<.+?\>\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) <.+?\>(.+)$/m,
+    /LMTP error after .+?\:\<.+?\>\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) <.+?\>(.+)$/m,
     /remote server returned \'(\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)\'/i,
     /The response from the remote server was:\s(\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)/,
     /refused to talk to me\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)/,
@@ -94,18 +95,20 @@ var REGEXES = {
   ],
 
   error_lax : [
-    /(^\<.+?\>:.+)/m
+    /^(?:\<.+?\> \(expanded from \<.+?\>\)\:)(.+)/m, // "<john@acme.com> (expanded from <john@digiflex.com>):  Domain name not found"
+    /^(?:\<.+?\>\:)(.+)/m // "<john@acme.com>: Domain name not found"
   ],
 
   recipient : [
-    /The following addresses had permanent fatal errors (?:.*?)\s\<(.+?)\>/,
-    /The following message to \<(.+?)\> was undeliverable/,
-    /to the following addresses:\s*(.+)/,
+    /the following addresses had permanent fatal errors (?:.*?)\s\<(.+?)\>/i,
+    /the following message to \<(.+?)\> was undeliverable/i,
+    /to the following addresses:\s*(.+)/i,
     /^\<(.+?)\>:/m,
-    /^(.+?)\s?\n?\s*[\[|<]mailto\:(.+?)[\]|>]/m,
-    /^Your message wasn't delivered to (.+?)\s/m,
-    /^Your message to (.+?) couldn\'t/m,
-    /\<(.+?)\>:/
+    /^(.+?)\s?\n?\s*[\[|<]mailto\:(.+?)[\]|>]/mi, // "john@acme.com<mailto:john@acme.com>"
+    /^your message wasn't delivered to (.+?)\s/mi, // "Your message wasn't delivered to john@acme.com"
+    /^your message to (.+?) couldn\'t/mi, // "Your message to john@acme.com couldn't"
+    /\<(.+?)\> \(expanded from \<.+?\>\)\:/, // "<john@acme.com> (expanded from <john@digiflex.com>): "
+    /\<(.+?)\>:/ // "<john@acme.com>:"
   ],
 
   temporary_safe : /(temporary|temporarily)/i,
@@ -122,7 +125,8 @@ var REGEXES = {
   ],
 
   enhanced_types_server_unknown : [
-    /(does not accept mail)/i
+    /(does not accept mail)/i,
+    /(domain name not found)/i
   ],
 
   enhanced_types_server_timeout : [
@@ -134,8 +138,8 @@ var REGEXES = {
   ],
 
   error_code : [
-    /(\d{3})[\s\-](\d\.\d\.\d)/,  // "550 5.4.1" or "550-5.4.1"
-    /(\d{3})\-\'(\d\.\d\.\d)/, // "550-'5.4.1"
+    /(\d{3})[\s\-](\d\.\d\.\d\d?)/,  // "550 5.4.1" or "550-5.4.1" or "550-5.4.11"
+    /(\d{3})\-\'(\d\.\d\.\d\d?)/, // "550-'5.4.1" or "550-'5.4.11"
     /(\d{3})/ // "550"
   ]
 };
@@ -276,7 +280,7 @@ class Parser {
 
     if (_match && _match.length > 1) {
       _code  = this.__parseErrorCode(_match[1]);
-      _label = trimString(_match[2]);
+      _label = this.__cleanErrorLabel(_match[2]);
 
       // Check temporary / permanent
       if (_code.basic[0] === "4") {
@@ -306,7 +310,7 @@ class Parser {
       var _match = loopRegexes(this.__regexes.error_lax, str);
 
       if (_match && _match.length > 1) {
-        _label = trimString(_match[1]);
+        _label = this.__cleanErrorLabel(_match[1]);
       }
     }
 
@@ -550,6 +554,43 @@ class Parser {
 
     return _str;
   }
+
+
+  /**
+   * Cleans error label
+   * @private
+   * @param  {string} [label]
+   * @return {string} Unquoted text
+   */
+  __cleanErrorLabel(label="") {
+    var _label = this.__unquoteText(label);
+
+    _label = trimString(_label);
+
+    return _label;
+  }
+
+
+  /**
+   * Unquotes text
+   * @private
+   * @param  {string} [str]
+   * @return {string} Unquoted text
+   */
+  __unquoteText(str="") {
+    var _str = str;
+
+    _str = trimString(_str);
+
+    if (
+      (_str.startsWith("'") && _str.endsWith("'")) ||
+      (_str.startsWith("\"") && _str.endsWith("\""))
+    ) {
+      return _str.slice(1, -1);
+    }
+
+    return _str;
+  }
 }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email-bounce-parser",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Parses bounce emails and extract errors",
   "author": "Eliott Vincent <eliott@crisp.chat>",
   "main": "lib/index.js",
@@ -30,7 +30,9 @@
     "mail",
     "email",
     "bounce",
-    "bounces"
+    "bounces",
+    "smtp",
+    "rfc"
   ],
   "license": "MIT"
 }