email-bounce-parser 1.0.1 → 1.0.3

package/README.md

@@ -71,6 +71,8 @@ console.log(result);
 //
 //       data: {
 //         type: "no_such_user",
+//         blocked: false,
+//         spam: false
 //       }
 //     },
 //

package/lib/parser.js

@@ -54,9 +54,11 @@ var REGEXES = {
 
   error : [
     /said\: (\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+) \(in reply to/m,
+    /said\: (\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?)?) (.+)\'/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\:\s*?(\d{3}(?:[\s\-]\d\.\d\.\d\d?)?) (.+)/m,
     /reason: (\d{3}[\s\-]\d\.\d\.\d\d?) (.+)/m,
     /(\d{3}[\s\-]\d\.\d\.\d\d?)/m
@@ -71,6 +73,10 @@ var REGEXES = {
     /\<(.+?)\>:/
   ],
 
+  temporary_safe : /(temporary|temporarily)/i,
+  blocked : /((?:is listed)blocked|banned|denied|dnsbl)/i,
+  spam : /(spam)/i,
+
   error_code : [
     /(\d{3})[\s\-](\d\.\d\.\d)/,
     /(\d{3})/
@@ -217,13 +223,23 @@ class Parser {
     if (_match && _match.length > 1) {
       _code  = this.__parseErrorCode(_match[1]);
       _label = trimString(_match[2]);
-    }
 
-    // Check temporary / permanent
-    if (_code.basic[0] === "4") {
-      _temporary = true;
-    } else if (_code.basic[0] === "5") {
-      _permanent = true;
+      // Check temporary / permanent
+      if (_code.basic[0] === "4") {
+        _temporary = true;
+      } else if (_code.basic[0] === "5") {
+        _permanent = true;
+      }
+
+      // Make sure the bounce is actually permanent
+      if (_permanent === true) {
+        var _match = this.__regexes.temporary_safe.match(str);
+
+        if (_match && _match.length > 1) {
+          _temporary = true;
+          _permanent = false;
+        }
+      }
     }
 
     // Extract further data
@@ -282,14 +298,32 @@ class Parser {
    * @return {object} The error data
    */
   __parseErrorData(str, code, label) {
-    var _type = null;
+    var _type = null,
+      _blocked = false,
+      _spam = false;
 
     if (code.basic && code.enhanced) {
       _type = ERROR_CODES_TYPES[`${code.basic} ${code.enhanced}`] || null;
     }
 
+    // Check if blocked
+    var _blocked_match = this.__regexes.blocked.match(str);
+
+    if (_blocked_match && _blocked_match.length > 1) {
+      _blocked = true;
+    }
+
+    // Check if spam
+    var _spam_match = this.__regexes.spam.match(str);
+
+    if (_spam_match && _spam_match.length > 1) {
+      _spam = true;
+    }
+
     return {
-      type : _type
+      type    : _type,
+      blocked : _blocked,
+      spam    : _spam
     }
   }
 

package/package.json

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