bbk-amqp 1.0.0.82260 → 1.0.0.92190

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f79016d5cab4da9644abbb93ad71897c24a93a473bd21cf223ea3fd6eebaa7d
-  data.tar.gz: bcbcf9d71e111c5b6a8c9efe48ead69a46d0804890b6601be32571a57ee926d3
+  metadata.gz: afd08dd73c8fd2b53d6a27a01363edc0925d57839de9734f15d7ab892276a43b
+  data.tar.gz: 132d7b81a2874a9ba84596ec3b06a8932610f54ac052c731235c5d0855d0428a
 SHA512:
-  metadata.gz: edcd402fc303d9e9fdd8c84c0b06a9b17a11da21fd662955c8ae5664a8a5c6bd1d7669380129d435a8ecc17f607ab6ef40eee25690e4904bb54db29c1fac3197
-  data.tar.gz: 7fad342cafc572b1d747ae63db622b8b9a7db8fa880542b56a5628e9390316c959d187299eb2a5216053441251b40508554023e48896e7b1f608cbb74f51050c
+  metadata.gz: 7317bf1dd97e942523bf211bbd17a69e9d71d1402c59ace409c957a8d8b83b086761c0b2e3685d2d00578090d7ec2160cdebf4ce28cffe259333902fa8129225
+  data.tar.gz: 4bf82f34f60b7acda061a2d5787fb28268f60b8e57a319a4ac85d9d76acde5034a416c6e62748d5260728468f709d8d96c29c18a47a610b9c64bd3e3b06bd3b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.0.0.82260)
+    bbk-amqp (1.0.0.92190)
       activesupport (~> 6.0)
       bbk-utils (> 1.0.1)
       bunny (>= 2.19.0)
@@ -63,7 +63,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     minitest (5.15.0)
-    oj (3.13.11)
+    oj (3.13.19)
     parser (3.0.3.2)
       ast (~> 2.4.1)
     path_expander (1.1.0)

data/lib/bbk/amqp/message.rb

@@ -45,6 +45,10 @@ module BBK
         consumer.nack(self, *args, error: error, **kwargs)
       end
 
+      def clone
+        self.class.new(consumer, delivery_info, properties, body)
+      end
+
     end
   end
 end

data/lib/bbk/amqp/publisher.rb

@@ -73,13 +73,9 @@ module BBK
           routing_key: routing_key,
           headers:     message.headers,
           # user_id:     client_name,
-          **message.headers.select {|k| HEADER_PROP_FIELDS.include? k }.compact
+          **message.headers.select {|k| HEADER_PROP_FIELDS.include?(k.to_sym) }.compact
         }.merge(options).symbolize_keys
-        properties[:user_id] = if (user_id = message.headers[:user_id]).present?  
-          user_id
-        else
-          properties[:headers][:user_id] = client_name
-        end
+        properties[:user_id] = client_name if message.headers[:user_id].blank?
         send_message(exchange, routing_key, message.payload, properties)
       end
 

data/lib/bbk/amqp/rejection_policies/republish.rb

@@ -0,0 +1,41 @@
+module BBK
+  module AMQP
+    module RejectionPolicies
+      class Republish
+
+        REPUBLISH_COUNTER_KEY = 'x-republish-count'.freeze
+
+        attr_reader :logger
+
+        def initialize(publisher, logger: BBK::Utils::Logger.default)
+          @publisher = publisher
+          @logger = ActiveSupport::TaggedLogging.new(logger).tagged(self.class.name)
+        end
+
+        def call(message, error)
+          if message.delivery_info[:redelivered] || message.headers.key?(REPUBLISH_COUNTER_KEY)
+            republish_message(message, error)
+          else
+            requeue_message(message, error)
+          end
+        end
+
+        def requeue_message(message, error)
+          logger.warn "Requeue message #{message.headers[:type]}[#{message.headers[:message_id]}] delivery tag: #{message.delivery_info[:delivery_tag].to_i}. Error: #{error.inspect}"
+          message.delivery_info[:channel].reject message.delivery_info[:delivery_tag], true
+        end
+
+        def republish_message(message, error)
+          logger.warn "Republish message #{message.headers[:type]}[#{message.headers[:message_id]}]. Error: #{error.inspect}"
+          msg = message.clone
+          msg.headers[REPUBLISH_COUNTER_KEY] = msg.headers.fetch(REPUBLISH_COUNTER_KEY, 0).to_i + 1
+          @publisher.publish_message(msg.delivery_info[:queue], msg, exchange: '').value!
+          message.ack
+        end
+
+
+      end
+    end
+  end
+end
+

data/lib/bbk/amqp.rb

@@ -15,6 +15,7 @@ require 'bbk/amqp/domains/exchange'
 require 'bbk/amqp/domains/by_block'
 require 'bbk/amqp/rejection_policies/reject'
 require 'bbk/amqp/rejection_policies/requeue'
+require 'bbk/amqp/rejection_policies/republish'
 require_relative 'bunny_patch'
 
 

data/sig/bbk/amqp/message.rbs

@@ -6,6 +6,7 @@ module BBK
       # def nack: (*untyped, ?error: untyped, **untyped) -> void
 
       def initialize: (BBK::App::Dispatcher::_Consumer, untyped delivery_info, Hash[String|Symbol, untyped] properties, String? body) -> void
+      def clone: -> Message
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-amqp
 version: !ruby/object:Gem::Version
-  version: 1.0.0.82260
+  version: 1.0.0.92190
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -212,6 +212,7 @@ files:
 - lib/bbk/amqp/message.rb
 - lib/bbk/amqp/publisher.rb
 - lib/bbk/amqp/rejection_policies/reject.rb
+- lib/bbk/amqp/rejection_policies/republish.rb
 - lib/bbk/amqp/rejection_policies/requeue.rb
 - lib/bbk/amqp/route_info.rb
 - lib/bbk/amqp/spec.rb