sisimai 4.25.4 → 4.25.5

data/lib/sisimai/data.rb

@@ -35,7 +35,7 @@ module Sisimai
       :deliverystatus,  # [String] Delivery Status(DSN)
       :timezoneoffset,  # [Integer] Time zone offset(seconds)
     ]
-    @@rwaccessors.each { |e| attr_accessor e }
+    attr_accessor(*@@rwaccessors)
 
     EndOfEmail = Sisimai::String.EOM
     RetryIndex = Sisimai::Reason.retry
@@ -153,7 +153,6 @@ module Sisimai
         # Detect email address from message/rfc822 part
         fieldorder[:addresser].each do |f|
           # Check each header in message/rfc822 part
-          next unless rfc822data.key?(f)
           next unless rfc822data[f]
           next if rfc822data[f].empty?
 
@@ -312,7 +311,7 @@ module Sisimai
         o = Sisimai::Data.new(p)
         next unless o.recipient
 
-        if o.reason.empty? || RetryIndex.key?(o.reason)
+        if o.reason.empty? || RetryIndex[o.reason]
           # Decide the reason of email bounce
           r = ''
           r = Sisimai::Rhost.get(o) if Sisimai::Rhost.match(o.rhost) # Remote host dependent error
@@ -348,9 +347,8 @@ module Sisimai
             textasargv = (o.replycode + ' ' + p['diagnosticcode']).lstrip
             getchecked = Sisimai::SMTP::Error.is_permanent(textasargv)
             tmpfailure = getchecked.nil? ? false : (getchecked ? false : true)
-            pseudocode = Sisimai::SMTP::Status.code(o.reason, tmpfailure)
 
-            if pseudocode
+            if pseudocode = Sisimai::SMTP::Status.code(o.reason, tmpfailure)
               # Set the value of "deliverystatus" and "softbounce"
               o.deliverystatus = pseudocode
 

data/lib/sisimai/lhost.rb

