bbk-amqp 1.1.2.334069 → 1.1.2.352683

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89b2a8645a01693334105b874e03019e37e3b2705db0fce6ae37190accc9dcc
-  data.tar.gz: 17bd0d7d1c3e5d856f5741eed1d54c396bc0a68d4a18919f19307de9d5fcfc92
+  metadata.gz: cf4525f94f1782017c8fcf0241e8fd830f43aa9ce7e1c5ef259fafddbb2841d7
+  data.tar.gz: 04cdf7a6f6dc948678ba0001be3a42582028fce84eda4620e89ce716ab9865b2
 SHA512:
-  metadata.gz: a8f1d0ebe2357c59361512d4cef837f0596ee0493a6452928edab033e87cd0c1080a1f729e80323d545a096a300040c5829bd0dc161e844aa1acc05c2c562b8f
-  data.tar.gz: ece706eb26b110d8b136cbedcb4f2d9d5641141f01fecd4551cf01ba78de6fa96667eecb1a5fc40b5072843d4ff6a50127a6b103b8adec7e09b39f837be6e23a
+  metadata.gz: 000331216e9d69a72d87cd8efa7e76191c1ff38989622b0f826352199a5e59d29047de6326b668b6d9e4296badf5e772f40bd4f3e5ec211744013b9273d4ef43
+  data.tar.gz: c5392a4a4fa5bca8f09b51caac120d6bcfa769fb37edeb982ea6c5496ccf0c126aa910daeb7a51ba6ddaf1adb973f9530b19a027e6ea7de348392206e87f5f37

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-amqp (1.1.2.334069)
+    bbk-amqp (1.1.2.352683)
       activesupport (>= 6.0)
       bbk-app (>= 1.1.1.273338)
       bbk-utils (> 1.0.1)
@@ -34,17 +34,17 @@ GEM
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
     base64 (0.3.0)
-    bbk-app (1.1.3.334031)
+    bbk-app (1.1.4.345715)
       activesupport (>= 6.0)
       bbk-utils (> 1.0.1)
       oj
       timeouter
-    bbk-utils (1.1.2.304819)
+    bbk-utils (1.1.4.347221)
       activesupport (>= 7.0)
       russian
       securerandom (~> 0.3.2)
     benchmark (0.5.0)
-    bigdecimal (3.3.1)
+    bigdecimal (4.0.1)
     bunny (2.23.0)
       amq-protocol (~> 2.3, >= 2.3.1)
       sorted_set (~> 1, >= 1.0.2)
@@ -53,8 +53,8 @@ GEM
     byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.4)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.1)
@@ -71,16 +71,16 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     kwalify (0.7.2)
     launchy (2.5.0)
       addressable (~> 2.7)
     logger (1.7.0)
-    minitest (5.26.0)
+    minitest (5.26.1)
     mutex_m (0.3.0)
-    oj (3.16.11)
+    oj (3.16.13)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     ostruct (0.6.3)

data/lib/bbk/amqp/message.rb

@@ -47,6 +47,15 @@ module BBK
         "#<#{self.class.name} @consumer=#{consumer.class.name}, @delivery_info=#{delivery_info.except(:message_consumer).inspect}, @headers=#{headers.inspect}, @properties=#{@properties.inspect}>"
       end
 
+      def marshal_dump
+        [@properties] + super
+      end
+    
+      def marshal_load(array)
+        @properties, *parent_attributes = array
+        super(parent_attributes)
+      end
+
     end
   end
 end

data/lib/bbk/amqp/publisher.rb

@@ -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
 
@@ -139,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")}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-amqp
 version: !ruby/object:Gem::Version
-  version: 1.1.2.334069
+  version: 1.1.2.352683
 platform: ruby
 authors:
 - Samoylenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-29 00:00:00.000000000 Z
+date: 2026-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport