bbk-amqp 1.0.0.82273 → 1.0.0.93643

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bdb4acc4df0ff518a20e9ffea4c4f17728d32116f698d5f688e54932c57a8a1
-  data.tar.gz: bab128573b4283b440c703883d3b3c37a7964411d85ac0462ae2b2f7d0fa5fb6
+  metadata.gz: de0feac4448e84adfdaef342e83e39cd0e0055d68d62dae857e7b003ae77ab0c
+  data.tar.gz: b5319839c4b9cc6869e7ba639451d65e14449bc6b34a8982a37f62a121274898
 SHA512:
-  metadata.gz: 69fdbf711cd3a6624c797fe7517af3fbca9ed4ac9eba0faabe8556dfd74d8db72b92975a9da3299a3b63586f040256e99c97a9dff10782b354f5b2df559d8271
-  data.tar.gz: faa15d700ba3147c593584aa83a8e3e020074da41afd1d8e1d01f228ca8dc0b83c07ba43f1512d1b24948df0c8fd4eea384b584875f40e7fae699ff11a5cc532
+  metadata.gz: 6c844782733ee4612b2aa6f75714d6965c8a6ac71f917b40abd8f6b83fa8cda762357dc1a0367facb8a55e336be9d31ed1e5fc561a5c232ddc7a926c1af69cdf
+  data.tar.gz: 247d5f7e190c3e946a5d31c170ac50c9bc2ff199d3a93a680a22d1aa7b665e38724f25f617c55fa123ae901f254c1e47f65a525971155c0a7da851e7b989d26f

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.0.0.82273)
-      activesupport (~> 6.0)
+    bbk-amqp (1.0.0.93643)
+      activesupport (>= 6.0)
       bbk-utils (> 1.0.1)
       bunny (>= 2.19.0)
       oj
@@ -63,7 +63,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     minitest (5.15.0)
-    oj (3.13.11)
+    oj (3.13.20)
     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,7 +73,7 @@ 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] = client_name if message.headers[:user_id].blank?
         send_message(exchange, routing_key, message.payload, properties)

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,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: bbk-amqp
 version: !ruby/object:Gem::Version
-  version: 1.0.0.82273
+  version: 1.0.0.93643
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -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