@@ -81,20 +81,6 @@ module Sisimai
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def make; return nil; end
-
-      # @abstract Print warnings about an obsoleted method. This method will be
-      #           removed at the future release of Sisimai
-      # @until    v4.25.5
-      def warn(whois = '', useit = nil)
-        label = ' ***warning:'
-        methodname = caller[0][/`.*'/][1..-2]
-        messageset = sprintf("%s %s.%s is marked as obsoleted", label, whois, methodname)
-
-        useit ||= methodname
-        messageset << sprintf(" and will be removed at %s.", removedat)
-        messageset << sprintf(" Use %s.%s instead.\n", self.name, useit) if useit != 'gone'
-        Kernel.warn messageset
-      end
     end
   end
 end

data/lib/sisimai/lhost/activehunter.rb

@@ -8,10 +8,8 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
-      StartingOf = {
-        message: ['  ----- The following addresses had permanent fatal errors -----'],
-        rfc822:  ['Content-type: message/rfc822'],
-      }.freeze
+      ReBackbone = %r|^Content-type:[ ]message/rfc822|.freeze
+      StartingOf = { message: ['  ----- The following addresses had permanent fatal errors -----'] }.freeze
 
       def description; return 'TransWARE Active!hunter'; end
       def smtpagent;   return Sisimai::Lhost.smtpagent(self); end
@@ -34,68 +32,47 @@ module Sisimai::Lhost
         return nil unless mhead['x-ahmailid']
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
           if readcursor == 0
             # Beginning of the bounce message or delivery status part
-            if e == StartingOf[:message][0]
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e == StartingOf[:message][0]
+            next
           end
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
 
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
-          end
+          #  ----- The following addresses had permanent fatal errors -----
+          #
+          # >>> kijitora@example.org <kijitora@example.org>
+          #
+          #  ----- Transcript of session follows -----
+          # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
+          v = dscontents[-1]
 
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # Inside of the original message part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
+          if cv = e.match(/\A[>]{3}[ \t]+.+[<]([^ ]+?[@][^ ]+?)[>]\z/)
+            # >>> kijitora@example.org <kijitora@example.org>
+            if v['recipient']
+              # There are multiple recipient addresses in the message body.
+              dscontents << Sisimai::Lhost.DELIVERYSTATUS
+              v = dscontents[-1]
             end
-            rfc822list << e
+            v['recipient'] = cv[1]
+            v['diagnosis'] = ''
+            recipients += 1
           else
-            # Error message part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-
-            #  ----- The following addresses had permanent fatal errors -----
-            #
-            # >>> kijitora@example.org <kijitora@example.org>
-            #
             #  ----- Transcript of session follows -----
             # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
-            v = dscontents[-1]
-
-            if cv = e.match(/\A[>]{3}[ \t]+.+[<]([^ ]+?[@][^ ]+?)[>]\z/)
-              # >>> kijitora@example.org <kijitora@example.org>
-              if v['recipient']
-                # There are multiple recipient addresses in the message body.
-                dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                v = dscontents[-1]
-              end
-              v['recipient'] = cv[1]
-              v['diagnosis'] = ''
-              recipients += 1
-            else
-              #  ----- Transcript of session follows -----
-              # 550 sorry, no mailbox here by that name (#5.1.1 - chkusr)
-              next unless e =~ /\A[0-9A-Za-z]+/
-              next unless v['diagnosis'].empty?
-              v['diagnosis'] = e
-            end
+            next unless e =~ /\A[0-9A-Za-z]+/
+            next unless v['diagnosis'].empty?
+            v['diagnosis'] = e
           end
         end
         return nil unless recipients > 0
@@ -107,8 +84,7 @@ module Sisimai::Lhost
           e.each_key { |a| e[a] ||= '' }
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/amavis.rb

@@ -7,6 +7,7 @@ module Sisimai::Lhost
       require 'sisimai/lhost'
 
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^Content-Type:[ ]text/rfc822-headers|.freeze
       StartingOf = {
         message: ['The message '],
         rfc822:  ['Content-Type: text/rfc822-headers'],
@@ -36,82 +37,57 @@ module Sisimai::Lhost
         permessage = {}     # (Hash) Store values of each Per-Message field
 
         dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        hasdivided = mbody.split("\n")
-        havepassed = ['']
-        rfc822list = []     # (Array) Each line in message/rfc822 part string
-        blanklines = 0      # (Integer) The number of blank lines
+        emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+        bodyslices = emailsteak[0].split("\n")
         readcursor = 0      # (Integer) Points the current cursor position
         recipients = 0      # (Integer) The number of 'Final-Recipient' header
         v = nil
 
-        while e = hasdivided.shift do
-          # Save the current line for the next loop
-          havepassed << e
-          p = havepassed[-2]
+        while e = bodyslices.shift do
+          # Read error messages and delivery status lines from the head of the email
+          # to the previous line of the beginning of the original message.
 
           if readcursor == 0
             # Beginning of the bounce message or message/delivery-status part
-            if e.start_with?(StartingOf[:message][0])
-              readcursor |= Indicators[:deliverystatus]
-              next
-            end
-          end
-
-          if (readcursor & Indicators[:'message-rfc822']) == 0
-            # Beginning of the original message part(message/rfc822)
-            if e == StartingOf[:rfc822][0]
-              readcursor |= Indicators[:'message-rfc822']
-              next
-            end
+            readcursor |= Indicators[:deliverystatus] if e.start_with?(StartingOf[:message][0])
+            next
           end
-
-          if readcursor & Indicators[:'message-rfc822'] > 0
-            # message/rfc822 OR text/rfc822-headers part
-            if e.empty?
-              blanklines += 1
-              break if blanklines > 1
-              next
-            end
-            rfc822list << e
-          else
-            # message/delivery-status part
-            next if (readcursor & Indicators[:deliverystatus]) == 0
-            next if e.empty?
-            next unless f = Sisimai::RFC1894.match(e)
-
-            # "e" matched with any field defined in RFC3464
-            next unless o = Sisimai::RFC1894.field(e)
-            v = dscontents[-1]
-
-            if o[-1] == 'addr'
+          next if (readcursor & Indicators[:deliverystatus]) == 0
+          next if e.empty?
+          next unless f = Sisimai::RFC1894.match(e)
+
+          # "e" matched with any field defined in RFC3464
+          next unless o = Sisimai::RFC1894.field(e)
+          v = dscontents[-1]
+
+          if o[-1] == 'addr'
+            # Final-Recipient: rfc822; kijitora@example.jp
+            # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+            if o[0] == 'final-recipient'
               # Final-Recipient: rfc822; kijitora@example.jp
-              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-              if o[0] == 'final-recipient'
-                # Final-Recipient: rfc822; kijitora@example.jp
-                if v['recipient']
-                  # There are multiple recipient addresses in the message body.
-                  dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                  v = dscontents[-1]
-                end
-                v['recipient'] = o[2]
-                recipients += 1
-              else
-                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                v['alias'] = o[2]
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
               end
-            elsif o[-1] == 'code'
-              # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-              v['spec'] = o[1]
-              v['diagnosis'] = o[2]
+              v['recipient'] = o[2]
+              recipients += 1
             else
-              # Other DSN fields defined in RFC3464
-              next unless fieldtable.key?(o[0])
-              v[fieldtable[o[0]]] = o[2]
-
-              next unless f == 1
-              permessage[fieldtable[o[0]]] = o[2]
+              # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+              v['alias'] = o[2]
             end
-          end # End of message/delivery-status
+          elsif o[-1] == 'code'
+            # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+            v['spec'] = o[1]
+            v['diagnosis'] = o[2]
+          else
+            # Other DSN fields defined in RFC3464
+            next unless fieldtable[o[0]]
+            v[fieldtable[o[0]]] = o[2]
+
+            next unless f == 1
+            permessage[fieldtable[o[0]]] = o[2]
+          end
         end
         return nil unless recipients > 0
 
@@ -123,8 +99,7 @@ module Sisimai::Lhost
           e['agent'] = self.smtpagent
         end
 
-        rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-        return { 'ds' => dscontents, 'rfc822' => rfc822part }
+        return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
       end
 
     end

data/lib/sisimai/lhost/amazonses.rb

@@ -9,9 +9,9 @@ module Sisimai::Lhost
 
       # https://aws.amazon.com/ses/
       Indicators = Sisimai::Lhost.INDICATORS
+      ReBackbone = %r|^content-type:[ ]message/rfc822|.freeze
       StartingOf = {
         message: ['The following message to <', 'An error occurred while trying to deliver the mail'],
-        rfc822:  ['content-type: message/rfc822'],
       }.freeze
       MessagesOf = { 'expired' => ['Delivery expired'] }.freeze
 
@@ -36,17 +36,31 @@ module Sisimai::Lhost
       #                                   part or nil if it failed to parse or
       #                                   the arguments are missing
       def make(mhead, mbody)
+        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
+        recipients = 0  # (Integer) The number of 'Final-Recipient' header
+
         if mbody.start_with?('{')
           # The message body is JSON string
           return nil unless mhead['x-amz-sns-message-id']
           return nil if mhead['x-amz-sns-message-id'].empty?
 
-          hasdivided = mbody.split("\n")
+          # https://docs.aws.amazon.com/en_us/ses/latest/DeveloperGuide/notification-contents.html
+          bouncetype = {
+            'Permanent' => { 'General' => '', 'NoEmail' => '', 'Suppressed' => '' },
+            'Transient' => {
+              'General'            => '',
+              'MailboxFull'        => 'mailboxfull',
+              'MessageTooLarge'    => 'mesgtoobig',
+              'ContentRejected'    => '',
+              'AttachmentRejected' => '',
+            },
+          }.freeze
           jsonstring = ''
           sespayload = nil
           foldedline = false
+          bodyslices = mbody.split("\n")
 
-          while e = hasdivided.shift do
+          while e = bodyslices.shift do
             # Find JSON string from the message body
             next if e.empty?
             break if e == '--'
@@ -88,10 +102,136 @@ module Sisimai::Lhost
             return nil
           end
 
-          return json(sespayload)
+          rfc822head = {}   # (Hash) Check flags for headers in RFC822 part
+          labeltable = {
+            'Bounce'    => 'bouncedRecipients',
+            'Complaint' => 'complainedRecipients',
+          }
+          p = sespayload
+          v = nil
+
+          if %w[Bounce Complaint].index(p['notificationType'])
+            # { "notificationType":"Bounce", "bounce": { "bounceType":"Permanent",...
+            o = p[p['notificationType'].downcase].dup
+            r = o[labeltable[p['notificationType']]] || []
+
+            while e = r.shift do
+              # 'bouncedRecipients' => [ { 'emailAddress' => 'bounce@si...' }, ... ]
+              # 'complainedRecipients' => [ { 'emailAddress' => 'complaint@si...' }, ... ]
+              next unless Sisimai::RFC5322.is_emailaddress(e['emailAddress'])
+
+              v = dscontents[-1]
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
+              end
+              recipients += 1
+              v['recipient'] = e['emailAddress']
+
+              if p['notificationType'] == 'Bounce'
+                # 'bouncedRecipients => [ {
+                #   'emailAddress' => 'bounce@simulator.amazonses.com',
+                #   'action' => 'failed',
+                #   'status' => '5.1.1',
+                #   'diagnosticCode' => 'smtp; 550 5.1.1 user unknown'
+                # }, ... ]
+                v['action'] = e['action']
+                v['status'] = e['status']
+
+                if cv = e['diagnosticCode'].match(/\A(.+?);[ ]*(.+)\z/)
+                  # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                  v['spec'] = cv[1].upcase
+                  v['diagnosis'] = cv[2]
+                else
+                  v['diagnosis'] = e['diagnosticCode']
+                end
+
+                # 'reportingMTA' => 'dsn; a27-23.smtp-out.us-west-2.amazonses.com',
+                if cv = o['reportingMTA'].match(/\Adsn;[ ](.+)\z/) then v['lhost'] = cv[1] end
+
+                if bouncetype[o['bounceType']] &&
+                   bouncetype[o['bounceType']][o['bounceSubType']]
+                  # 'bounce' => {
+                  #       'bounceType' => 'Permanent',
+                  #       'bounceSubType' => 'General'
+                  # },
+                  v['reason'] = bouncetype[o['bounceType']][o['bounceSubType']]
+                end
+              else
+                # 'complainedRecipients' => [ {
+                #   'emailAddress' => 'complaint@simulator.amazonses.com' }, ... ],
+                v['reason'] = 'feedback'
+                v['feedbacktype'] = o['complaintFeedbackType'] || ''
+              end
+
+              v['date'] = o['timestamp'] || p['mail']['timestamp']
+              v['date'].sub!(/[.]\d+Z\z/, '')
+            end
+          elsif p['notificationType'] == 'Delivery'
+            # { "notificationType":"Delivery", "delivery": { ...
+            o = p['delivery'].dup
+            r = o['recipients'] || []
+
+            while e = r.shift do
+              # 'delivery' => {
+              #       'timestamp' => '2016-11-23T12:01:03.512Z',
+              #       'processingTimeMillis' => 3982,
+              #       'reportingMTA' => 'a27-29.smtp-out.us-west-2.amazonses.com',
+              #       'recipients' => [
+              #           'success@simulator.amazonses.com'
+              #       ],
+              #       'smtpResponse' => '250 2.6.0 Message received'
+              #   },
+              next unless Sisimai::RFC5322.is_emailaddress(e)
+
+              v = dscontents[-1]
+              if v['recipient']
+                # There are multiple recipient addresses in the message body.
+                dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                v = dscontents[-1]
+              end
+              recipients += 1
+              v['recipient'] = e
+              v['lhost']     = o['reportingMTA'] || ''
+              v['diagnosis'] = o['smtpResponse'] || ''
+              v['status']    = Sisimai::SMTP::Status.find(v['diagnosis']) || ''
+              v['replycode'] = Sisimai::SMTP::Reply.find(v['diagnosis'])  || ''
+              v['reason']    = 'delivered'
+              v['action']    = 'deliverable'
+
+              v['date'] = o['timestamp'] || p['mail']['timestamp']
+              v['date'].sub!(/[.]\d+Z\z/, '')
+            end
+          else
+            # The value of "notificationType" is not any of "Bounce", "Complaint",
+            # or "Delivery".
+            return nil
+          end
+          return nil unless recipients > 0
+
+          dscontents.each { |e| e['agent'] = self.smtpagent }
+          if p['mail']['headers']
+            # "headersTruncated":false,
+            # "headers":[ { ...
+            p['mail']['headers'].each do |e|
+              # 'headers' => [ { 'name' => 'From', 'value' => 'neko@nyaan.jp' }, ... ],
+              next unless %w[From To Subject Message-ID Date].index(e['name'])
+              rfc822head[e['name'].downcase] = e['value']
+            end
+          end
+
+          unless rfc822head['message-id']
+            # Try to get the value of "Message-Id".
+            if p['mail']['messageId']
+              # 'messageId' => '01010157e48f9b9b-891e9a0e-9c9d-4773-9bfe-608f2ef4756d-000000'
+              rfc822head['message-id'] = p['mail']['messageId']
+            end
+          end
+          return { 'ds' => dscontents, 'rfc822' => rfc822head }
+
         else
           # The message body is an email
-
           # :from    => %r/\AMAILER-DAEMON[@]email[-]bounces[.]amazonses[.]com\z/,
           # :subject => %r/\ADelivery Status Notification [(]Failure[)]\z/,
           return nil if mhead['x-mailer'].to_s.start_with?('Amazon WorkMail')
@@ -105,19 +245,16 @@ module Sisimai::Lhost
           fieldtable = Sisimai::RFC1894.FIELDTABLE
           permessage = {}     # (Hash) Store values of each Per-Message field
 
-          dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-          hasdivided = mbody.split("\n")
-          havepassed = ['']
-          rfc822list = []     # (Array) Each line in message/rfc822 part string
-          blanklines = 0      # (Integer) The number of blank lines
+          emailsteak = Sisimai::RFC5322.fillet(mbody, ReBackbone)
+          bodyslices = emailsteak[0].split("\n")
+          readslices = ['']
           readcursor = 0      # (Integer) Points the current cursor position
-          recipients = 0      # (Integer) The number of 'Final-Recipient' header
           v = nil
 
-          while e = hasdivided.shift do
-            # Save the current line for the next loop
-            havepassed << e
-            p = havepassed[-2]
+          while e = bodyslices.shift do
+            # Read error messages and delivery status lines from the head of the email
+            # to the previous line of the beginning of the original message.
+            readslices << e # Save the current line for the next loop
 
             if readcursor == 0
               # Beginning of the bounce message or message/delivery-status part
@@ -126,69 +263,49 @@ module Sisimai::Lhost
                 next
               end
             end
+            next if (readcursor & Indicators[:deliverystatus]) == 0
+            next if e.empty?
 
-            if (readcursor & Indicators[:'message-rfc822']) == 0
-              # Beginning of the original message part(message/rfc822)
-              if e == StartingOf[:rfc822][0]
-                readcursor |= Indicators[:'message-rfc822']
-                next
-              end
-            end
-
-            if readcursor & Indicators[:'message-rfc822'] > 0
-              # message/rfc822 OR text/rfc822-headers part
-              if e.empty?
-                blanklines += 1
-                break if blanklines > 1
-                next
-              end
-              rfc822list << e
-            else
-              # message/delivery-status part
-              next if (readcursor & Indicators[:deliverystatus]) == 0
-              next if e.empty?
-
-              if f = Sisimai::RFC1894.match(e)
-                # "e" matched with any field defined in RFC3464
-                next unless o = Sisimai::RFC1894.field(e)
-                v = dscontents[-1]
+            if f = Sisimai::RFC1894.match(e)
+              # "e" matched with any field defined in RFC3464
+              next unless o = Sisimai::RFC1894.field(e)
+              v = dscontents[-1]
 
-                if o[-1] == 'addr'
+              if o[-1] == 'addr'
+                # Final-Recipient: rfc822; kijitora@example.jp
+                # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                if o[0] == 'final-recipient'
                   # Final-Recipient: rfc822; kijitora@example.jp
-                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                  if o[0] == 'final-recipient'
-                    # Final-Recipient: rfc822; kijitora@example.jp
-                    if v['recipient']
-                      # There are multiple recipient addresses in the message body.
-                      dscontents << Sisimai::Lhost.DELIVERYSTATUS
-                      v = dscontents[-1]
-                    end
-                    v['recipient'] = o[2]
-                    recipients += 1
-                  else
-                    # X-Actual-Recipient: rfc822; kijitora@example.co.jp
-                    v['alias'] = o[2]
+                  if v['recipient']
+                    # There are multiple recipient addresses in the message body.
+                    dscontents << Sisimai::Lhost.DELIVERYSTATUS
+                    v = dscontents[-1]
                   end
-                elsif o[-1] == 'code'
-                  # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                  v['spec'] = o[1]
-                  v['diagnosis'] = o[2]
+                  v['recipient'] = o[2]
+                  recipients += 1
                 else
-                  # Other DSN fields defined in RFC3464
-                  next unless fieldtable.key?(o[0])
-                  v[fieldtable[o[0]]] = o[2]
-
-                  next unless f == 1
-                  permessage[fieldtable[o[0]]] = o[2]
+                  # X-Actual-Recipient: rfc822; kijitora@example.co.jp
+                  v['alias'] = o[2]
                 end
+              elsif o[-1] == 'code'
+                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
+                v['spec'] = o[1]
+                v['diagnosis'] = o[2]
               else
-                # Continued line of the value of Diagnostic-Code field
-                next unless p.start_with?('Diagnostic-Code:')
-                next unless cv = e.match(/\A[ \t]+(.+)\z/)
-                v['diagnosis'] << ' ' << cv[1]
-                havepassed[-1] = 'Diagnostic-Code: ' << e
+                # Other DSN fields defined in RFC3464
+                next unless fieldtable[o[0]]
+                v[fieldtable[o[0]]] = o[2]
+
+                next unless f == 1
+                permessage[fieldtable[o[0]]] = o[2]
               end
-            end # End of message/delivery-status
+            else
+              # Continued line of the value of Diagnostic-Code field
+              next unless readslices[-2].start_with?('Diagnostic-Code:')
+              next unless cv = e.match(/\A[ \t]+(.+)\z/)
+              v['diagnosis'] << ' ' << cv[1]
+              readslices[-1] = 'Diagnostic-Code: ' << e
+            end
           end
 
           if recipients == 0 && mbody =~ /notificationType/
@@ -228,175 +345,12 @@ module Sisimai::Lhost
               e['reason'] = r
               break
             end
-
           end
 
-          rfc822part = Sisimai::RFC5322.weedout(rfc822list)
-          return { 'ds' => dscontents, 'rfc822' => rfc822part }
+          return { 'ds' => dscontents, 'rfc822' => emailsteak[1] }
         end # END of a parser for email message
-      end # END of def make()
-
-      # @abstract Adapt Amazon SES bounce object for Sisimai::Message format
-      # @param        [Hash] argvs  bounce object(JSON) retrieved from Amazon SNS
-      # @return       [Hash, Nil]   Bounce data list and message/rfc822 part or
-      #                             nil if it failed to parse or the
-      #                             arguments are missing
-      # @since v4.20.0
-      # @until v4.25.5
-      def json(argvs)
-        return nil unless argvs.is_a? Hash
-        return nil if argvs.empty?
-        return nil unless argvs.key?('notificationType')
-
-        # https://docs.aws.amazon.com/en_us/ses/latest/DeveloperGuide/notification-contents.html
-        bouncetype = {
-          'Permanent' => {
-            'General'    => '',
-            'NoEmail'    => '',
-            'Suppressed' => '',
-          },
-          'Transient' => {
-            'General'            => '',
-            'MailboxFull'        => 'mailboxfull',
-            'MessageTooLarge'    => 'mesgtoobig',
-            'ContentRejected'    => '',
-            'AttachmentRejected' => '',
-          },
-        }.freeze
-
-        dscontents = [Sisimai::Lhost.DELIVERYSTATUS]
-        rfc822head = {}   # (Hash) Check flags for headers in RFC822 part
-        recipients = 0    # (Integer) The number of 'Final-Recipient' header
-        labeltable = {
-          'Bounce'    => 'bouncedRecipients',
-          'Complaint' => 'complainedRecipients',
-        }
-        v = nil
-
-        if %w[Bounce Complaint].index(argvs['notificationType'])
-          # { "notificationType":"Bounce", "bounce": { "bounceType":"Permanent",...
-          o = argvs[argvs['notificationType'].downcase].dup
-          r = o[labeltable[argvs['notificationType']]] || []
-
-          while e = r.shift do
-            # 'bouncedRecipients' => [ { 'emailAddress' => 'bounce@si...' }, ... ]
-            # 'complainedRecipients' => [ { 'emailAddress' => 'complaint@si...' }, ... ]
-            next unless Sisimai::RFC5322.is_emailaddress(e['emailAddress'])
-
-            v = dscontents[-1]
-            if v['recipient']
-              # There are multiple recipient addresses in the message body.
-              dscontents << Sisimai::Lhost.DELIVERYSTATUS
-              v = dscontents[-1]
-            end
-            recipients += 1
-            v['recipient'] = e['emailAddress']
-
-            if argvs['notificationType'] == 'Bounce'
-              # 'bouncedRecipients => [ {
-              #   'emailAddress' => 'bounce@simulator.amazonses.com',
-              #   'action' => 'failed',
-              #   'status' => '5.1.1',
-              #   'diagnosticCode' => 'smtp; 550 5.1.1 user unknown'
-              # }, ... ]
-              v['action'] = e['action']
-              v['status'] = e['status']
-
-              if cv = e['diagnosticCode'].match(/\A(.+?);[ ]*(.+)\z/)
-                # Diagnostic-Code: SMTP; 550 5.1.1 <userunknown@example.jp>... User Unknown
-                v['spec'] = cv[1].upcase
-                v['diagnosis'] = cv[2]
-              else
-                v['diagnosis'] = e['diagnosticCode']
-              end
-
-              # 'reportingMTA' => 'dsn; a27-23.smtp-out.us-west-2.amazonses.com',
-              if cv = o['reportingMTA'].match(/\Adsn;[ ](.+)\z/) then v['lhost'] = cv[1] end
-
-              if bouncetype.key?(o['bounceType']) &&
-                 bouncetype[o['bounceType']].key?(o['bounceSubType'])
-                # 'bounce' => {
-                #       'bounceType' => 'Permanent',
-                #       'bounceSubType' => 'General'
-                # },
-                v['reason'] = bouncetype[o['bounceType']][o['bounceSubType']]
-              end
-            else
-              # 'complainedRecipients' => [ {
-              #   'emailAddress' => 'complaint@simulator.amazonses.com' }, ... ],
-              v['reason'] = 'feedback'
-              v['feedbacktype'] = o['complaintFeedbackType'] || ''
-            end
-
-            v['date'] = o['timestamp'] || argvs['mail']['timestamp']
-            v['date'].sub!(/[.]\d+Z\z/, '')
-          end
-        elsif argvs['notificationType'] == 'Delivery'
-          # { "notificationType":"Delivery", "delivery": { ...
-          o = argvs['delivery'].dup
-          r = o['recipients'] || []
-
-          while e = r.shift do
-            # 'delivery' => {
-            #       'timestamp' => '2016-11-23T12:01:03.512Z',
-            #       'processingTimeMillis' => 3982,
-            #       'reportingMTA' => 'a27-29.smtp-out.us-west-2.amazonses.com',
-            #       'recipients' => [
-            #           'success@simulator.amazonses.com'
-            #       ],
-            #       'smtpResponse' => '250 2.6.0 Message received'
-            #   },
-            next unless Sisimai::RFC5322.is_emailaddress(e)
-
-            v = dscontents[-1]
-            if v['recipient']
-              # There are multiple recipient addresses in the message body.
-              dscontents << Sisimai::Lhost.DELIVERYSTATUS
-              v = dscontents[-1]
-            end
-            recipients += 1
-            v['recipient'] = e
-            v['lhost']     = o['reportingMTA'] || ''
-            v['diagnosis'] = o['smtpResponse'] || ''
-            v['status']    = Sisimai::SMTP::Status.find(v['diagnosis']) || ''
-            v['replycode'] = Sisimai::SMTP::Reply.find(v['diagnosis'])  || ''
-            v['reason']    = 'delivered'
-            v['action']    = 'deliverable'
-
-            v['date'] = o['timestamp'] || argvs['mail']['timestamp']
-            v['date'].sub!(/[.]\d+Z\z/, '')
-          end
-        else
-          # The value of "notificationType" is not any of "Bounce", "Complaint",
-          # or "Delivery".
-          return nil
-        end
-        return nil unless recipients > 0
-
-        dscontents.each do |e|
-          e['agent'] = self.smtpagent
-        end
-
-        if argvs['mail']['headers']
-          # "headersTruncated":false,
-          # "headers":[ { ...
-          argvs['mail']['headers'].each do |e|
-            # 'headers' => [ { 'name' => 'From', 'value' => 'neko@nyaan.jp' }, ... ],
-            next unless %w[From To Subject Message-ID Date].index(e['name'])
-            rfc822head[e['name'].downcase] = e['value']
-          end
-        end
-
-        unless rfc822head['message-id']
-          # Try to get the value of "Message-Id".
-          if argvs['mail']['messageId']
-            # 'messageId' => '01010157e48f9b9b-891e9a0e-9c9d-4773-9bfe-608f2ef4756d-000000'
-            rfc822head['message-id'] = argvs['mail']['messageId']
-          end
-        end
-        return { 'ds' => dscontents, 'rfc822' => rfc822head }
-      end
 
+      end # END of def make()
     end
   end
 end