sisimai 5.0.3-java → 5.2.0-java

data/lib/sisimai/fact.rb

@@ -1,27 +1,33 @@
 module Sisimai
-  # Sisimai::Fact generate parsed data
+  # Sisimai::Fact generate the list of decoded bounce data
   class Fact
     require 'sisimai/message'
+    require 'sisimai/rfc791'
+    require 'sisimai/rfc1123'
     require 'sisimai/rfc1894'
     require 'sisimai/rfc5322'
     require 'sisimai/reason'
     require 'sisimai/address'
     require 'sisimai/datetime'
     require 'sisimai/time'
-    require 'sisimai/smtp/error'
+    require 'sisimai/smtp/failure'
     require 'sisimai/smtp/command'
     require 'sisimai/string'
     require 'sisimai/rhost'
+    require 'sisimai/lda'
 
     @@rwaccessors = [
       :action,          # [String] The value of Action: header
       :addresser,       # [Sisimai::Address] From address
       :alias,           # [String] Alias of the recipient address
       :catch,           # [?] Results generated by hook method
+      :command,         # [String] The last SMTP command
+      :decodedby,       # [String] MTA module name since v5.2.0
       :deliverystatus,  # [String] Delivery Status(DSN)
-      :destination,     # [String] The domain part of the "recipinet"
+      :destination,     # [String] The domain part of the "recipient"
       :diagnosticcode,  # [String] Diagnostic-Code: Header
       :diagnostictype,  # [String] The 1st part of Diagnostic-Code: Header
+      :feedbackid,      # [String] The value of Feedback-ID: header of the original message
       :feedbacktype,    # [String] Feedback Type
       :hardbounce,      # [Boolean] true = Hard bounce, false = is not a hard bounce
       :lhost,           # [String] local host name/Local MTA
@@ -33,8 +39,6 @@ module Sisimai
       :replycode,       # [String] SMTP Reply Code
       :rhost,           # [String] Remote host name/Remote MTA
       :senderdomain,    # [String] The domain part of the "addresser"
-      :smtpagent,       # [String] Module(Engine) name
-      :smtpcommand,     # [String] The last SMTP command
       :subject,         # [String] UTF-8 Subject text
       :timestamp,       # [Sisimai::Time] Date: header in the original message
       :timezoneoffset,  # [Integer] Time zone offset(seconds)
@@ -43,7 +47,7 @@ module Sisimai
     attr_accessor(*@@rwaccessors)
 
     RetryIndex = Sisimai::Reason.retry
-    RFC822Head = Sisimai::RFC5322.HEADERFIELDS(:all)
+    RFC822Head = Sisimai::RFC5322.HEADERTABLE
     ActionList = { delayed: 1, delivered: 1, expanded: 1, failed: 1, relayed: 1 };
 
     if RUBY_PLATFORM.start_with?('java')
@@ -67,10 +71,13 @@ module Sisimai
       @addresser      = argvs['addresser']
       @action         = argvs['action']
       @catch          = argvs['catch']
+      @command        = argvs['command']
+      @decodedby      = argvs['decodedby']
       @diagnosticcode = argvs['diagnosticcode']
       @diagnostictype = argvs['diagnostictype']
       @deliverystatus = argvs['deliverystatus']
       @destination    = argvs['recipient'].host
+      @feedbackid     = argvs["feedbackid"]
       @feedbacktype   = argvs['feedbacktype']
       @hardbounce     = argvs['hardbounce']
       @lhost          = argvs['lhost']
@@ -82,8 +89,6 @@ module Sisimai
       @replycode      = argvs['replycode']
       @rhost          = argvs['rhost']
       @senderdomain   = argvs['addresser'].host
-      @smtpagent      = argvs['smtpagent']
-      @smtpcommand    = argvs['smtpcommand']
       @subject        = argvs['subject']
       @token          = argvs['token']
       @timestamp      = argvs['timestamp']
@@ -93,11 +98,9 @@ module Sisimai
     # Constructor of Sisimai::Fact
     # @param         [Hash]   argvs
     # @options argvs [String]  data       Entire email message
-    # @options argvs [Boolean] delivered  Include the result which has "delivered" reason
-    # @options argvs [Boolean] vacation   Include the result which has "vacation" reason
-    # @options argvs [Proc]    hook       Proc object of callback method
-    # @options argvs [Array]   load       User defined MTA module list
-    # @options argvs [Array]   order      The order of MTA modules
+    # @options argvs [Boolean] delivered  true if the result which has "delivered" reason is included
+    # @options argvs [Boolean] vacation   true if the result which has "vacation" reason is included
+    # @options argvs [Proc]    hook       Proc object of the callback method
     # @options argvs [String]  origin     Path to the original email file
     # @return        [Array]              Array of Sisimai::Fact objects
     def self.rise(**argvs)
@@ -105,11 +108,8 @@ module Sisimai
       return nil unless argvs.is_a? Hash
 
       email = argvs[:data]; return nil unless email
-      loads = argvs[:load]  || nil
-      order = argvs[:order] || nil
-      args1 = { data: email, hook: argvs[:hook], load: loads, order: order }
+      args1 = { data: email, hook: argvs[:hook] }
       mesg1 = Sisimai::Message.rise(**args1)
-
       return nil unless mesg1
       return nil unless mesg1['ds']
       return nil unless mesg1['rfc822']
@@ -120,55 +120,48 @@ module Sisimai
 
       while e = deliveries.shift do
         # Create parameters for each Sisimai::Fact object
-        o = {}  # To be passed to each accessor of Sisimai::Fact
-        p = {
-          'action'         => e['action']       || '',
-          'alias'          => e['alias']        || '',
-          'catch'          => mesg1['catch']    || nil,
-          'deliverystatus' => e['status']       || '',
-          'diagnosticcode' => e['diagnosis']    || '',
-          'diagnostictype' => e['spec']         || '',
-          'feedbacktype'   => e['feedbacktype'] || '',
-          'hardbounce'     => false,
-          'lhost'          => e['lhost']        || '',
-          'origin'         => argvs[:origin],
-          'reason'         => e['reason']       || '',
-          'recipient'      => e['recipient']    || '',
-          'replycode'      => e['replycode']    || '',
-          'rhost'          => e['rhost']        || '',
-          'smtpagent'      => e['agent']        || '',
-          'smtpcommand'    => e['command']      || '',
+        next if e['recipient'].size < 5
+        next if ! argvs[:vacation]  && e['reason'] == 'vacation'
+        next if ! argvs[:delivered] && e['status'].start_with?('2.')
+
+        thing = {}  # To be passed to each accessor of Sisimai::Fact
+        piece = {
+          "action"         => e["action"],
+          "alias"          => e["alias"],
+          "catch"          => mesg1["catch"] || nil,
+          "command"        => e["command"],
+          "deliverystatus" => e["status"],
+          "diagnosticcode" => e["diagnosis"],
+          "diagnostictype" => e["spec"],
+          "feedbacktype"   => e["feedbacktype"],
+          "hardbounce"     => false,
+          "lhost"          => e["lhost"],
+          "origin"         => argvs[:origin],
+          "reason"         => e["reason"],
+          "recipient"      => e["recipient"],
+          "replycode"      => e["replycode"],
+          "rhost"          => e["rhost"],
+          "decodedby"      => e["agent"],
         }
-        unless argvs[:delivered]
-          # Skip if the value of "deliverystatus" begins with "2." such as 2.1.5
-          next if p['deliverystatus'].start_with?('2.')
-        end
-
-        unless argvs[:vacation]
-          # Skip if the value of "reason" is "vacation"
-          next if p['reason'] == 'vacation'
-        end
 
-        # EMAILADDRESS: Detect email address from message/rfc822 part
+        # EMAILADDRESS: Detect an email address from message/rfc822 part
         RFC822Head[:addresser].each do |f|
           # Check each header in message/rfc822 part
-          g = f.downcase
-          next unless rfc822data[g]
-          next if rfc822data[g].empty?
+          next unless rfc822data[f]
+          next if rfc822data[f].empty?
 
-          j = Sisimai::Address.find(rfc822data[g]) || next
-          p['addresser'] = j.shift
+          j = Sisimai::Address.find(rfc822data[f]) || next
+          piece['addresser'] = j.shift
           break
         end
 
-        unless p['addresser']
+        unless piece['addresser']
           # Fallback: Get the sender address from the header of the bounced email if the address is
           # not set at loop above.
           j = Sisimai::Address.find(mesg1['header']['to']) || []
-          p['addresser'] = j.shift
+          piece['addresser'] = j.shift
         end
-        next unless p['addresser']
-        next unless p['recipient']
+        next unless piece['addresser']
 
         # TIMESTAMP: Convert from a time stamp or a date string to a machine time.
         datestring = nil
@@ -184,54 +177,91 @@ module Sisimai
 
         # Set "date" getting from the value of "Date" in the bounce message
         datevalues << mesg1['header']['date'] if datevalues.size < 2
-
         while v = datevalues.shift do
           # Parse each date value in the array
-          datestring = Sisimai::DateTime.parse(v)
-          break if datestring
-        end
+          datestring = Sisimai::DateTime.parse(v) || next
 
-        if datestring && cv = datestring.match(/\A(.+)[ ]+([-+]\d{4})\z/)
-          # Get the value of timezone offset from datestring: Wed, 26 Feb 2014 06:05:48 -0500
-          datestring = cv[1]
-          zoneoffset = Sisimai::DateTime.tz2second(cv[2])
-          p['timezoneoffset'] = cv[2]
+          if cv = datestring.match(/\A(.+)[ ]+([-+]\d{4})\z/)
+            # Get the value of timezone offset from datestring: Wed, 26 Feb 2014 06:05:48 -0500
+            datestring = cv[1]
+            zoneoffset = Sisimai::DateTime.tz2second(cv[2])
+            piece['timezoneoffset'] = cv[2]
+          end
+          break if datestring
         end
 
         begin
           # Convert from the date string to an object then calculate time zone offset.
           t = TimeModule.strptime(datestring, '%a, %d %b %Y %T')
-          p['timestamp'] = (t.to_time.to_i - zoneoffset) || nil
+          piece['timestamp'] = (t.to_time.to_i - zoneoffset) || nil
         rescue
           warn ' ***warning: Failed to strptime ' << datestring.to_s
         end
-        next unless p['timestamp']
+        next unless piece['timestamp']
 
         # OTHER_TEXT_HEADERS:
-        rr = mesg1['header']['received'] || []
-        unless rr.empty?
-          # Get a localhost and a remote host name from Received header.
-          p['rhost'] = Sisimai::RFC5322.received(rr[-1])[1] if p['rhost'].empty?
-          p['lhost'] = '' if p['rhost'] == p['lhost']
-          p['lhost'] = Sisimai::RFC5322.received(rr[ 0])[0] if p['lhost'].empty?
+        recv = mesg1["header"]["received"] || []
+        if piece["rhost"].empty?
+          # Try to pick a remote hostname from Received: headers of the bounce message
+          ir = Sisimai::RFC1123.find(e["diagnosis"])
+          piece["rhost"] = ir if Sisimai::RFC1123.is_internethost(ir)
+
+          if piece["rhost"].empty?
+            # The remote hostname in the error message did not exist or is not a valid
+            # internet hostname
+            recv.reverse.each do |re|
+              # Check the Received: headers backwards and get a remote hostname
+              break if piece["rhost"].size > 0
+              cv = Sisimai::RFC5322.received(re)[0]
+              next unless Sisimai::RFC1123.is_internethost(cv)
+              piece['rhost'] = cv
+            end
+          end
+        end
+        piece["lhost"] = "" if piece["rhost"] == piece["lhost"]
+
+        if piece["lhost"].empty?
+          # Try to pick a local hostname from Received: headers of the bounce message
+          recv.each do |le|
+            # Check the Received: headers backwards and get a local hostname
+            cv = Sisimai::RFC5322.received(le)[0]
+            next unless Sisimai::RFC1123.is_internethost(cv)
+            piece['lhost'] = cv
+            break
+          end
         end
 
         # Remove square brackets and curly brackets from the host variable
         %w[rhost lhost].each do |v|
-          p[v] = p[v].split('@')[-1] if p[v].include?('@')
-          p[v].delete!('[]()')    # Remove square brackets and curly brackets from the host variable
-          p[v].sub!(/\A.+=/, '')  # Remove string before "="
-          p[v].chomp!("\r") if p[v].end_with?("\r") # Remove CR at the end of the value
-
-          # Check space character in each value and get the first element
-          p[v] = p[v].split(' ', 2).shift if p[v].include?(' ')
-          p[v].chomp!('.') if p[v].end_with?('.')   # Remove "." at the end of the value
+          next if piece[v].empty?
+
+          if piece[v].include?('@')
+            # Use the domain part as a remote/local host when the value is an email address
+            piece[v] = piece[v].split('@')[-1]
+          end
+          piece[v].delete!('[]()')    # Remove square brackets and curly brackets from the host variable
+          piece[v].sub!(/\A.+=/, '')  # Remove string before "="
+          piece[v].sub!("\r", '')     # Remove CR at the end of the value
+
+          if piece[v].include?(' ')
+            # Check space character in each value and get the first hostname
+            ee = piece[v].split(' ')
+            ee.each do |w|
+              # get a hostname from the string like "127.0.0.1 x109-20.example.com 192.0.2.20"
+              # or "mx.sp.example.jp 192.0.2.135"
+              next if Sisimai::RFC791.is_ipv4address(w)
+              piece[v] = w
+              break
+            end
+          end
+          piece[v] = ee[0] if piece[v].include?(' ')
+          piece[v].chomp!('.') if piece[v].end_with?('.')   # Remove "." at the end of the value
         end
 
         # Subject: header of the original message
-        p['subject'] = rfc822data['subject'] || ''
-        p['subject'].scrub!('?')
-        p['subject'].chomp!("\r") if p['subject'].end_with?("\r")
+        piece['subject'] = rfc822data['subject'] || ''
+        piece['subject'].scrub!('?')
+        piece['subject'].chomp!("\r") if piece['subject'].end_with?("\r")
 
         # The value of "List-Id" header
         if Sisimai::String.aligned(rfc822data['list-id'], ['<', '.', '>'])
@@ -239,10 +269,10 @@ module Sisimai
           # Get the value of List-Id header: "List name <list-id@example.org>"
           p0 = rfc822data['list-id'].index('<') + 1
           p1 = rfc822data['list-id'].index('>')
-          p['listid'] = rfc822data['list-id'][p0, p1 - p0]
+          piece['listid'] = rfc822data['list-id'][p0, p1 - p0]
         else
           # Invalid value of the List-Id: field
-          p['listid'] = ''
+          piece['listid'] = ''
         end
 
         # The value of "Message-Id" header
@@ -251,26 +281,26 @@ module Sisimai
           # Leave only string inside of angle brackets(<>)
           p0 = rfc822data['message-id'].index('<') + 1
           p1 = rfc822data['message-id'].index('>')
-          p['messageid'] = rfc822data['message-id'][p0, p1 - p0]
+          piece['messageid'] = rfc822data['message-id'][p0, p1 - p0]
         else
           # Invalid value of the Message-Id: field
-          p['messageid'] = ''
+          piece['messageid'] = ''
         end
 
         # CHECK_DELIVERY_STATUS_VALUE: Cleanup the value of "Diagnostic-Code:" header
-        if p['diagnosticcode'].to_s.size > 0
+        if piece['diagnosticcode'].to_s.size > 0
           # Get an SMTP Reply Code and an SMTP Enhanced Status Code
-          p['diagnosticcode'].chop if p['diagnosticcode'][-1, 1] == "\r"
+          piece['diagnosticcode'].chop if piece['diagnosticcode'][-1, 1] == "\r"
 
-          cs = Sisimai::SMTP::Status.find(p['diagnosticcode'])    || ''
-          cr = Sisimai::SMTP::Reply.find(p['diagnosticcode'], cs) || ''
-          p['deliverystatus'] = Sisimai::SMTP::Status.prefer(p['deliverystatus'], cs, cr)
+          cs = Sisimai::SMTP::Status.find(piece['diagnosticcode'])
+          cr = Sisimai::SMTP::Reply.find(piece['diagnosticcode'], cs)
+          piece['deliverystatus'] = Sisimai::SMTP::Status.prefer(piece['deliverystatus'], cs, cr)
 
           if cr.size == 3
             # There is an SMTP reply code in the error message
-            p['replycode'] = cr if p['replycode'].to_s.empty?
+            piece['replycode'] = cr if piece['replycode'].empty?
 
-            if p['diagnosticcode'].include?(cr + '-')
+            if piece['diagnosticcode'].include?(cr + '-')
               # 550-5.7.1 [192.0.2.222] Our system has detected that this message is
               # 550-5.7.1 likely unsolicited mail. To reduce the amount of spam sent to Gmail,
               # 550-5.7.1 this message has been blocked. Please visit
@@ -286,80 +316,84 @@ module Sisimai
               ['-', " "].each do |q|
                 # Remove strings: "550-5.7.1", and "550 5.7.1" from the error message
                 cx = sprintf("%s%s%s", cr, q, cs)
-                p0 = p['diagnosticcode'].index(cx)
+                p0 = piece['diagnosticcode'].index(cx)
                 while p0
                   # Remove strings like "550-5.7.1"
-                  p['diagnosticcode'][p0, cx.size] = ''
-                  p0 = p['diagnosticcode'].index(cx)
+                  piece['diagnosticcode'][p0, cx.size] = ''
+                  p0 = piece['diagnosticcode'].index(cx)
                 end
 
                 # Remove "553-" and "553 " (SMTP reply code only) from the error message
                 cx = sprintf("%s%s", cr, q)
-                p0 = p['diagnosticcode'].index(cx)
+                p0 = piece['diagnosticcode'].index(cx)
                 while p0
                   # Remove strings like "553-"
-                  p['diagnosticcode'][p0, cx.size] = ''
-                  p0 = p['diagnosticcode'].index(cx)
+                  piece['diagnosticcode'][p0, cx.size] = ''
+                  p0 = piece['diagnosticcode'].index(cx)
                 end
               end
 
-              if p['diagnosticcode'].index(cr).to_i > 1
+              if piece['diagnosticcode'].index(cr).to_i > 1
                 # Add "550 5.1.1" into the head of the error message when the error message does not
                 # begin with "550"
-                p['diagnosticcode'] = sprintf("%s %s %s", cr, cs, p['diagnosticcode'])
+                piece['diagnosticcode'] = sprintf("%s %s %s", cr, cs, piece['diagnosticcode'])
               end
             end
           end
 
-          p1 = p['diagnosticcode'].downcase.index('<html>')
-          p2 = p['diagnosticcode'].downcase.index('</html>')
-          p['diagnosticcode'][p1, p2 + 7 - p1] = '' if p1 && p2
-          p['diagnosticcode'] = Sisimai::String.sweep(p['diagnosticcode'])
+          dc = piece['diagnosticcode'].downcase
+          p1 = dc.index('<html>')
+          p2 = dc.index('</html>')
+          piece['diagnosticcode'][p1, p2 + 7 - p1] = '' if p1 && p2
+          piece['diagnosticcode'] = Sisimai::String.sweep(piece['diagnosticcode'])
         end
 
-        if Sisimai::String.is_8bit(p['diagnosticcode'])
+        if Sisimai::String.is_8bit(piece['diagnosticcode'])
           # To avoid incompatible character encodings: ASCII-8BIT and UTF-8 (Encoding::CompatibilityError
-          p['diagnosticcode'] = p['diagnosticcode'].force_encoding('UTF-8').scrub('?')
+          piece['diagnosticcode'] = piece['diagnosticcode'].force_encoding('UTF-8').scrub('?')
         end
 
-        p['diagnostictype']   = nil        if p['diagnostictype'].empty?
-        p['diagnostictype'] ||= 'X-UNIX'   if p['reason'] == 'mailererror'
-        p['diagnostictype'] ||= 'SMTP' unless %w[feedback vacation].include?(p['reason'])
+        piece["diagnostictype"] = "X-UNIX" if piece["reason"] == "mailererror"
+        if piece["diagnostictype"].empty?
+          piece["diagnostictype"] = "SMTP" unless %w[feedback vacation].include?(piece["reason"])
+        end
 
         # Check the value of SMTP command
-        p['smtpcommand'] = '' unless Sisimai::SMTP::Command.test(p['smtpcommand'])
+        piece['command'] = '' unless Sisimai::SMTP::Command.test(piece['command'])
 
         # Create parameters for the constructor
-        as = Sisimai::Address.new(p['addresser'])          || next; next if as.void
-        ar = Sisimai::Address.new(address: p['recipient']) || next; next if ar.void
+        as = Sisimai::Address.new(piece['addresser'])          || next; next if as.void
+        ar = Sisimai::Address.new(address: piece['recipient']) || next; next if ar.void
         ea = %w[
-          action deliverystatus diagnosticcode diagnostictype feedbacktype lhost listid messageid
-          origin reason replycode rhost smtpagent smtpcommand subject 
+          action command decodedby deliverystatus diagnosticcode diagnostictype feedbacktype lhost
+          listid messageid origin reason replycode rhost subject
         ]
 
-        o = {
+        thing = {
           'addresser'    => as,
           'recipient'    => ar,
           'senderdomain' => as.host,
           'destination'  => ar.host,
-          'alias'        => p['alias'] || ar.alias,
-          'token'        => Sisimai::String.token(as.address, ar.address, p['timestamp']),
+          'alias'        => piece['alias'] || ar.alias,
+          'token'        => Sisimai::String.token(as.address, ar.address, piece['timestamp']),
         }
+        ea.each { |q| thing[q] = piece[q] if thing[q].nil? || thing[q].empty? }
 
         # Other accessors
-        ea.each { |q| o[q] ||= p[q] || '' }
-        o['catch']          = p['catch'] || nil
-        o['hardbounce']     = p['hardbounce']
-        o['replycode']      = Sisimai::SMTP::Reply.find(p['diagnosticcode']).to_s if o['replycode'].empty?
-        o['timestamp']      = TimeModule.parse(::Time.at(p['timestamp']).to_s)
-        o['timezoneoffset'] = p['timezoneoffset'] || '+0000'
+        thing['catch']          = piece['catch'] || nil
+        thing["feedbackid"]     = ""
+        thing['hardbounce']     = piece['hardbounce']
+        thing['replycode']      = Sisimai::SMTP::Reply.find(piece['diagnosticcode']) if thing['replycode'].empty?
+        thing['timestamp']      = TimeModule.parse(::Time.at(piece['timestamp']).to_s)
+        thing['timezoneoffset'] = piece['timezoneoffset'] || '+0000'
+        ea.each { |q| thing[q] = piece[q] if thing[q].empty? }
 
         # ALIAS
         while true do
           # Look up the Envelope-To address from the Received: header in the original message
-          # when the recipient address is same with the value of o['alias'].
-          break if o['alias'].empty?
-          break if o['recipient'].address != o['alias']
+          # when the recipient address is same with the value of thing['alias'].
+          break if thing['alias'].empty?
+          break if thing['recipient'].address != thing['alias']
           break unless rfc822data.has_key?('received')
           break if rfc822data['received'].empty?
 
@@ -371,94 +405,89 @@ module Sisimai
             next if af.empty?
             next if af[5].empty?
             next unless Sisimai::Address.is_emailaddress(af[5])
-            next if o['recipient'].address == af[5]
+            next if thing['recipient'].address == af[5]
 
-            o['alias'] = af[5]
+            thing['alias'] = af[5]
             break
           end
           break
         end
-        o['alias'] = '' if o['alias'] == o['recipient'].address
+        thing['alias'] = '' if thing['alias'] == thing['recipient'].address
 
         # REASON: Decide the reason of email bounce
-        if o['reason'].empty? || RetryIndex[o['reason']]
-          # The value of "reason" is empty or is needed to check with other values again
-          re = ''; de = o['destination']
-          re = Sisimai::Rhost.get(o) if Sisimai::Rhost.match(o['rhost'])
-          if re.empty?
-            # Failed to detect a bounce reason by the value of "rhost"
-            re = Sisimai::Rhost.get(o, de) if Sisimai::Rhost.match(de)
-            re = Sisimai::Reason.get(o)    if re.empty?
-            re = 'undefined'               if re.empty?
+        while true
+          if thing["reason"].empty? || RetryIndex[thing["reason"]]
+            # The value of "reason" is empty or is needed to check with other values again
+            re = thing["reason"].empty? ? "undefined" : thing["reason"]
+            cr = Sisimai::LDA.find(thing);    if Sisimai::Reason.is_explicit(cr) then thing["reason"] = cr; break; end
+            cr = Sisimai::Rhost.find(thing);  if Sisimai::Reason.is_explicit(cr) then thing["reason"] = cr; break; end
+            cr = Sisimai::Reason.find(thing); if Sisimai::Reason.is_explicit(cr) then thing["reason"] = cr; break; end
+            thing["reason"] = thing["diagnosticcode"].size > 0 ? "onhold" : re
+            break
           end
-          o['reason'] = re
+          break
         end
 
         # HARDBOUNCE: Set the value of "hardbounce", default value of "bouncebounce" is false
-        if o['reason'] == 'delivered' || o['reason'] == 'feedback' || o['reason'] == 'vacation'
-          # The value of "reason" is "delivered", "vacation" or "feedback".
-          o['replycode'] = '' unless o['reason'] == 'delivered'
+        if thing['reason'] == 'delivered' || thing['reason'] == 'feedback' || thing['reason'] == 'vacation'
+          # Delete the value of ReplyCode when the Reason is "feedback" or "vacation"
+          thing['replycode'] = '' unless thing['reason'] == 'delivered'
         else
-          smtperrors = p['deliverystatus'] + ' ' << p['diagnosticcode']
+          # The reason is not "delivered", or "feedback", or "vacation"
+          smtperrors = piece['deliverystatus'] + ' ' << piece['diagnosticcode']
           smtperrors = '' if smtperrors.size < 4
-          softorhard = Sisimai::SMTP::Error.soft_or_hard(o['reason'], smtperrors)
-          o['hardbounce'] = true if softorhard == 'hard'
+          thing['hardbounce'] = Sisimai::SMTP::Failure.is_hardbounce(thing['reason'], smtperrors)
         end
 
         # DELIVERYSTATUS: Set a pseudo status code if the value of "deliverystatus" is empty
-        if o['deliverystatus'].empty?
-          smtperrors = p['replycode'] + ' ' << p['diagnosticcode']
+        if thing['deliverystatus'].empty?
+          smtperrors = piece['replycode'] + ' ' << piece['diagnosticcode']
           smtperrors = '' if smtperrors.size < 4
-          permanent1 = Sisimai::SMTP::Error.is_permanent(smtperrors)
-          permanent1 = true if permanent1 == nil
-          o['deliverystatus'] = Sisimai::SMTP::Status.code(o['reason'], permanent1 ? false : true) || ''
+          permanent0 = Sisimai::SMTP::Failure.is_permanent(smtperrors)
+          temporary0 = Sisimai::SMTP::Failure.is_temporary(smtperrors)
+          temporary1 = temporary0; temporary1 = false if !permanent0 && !temporary1 
+          thing['deliverystatus'] = Sisimai::SMTP::Status.code(thing['reason'], temporary1) || ''
         end
 
         # REPLYCODE: Check both of the first digit of "deliverystatus" and "replycode"
-        cx = [o['deliverystatus'][0, 1], o['replycode'][0, 1]]
+        cx = [thing['deliverystatus'][0, 1], thing['replycode'][0, 1]]
         if cx[0] != cx[1]
           # The class of the "Status:" is defer with the first digit of the reply code
-          cx[1] = Sisimai::SMTP::Reply.find(p['diagnosticcode'], cx[0]) || ''
-          o['replycode'] = cx[1].start_with?(cx[0]) ? cx[1] : ''
+          cx[1] = Sisimai::SMTP::Reply.find(piece['diagnosticcode'], cx[0])
+          thing['replycode'] = cx[1].start_with?(cx[0]) ? cx[1] : ''
         end
 
-        unless ActionList.has_key?(o['action'])
+        unless ActionList.has_key?(thing['action'])
           # There is an action value which is not described at RFC1894
-          if ox = Sisimai::RFC1894.field('Action: ' << o['action'])
+          if ox = Sisimai::RFC1894.field('Action: ' << thing['action'])
             # Rewrite the value of "Action:" field to the valid value
             #
             #    The syntax for the action-field is:
             #       action-field = "Action" ":" action-value
             #       action-value = "failed" / "delayed" / "delivered" / "relayed" / "expanded"
-            o['action'] = ox[2]
+            thing['action'] = ox[2]
           end
         end
-        o['action'] = 'delayed' if o['reason'] == 'expired'
-        if o['action'].empty?
-          o['action'] = 'failed' if cx[0] == '4' || cx[0] == '5'
-        end
+        thing["action"] = ""          if thing["action"].nil?
+        thing["action"] = "delivered" if thing["action"].empty? && thing["reason"] == "delivered"
+        thing["action"] = "delayed"   if thing["action"].empty? && thing["reason"] == "expired"
+        thing["action"] = "failed"    if thing["action"].empty? && cx[0] == "4" || cx[0] == "5"
+
+        # Feedback-ID: 1.us-west-2.QHuyeCQrGtIIMGKQfVdUhP9hCQR2LglVOrRamBc+Prk=:AmazonSES
+        thing["feedbackid"] = rfc822data["feedback-id"] || ""
 
-        listoffact << Sisimai::Fact.new(o)
+        listoffact << Sisimai::Fact.new(thing)
       end
       return listoffact
     end
 
-    # Emulate "softbounce" accessor for the backward compatible
-    # @return   [Integer]
-    def softbounce
-      warn ' ***warning: Sisimai::Fact.softbounce will be removed at v5.1.0. Use Sisimai::Fact.hardbounce instead'
-      return  0 if self.hardbounce
-      return -1 if self.reason == 'delivered' || self.reason == 'feedback' || self.reason == 'vacation'
-      return  1
-    end
-
     # Convert from Sisimai::Fact object to a Hash
     # @return   [Hash] Hashed data
     def damn
       data = {}
       stringdata = %w[
-        action alias catch deliverystatus destination diagnosticcode diagnostictype feedbacktype
-        lhost listid messageid origin reason replycode rhost senderdomain smtpagent smtpcommand
+        action alias catch command decodedby deliverystatus destination diagnosticcode diagnostictype
+        feedbackid feedbacktype lhost listid messageid origin reason replycode rhost senderdomain
         subject timezoneoffset token
       ]
 
@@ -469,6 +498,10 @@ module Sisimai
         v['addresser']  = self.addresser.address
         v['recipient']  = self.recipient.address
         v['timestamp']  = self.timestamp.to_time.to_i
+
+        # Backward compatibility until v5.2.0
+        v["smtpagent"] = self.decodedby
+        v["smtpcommand"] = self.command
         data = v
       rescue
         warn ' ***warning: Failed to execute Sisimai::Fact.damn'
@@ -501,6 +534,8 @@ module Sisimai
       return self.dump('json')
     end
 
+    def smtpagent;  warn " ***warning: Sisimai::Fact.smtpagent will be removed at v5.5.0"; return self.decodedby; end
+    def smtpcomand; warn " ***warning: Sisimai::Fact.smtpcommand will be removed at v5.5.0"; return self.command; end
   end
 end