email-bounce-parser 1.0.12 → 1.0.13

package/lib/parser.js

@@ -87,7 +87,11 @@ var REGEXES = {
     /refused to talk to me\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)/m,
     /(?:error|reason)\:\s*?(\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)/mi,
     /(\d{3}[\s\-]\d\.\d\.\d\d?)/m,
-    /(\d{3}\-\'\d\.\d\.\d\d?)/m,
+    /(\d{3}\-\'\d\.\d\.\d\d?)/m
+  ],
+
+  error_lax : [
+    /(^\<.+?\>:.+)/m
   ],
 
   recipient : [
@@ -107,10 +111,10 @@ var REGEXES = {
 
   enhanced_types_no_such_recipient : [
     /(recipient address rejected: access denied)/i, // Outlook DBEB for invalid addresses
-    /(invalid mailbox)/i,
+    /((?:terminated|disabled|inactive|not found|unavailable|invalid) (?:account|user|mailbox|recipient))/i,
     /(do(e)?sn\'t exist)/i, // Some Chinese SMTP return "dosn't" instead of "doesn't"
     /(user (?:.+?) does not exist)/i,
-    /((?:account|user|mailbox) (?:is )?(?:terminated|disabled|inactive|not found|unavailable|invalid))/i
+    /((?:account|user|mailbox|recipient) (?:.+@.+ )?(?:is )?(?:terminated|disabled|inactive|not found|unavailable|invalid))/i
   ],
 
   enhanced_types_server_unknown : [
@@ -260,6 +264,7 @@ class Parser {
       enhanced : null
     },
       _label = null,
+      _type = null,
       _temporary = false,
       _permanent = false;
 
@@ -285,6 +290,20 @@ class Parser {
           _permanent = false;
         }
       }
+
+      if (_code.basic) {
+        _type = ERROR_CODES_TYPES[_code.basic] || null
+      }
+    }
+
+    // No label detected? Probably because there's no error code
+    if (!_label) {
+      // Attempt a lax check
+      var _match = loopRegexes(this.__regexes.error_lax, str);
+
+      if (_match && _match.length > 1) {
+        _label = trimString(_match[1]);
+      }
     }
 
     // Extract further data
@@ -294,7 +313,7 @@ class Parser {
       code      : _code,
       label     : _label,
 
-      type      : ERROR_CODES_TYPES[(_code || {}).basic],
+      type      : _type,
 
       temporary : _temporary,
       permanent : _permanent,
@@ -347,38 +366,36 @@ class Parser {
       _blocked = false,
       _spam = false;
 
-    if (code.basic) {
-      // Detect enhanced-type from bounce content
-      var _match = loopRegexes(this.__regexes.enhanced_types_no_such_recipient, str);
+    // Detect enhanced-type from bounce content
+    var _match = loopRegexes(this.__regexes.enhanced_types_no_such_recipient, str);
 
-      if (_match && _match.length > 1) {
-        _type = "no_such_recipient";
-      }
+    if (_match && _match.length > 1) {
+      _type = "no_such_recipient";
+    }
 
-      _match = loopRegexes(this.__regexes.enhanced_types_server_unknown, str);
+    _match = loopRegexes(this.__regexes.enhanced_types_server_unknown, str);
 
-      if (!_type && _match && _match.length > 1) {
-        _type = "server_unknown";
-      }
+    if (!_type && _match && _match.length > 1) {
+      _type = "server_unknown";
+    }
 
-      _match = loopRegexes(this.__regexes.enhanced_types_server_timeout, str);
+    _match = loopRegexes(this.__regexes.enhanced_types_server_timeout, str);
 
-      if (!_type && _match && _match.length > 1) {
-        _type = "server_timeout";
-      }
+    if (!_type && _match && _match.length > 1) {
+      _type = "server_timeout";
+    }
 
-      _match = loopRegexes(this.__regexes.enhanced_types_mailbox_full, str);
+    _match = loopRegexes(this.__regexes.enhanced_types_mailbox_full, str);
 
-      if (!_type && _match && _match.length > 1) {
-        _type = "mailbox_full";
-      }
+    if (!_type && _match && _match.length > 1) {
+      _type = "mailbox_full";
+    }
 
-      // Detect enhanced-type from enhanced error code
-      // Notice: this is done as a last resort, as sometimes enhanced code \
-      //   doesn't clearly convey the actual error
-      if (!_type && _match && code.enhanced) {
-        _type = ERROR_CODES_TYPES[`${code.basic} ${code.enhanced}`] || null;
-      }
+    // Detect enhanced-type from enhanced error code
+    // Notice: this is done as a last resort, as sometimes enhanced code \
+    //   doesn't clearly convey the actual error
+    if (!_type && _match && code.enhanced) {
+      _type = ERROR_CODES_TYPES[`${code.basic} ${code.enhanced}`] || null;
     }
 
     // Check if blocked

package/package.json

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