email-bounce-parser 1.0.13 → 1.0.15

package/lib/parser.js

@@ -61,33 +61,36 @@ var REGEXES = {
   ],
 
   command : [
-    /\(in reply to end of ([A-Z\s]+) command\)$/m, // 'end of' command
-    /\(in reply to ([A-Z\s]+) command\)$/m, // default
-    /timed out while sending ([A-Z\s]+)$/m, // command timed out
-    /error after ([A-Z\s]+)/m // 'after' command
+    /\(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"
   ],
 
   email_server : [
     /host (\S+)\[([\d\.]+)\](?:\:(\d+)\:)? (?:said|refused to talk)/m,
     /^(\S+) rejected your message/m,
-    /\: connect to (.+)\[(.+)\](?:\:(\d+)\:)?/m,
+    /\: connect to (.+)\[(.+)\](?:\:(\d+)\:)?/m, // "connect to acme.com[132.145.223.95]:25:"
     /Name service error for name\=(\S+)\s/m,
     /RCPT TO\:\<(.+?)\>/m,
     /Message rejected by\:\s+([\S\.]+?)$/m, // Outlook error
-    /from (\S+) \[([\d\.]+)\](?:\:(\d+)\:)?/m
+    /from (\S+) \[([\d\.]+)\](?:\:(\d+)\:)?/m,
+    /conversation with (\S+)\[([\d\.]+)\](?:\:(\d+)\:)? timed out/m,
+    /Generating server: (\S+)(?:\[([\d\.]+)\])?(?:\:(\d+)\:)?/m // "Generating server: PH7PR02MB9549495.namprd02.prod.outlook.com"
   ],
 
   error : [
-    /said\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+) \(in reply to/m,
-    /said\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?)-(.+)/m,
-    /(\d{3}\-\'\d\.\d\.\d\d?) (.+)/m,
+    /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,
-    /Remote Server returned \'(\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)\'/m,
-    /The response from the remote server was:\s(\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)/m,
-    /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
+    /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?)?) (.+)/,
+    /(?:error|reason)\:\s*?(\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)/i,
+    /(\d{3}[\s\-]\d\.\d\.\d\d?)/,
+    /(\d{3}\-\'\d\.\d\.\d\d?)/
   ],
 
   error_lax : [
@@ -111,6 +114,7 @@ var REGEXES = {
 
   enhanced_types_no_such_recipient : [
     /(recipient address rejected: access denied)/i, // Outlook DBEB for invalid addresses
+    /(no such (?:account|user|mailbox|recipient))/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,
@@ -126,7 +130,7 @@ var REGEXES = {
   ],
 
   enhanced_types_mailbox_full : [
-    /(out of storage|(?:mailbox (?:is )?full)|(?:user (?:is )?over quota))/i
+    /(out of storage|(?:mailbox (?:is )?full)|(?:user (?:is )?over quota))/i // "user is over quota" (iCloud)
   ],
 
   error_code : [
@@ -493,7 +497,7 @@ class Parser {
     var _match = loopRegexes(this.__regexes.command, str);
 
     if (_match && _match.length > 1) {
-      _command = _match[1];
+      _command = trimString(_match[1]).toUpperCase();
     }
 
     return _command;

package/package.json

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