bbk-amqp 1.1.1.273631 → 1.1.2.342510

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44afc21df5b75cf7ae84d54dc4b1d51aa5285a7dcdb34df7385db07f3aa31fa4
-  data.tar.gz: 5bf40ad9bbdc37d1f73b87e5fe2ef2fda926c57cf55c9274488f527ab72192fd
+  metadata.gz: bd18edb0b3b8f08ef5f14ad42210636abc623e61a00a18ff7197a671b0c2f2b8
+  data.tar.gz: 1d05f661df144b28ec0eaedd5144331d767b2b4d2b3e8345567bd29ff6ca0bcc
 SHA512:
-  metadata.gz: 4162b03dd540b4f4085c8f2843c8508c0f253cb34741acfdf5edad4190b4c22e5d3e91a598882228ae065e32b1e7f0e181ae904663dacae0cc14a1e9f4581af6
-  data.tar.gz: 37ec05d2e9c415cc5194a986f058b1ad1cdc8174b7f5d147c6d81b6fc062bfc844e5475aacc1b7bf965f44bf547eb8d1c23fa732b7cfa249815b87beb7ef14b8
+  metadata.gz: d19ee7bdea5510d9469237327015a14a21ca2344ccb39395d9050869d92a5c1287499290680f1e4ef795e8e9aa2b677ea089c4b8106455ce45e3fac4a8035c07
+  data.tar.gz: 6a3ed0fa985e35c57c059876e079c1d05062d87544b2179584bbdf7aeb848f95009920fbe16890697f0d676257f2c1c906fe256225b9e2b7da737deeebf3ccc3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.1.1.273631)
+    bbk-amqp (1.1.2.342510)
       activesupport (>= 6.0)
       bbk-app (>= 1.1.1.273338)
       bbk-utils (> 1.0.1)
@@ -11,7 +11,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.5)
+    activesupport (7.1.6)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -33,17 +33,18 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    base64 (0.2.0)
-    bbk-app (1.1.1.273627)
+    base64 (0.3.0)
+    bbk-app (1.1.3.335065)
       activesupport (>= 6.0)
       bbk-utils (> 1.0.1)
       oj
       timeouter
-    bbk-utils (1.1.0.273317)
+    bbk-utils (1.1.2.304819)
       activesupport (>= 7.0)
       russian
-    benchmark (0.4.0)
-    bigdecimal (3.1.8)
+      securerandom (~> 0.3.2)
+    benchmark (0.5.0)
+    bigdecimal (3.3.1)
     bunny (2.23.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
@@ -52,13 +53,13 @@ GEM
     byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.3.4)
-    connection_pool (2.4.1)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.1)
     docile (1.4.0)
-    drb (2.2.1)
+    drb (2.2.3)
     equalizer (0.0.11)
     erubis (2.7.0)
     flay (2.12.1)
@@ -70,19 +71,19 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     kwalify (0.7.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    logger (1.6.1)
-    minitest (5.25.1)
-    mutex_m (0.2.0)
-    oj (3.16.7)
+    logger (1.7.0)
+    minitest (5.26.1)
+    mutex_m (0.3.0)
+    oj (3.16.12)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     parallel (1.26.3)
     parser (3.0.3.2)
       ast (~> 2.4.1)

data/lib/bbk/amqp/publisher.rb

@@ -8,7 +8,7 @@ module BBK
     # Publisher send amqp messages
     class Publisher
 
-      HEADER_PROP_FIELDS = %i[message_id reply_to correlation_id].freeze
+      HEADER_PROP_FIELDS = %i[message_id reply_to correlation_id, timestamp].freeze
       PROTOCOLS = %w[mq amqp amqps].freeze
 
       class PublishedMessage
@@ -22,6 +22,21 @@ module BBK
 
       end
 
+      # Исключение используемое для reject промиса - так удобнее в рамках работы с ними (проще вернуть исключение, иначе если вернуть hash то будет считать что это множество исключений)
+      class ReturnError < StandardError
+
+        attr_reader :exchange, :basic_return, :properties, :body
+
+        def initialize(exchange:, basic_return:, properties: , body: , **kwargs)
+          @exchange = exchange
+          @basic_return = basic_return
+          @properties = properties
+          @body = body
+          super("Error on public message(headers=#{properties[:headers]}) to exchange(#{exchange.name}): #{basic_return}")
+        end
+
+      end
+
 
       attr_reader :connection, :domains, :logger, :channel, :ack_map, :sended_messages, :channel
 
@@ -79,6 +94,7 @@ module BBK
       # @param exchange [String] exchange for sending message
       # @param options [Hash] message properties
       def publish_message(routing_key, message, exchange:, options: {})
+        message.headers[:timestamp] ||= Time.now.to_i
         logger.debug "Try publish message #{message.headers.inspect}"
         properties = {
           persistent:  true,
@@ -138,7 +154,7 @@ module BBK
           logger.info "Message with message_id #{message_id} returned #{basic_return.inspect}"
           ack_id, = ack_map.each_pair.find {|_, msg_id| msg_id == message_id }
 
-          sended_messages.delete(ack_id)&.reject(args) if ack_map.delete(ack_id)
+          sended_messages.delete(ack_id)&.reject(ReturnError.new(**args)) if ack_map.delete(ack_id)
         rescue StandardError => e
           # TODO: возможно стоит попробовать почистить ack_map и sended_messages
           logger.error "[CRITICAL]: #{e.inspect}.\n#{e.backtrace.first(10).join("\n")}"

data/lib/bbk/amqp/version.rb

@@ -3,7 +3,7 @@
 module BBK
   module AMQP
 
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-amqp
 version: !ruby/object:Gem::Version
-  version: 1.1.1.273631
+  version: 1.1.2.342510
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-19 00:00:00.000000000 Z
+date: 2025-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport