bbk-app 1.0.0.141716 → 1.1.0.199383

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddd13011788fd70fb38bb3d91d436cea5a602d2d74be9780759a6a8df4378b78
-  data.tar.gz: 2819543d3971764f12bcca9554a18ac715477815a27d539bd6f942e3263e45c5
+  metadata.gz: cfb0384af4545b59b59a7de1f309e71e895bf2af47ce0526bcf0265b54606c60
+  data.tar.gz: 7fb2b293747d66a4d818bacf32a8fb72f5c48e48f7937d1931e4c2e73472cdc1
 SHA512:
-  metadata.gz: f07b3488745b25b86e82e2472de8678e05f0772c805a2e9e0d0faab087620ea90e6f29e7a65911955a51925c01aed4adc422a353d716cef59070a33365670706
-  data.tar.gz: 8511a776aa500dfa4fdec5638d04070c7bd869227f413e3b0fdcc30b8d33ab9b272eced03c3b3a79f289c28ce9916c5baccddfcbf0be6b595b3a787fd569bf39
+  metadata.gz: 17de92ea6e1492d94b66ad4af0efa83dc8ea43f4d3591250f39ae379323978e33da4541093b0d89451af71bb4e3bdfe820a50d30ebf938ad6bfc37ac07b679ca
+  data.tar.gz: '080cff24d3c3521d4c563433e001f6945571eb678849c2549ccc4a23148bd196e1f45164081e3a9c7dc295890b2552f5c960fb200cc3678fe797df11f352eff6'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-app (1.0.0.141716)
+    bbk-app (1.1.0.199383)
       activesupport
       bbk-utils (> 1.0.1)
       timeouter
@@ -29,7 +29,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bbk-utils (1.0.1.136047)
+    bbk-utils (1.0.1.147183)
       activesupport (>= 6.0)
       russian
     bunny (2.19.0)
@@ -122,7 +122,7 @@ GEM
       virtus (~> 1.0)
     russian (0.6.0)
       i18n (>= 0.5.0)
-    set (1.0.2)
+    set (1.0.3)
     sexp_processor (4.16.0)
     simplecov (0.21.2)
       docile (~> 1.1)

data/lib/bbk/app/dispatcher/result.rb

@@ -13,6 +13,14 @@ module BBK
           @message = message
         end
 
+        def deconstruct
+          [route.to_s, message]
+        end
+
+        def deconstruct_keys(_keys)
+          {route: route.to_s, message: message}
+        end
+
       end
     end
   end

data/lib/bbk/app/dispatcher.rb

@@ -10,6 +10,8 @@ require 'bbk/utils/proxy_logger'
 module BBK
   module App
 
+    class InvalidAnswersMessagesCountError < StandardError; end
+
     class SimplePoolFactory
 
       def self.call(pool_size, queue_size)
@@ -32,7 +34,8 @@ module BBK
       attr_accessor :force_quit
       attr_reader :consumers, :publishers, :observer, :middlewares, :logger
 
-      ANSWER_DOMAIN = 'answer'
+      ANSWER_DOMAIN = 'answer'.freeze
+      DEFAULT_PROTOCOL = 'default'.freeze
 
       def initialize(observer, pool_size: 3, logger: BBK::App.logger, pool_factory: SimplePoolFactory, stream_strategy: QueueStreamStrategy)
         @observer = observer
@@ -52,9 +55,20 @@ module BBK
       end
 
       def register_publisher(publisher)
+        raise "Publisher support #{DEFAULT_PROTOCOL}" if publisher.protocols.include?(DEFAULT_PROTOCOL)
         publishers << publisher
       end
 
+      # set default publisher for results with empty scheme or DEFAULT_PROTOCOL scheme
+      def default_publisher=(publisher)
+        @default_publisher = publisher
+      end
+
+      # get default publisher
+      def default_publisher
+        @default_publisher || (publishers.size == 1 ? publishers.first : nil)
+      end
+
       def register_middleware(middleware)
         middlewares << middleware
       end
@@ -122,18 +136,19 @@ module BBK
         end
       end
 
-      protected
+      # process one message and sending existed results messages
+      def process(message)
+        results = execute_message(message)
+        logger.debug "There are #{results.count} results to send from #{message.headers[:message_id]}..."
+        send_results(message, results).value
+      rescue StandardError => e
+        logger.error "Failed processing message: #{e.inspect}"
+        ActiveSupport::Notifications.instrument 'dispatcher.exception', msg: message, exception: e
+        message.nack(error: e)
+        close if force_quit
+      end
 
-        def process(message)
-          results = execute_message(message)
-          logger.debug "There are #{results.count} results to send from #{message.headers[:message_id]}..."
-          send_results(message, results).value
-        rescue StandardError => e
-          logger.error "Failed processing message: #{e.inspect}"
-          ActiveSupport::Notifications.instrument 'dispatcher.exception', msg: message, exception: e
-          message.nack(error: e)
-          close if force_quit
-        end
+      protected
 
         def process_message(message)
           matched, processor = find_processor(message)
@@ -176,8 +191,12 @@ module BBK
         def send_results(incoming, results)
           message_id = incoming.headers[:message_id]
 
-          answer = results.find {|msg| msg.route.domain == ANSWER_DOMAIN }
-          Concurrent::Promises.zip_futures(*results.map do |result|
+          answers, sended_messages = results.partition { _1.route.domain == ANSWER_DOMAIN }
+          # allowed only one answer message
+          raise InvalidAnswersMessagesCountError.new("Get #{asnwers.size} on processing message with id=#{message_id}") if answers.size > 1
+          
+          answer = answers.first
+          Concurrent::Promises.zip_futures(*sended_messages.map do |result|
                                              publish_result(result)
                                            end).then do |_successes|
             incoming.ack(answer: answer)
@@ -203,6 +222,10 @@ module BBK
           route = result.route
           logger.debug "Publish result to #{route} ..."
           publisher = publishers.find {|pub| pub.protocols.include?(route.scheme) }
+          if route.scheme.nil? || route.scheme == DEFAULT_PROTOCOL
+            logger.debug "Use default publisher for result with route=#{route}"
+            publisher = default_publisher
+          end
           raise "Not found publisher for scheme #{route.scheme}" if publisher.nil?
 
           # return Concurrent::Promises.resolvable_future

data/lib/bbk/app/version.rb

@@ -1,7 +1,7 @@
 module BBK
   module App
 
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-app
 version: !ruby/object:Gem::Version
-  version: 1.0.0.141716
+  version: 1.1.0.199383
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Classes for building services based on BBK stack