bbk-app 1.1.3.334031 → 1.1.4.345154

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2cf194e273e7b90cb1b547aba33d10561b172ec445882c79121d7ced7136c0e
-  data.tar.gz: 1539c01f72926b962f0ca84e0a726ea6e2bf1a78d6cb7674755ffdf02cadb27d
+  metadata.gz: 2d8e2d07476d0e9a71ffbc2b121ce3c322ce266fac70cbb0f3067616072934f4
+  data.tar.gz: 1b6ae740fbac59dcbd3e8599e7d7890ef90cd5f1c9c21303e96639d336050b58
 SHA512:
-  metadata.gz: 4a46fc8f905a492b112d7975c11243296d267b5c6d03b90914fdd01ae3e9bc9d78612210e64ab554f9b5a0b8ba65ee9180c4862c40ae0cc34614763436255c37
-  data.tar.gz: 4d8e0b8283c57392fd8cecf862f9d0961d787522aeea2af22d13d20e4744bf1bd4a3a2280f3430bbf9409a1860da1027e33a364c233435bb6944fbdfc90877b6
+  metadata.gz: c87da2655df84a605253b25e151773419adf0f3484f39e9f0f61c6ecbc5c0e84afad9003302d6f52ef7f1f68cbe113557abf170c0ee6d47746f8aaada1e5c0a3
+  data.tar.gz: 29818a7ca1faac33dad799731ed619cbb9095aceff39e1109af7cc03a055594ae24d876b319498855ca0b854af26d06c636067f0d5a6f15f9c62d4f7a64e47d1

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    bbk-app (1.1.3.334031)
-      activesupport (>= 6.0)
+    bbk-app (1.1.4)
+      activesupport (~> 7.1)
       bbk-utils (> 1.0.1)
       oj
       timeouter
@@ -10,17 +10,24 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activerecord (6.1.4.4)
-      activemodel (= 6.1.4.4)
-      activesupport (= 6.1.4.4)
-    activesupport (6.1.4.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activemodel (7.2.3)
+      activesupport (= 7.2.3)
+    activerecord (7.2.3)
+      activemodel (= 7.2.3)
+      activesupport (= 7.2.3)
+      timeout (>= 0.4.0)
+    activesupport (7.2.3)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     amq-protocol (2.3.2)
@@ -30,9 +37,11 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    base64 (0.3.0)
     bbk-utils (1.0.1.147183)
       activesupport (>= 6.0)
       russian
+    benchmark (0.5.0)
     bigdecimal (3.3.1)
     bunny (2.19.0)
       amq-protocol (~> 2.3, >= 2.3.1)
@@ -42,12 +51,19 @@ GEM
     byebug (11.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.9)
-    database_cleaner (1.99.0)
+    concurrent-ruby (1.3.5)
+    connection_pool (3.0.1)
+    database_cleaner (2.1.0)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.2.2)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0)
+    database_cleaner-core (2.0.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
+    drb (2.2.3)
     equalizer (0.0.11)
     erubis (2.7.0)
     faker (2.19.0)
@@ -61,15 +77,16 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.8)
-    i18n (1.8.11)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     kwalify (0.7.2)
     launchy (2.5.0)
       addressable (~> 2.7)
-    mini_portile2 (2.8.8)
-    minitest (5.15.0)
-    oj (3.16.11)
+    logger (1.7.0)
+    mini_portile2 (2.8.9)
+    minitest (5.26.2)
+    oj (3.16.13)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     ostruct (0.6.3)
@@ -129,6 +146,7 @@ GEM
       virtus (~> 1.0)
     russian (0.6.0)
       i18n (>= 0.5.0)
+    securerandom (0.4.1)
     set (1.1.0)
     sexp_processor (4.16.0)
     simplecov (0.21.2)
@@ -144,15 +162,17 @@ GEM
     sorted_set (1.0.3)
       rbtree
       set (~> 1.0)
-    sqlite3 (1.7.3)
+    sqlite3 (2.0.4)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (1.7.3-x86_64-linux)
+    sqlite3 (2.0.4-x86_64-linux-gnu)
+    sqlite3 (2.0.4-x86_64-linux-musl)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thread_safe (0.3.6)
+    timeout (0.4.4)
     timeouter (0.1.3.38794)
     tty-which (0.4.2)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     virtus (1.0.5)
@@ -160,7 +180,6 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby
@@ -168,12 +187,12 @@ PLATFORMS
   x86_64-linux-musl
 
 DEPENDENCIES
-  activerecord (~> 6.0)
+  activerecord (~> 7.1)
   bbk-app!
   bundler (~> 2.0)
   bunny-mock (~> 1.7.0)
   byebug
-  database_cleaner (~> 1.7)
+  database_cleaner (~> 2.1.0)
   faker (~> 2)
   rake (~> 12.0)
   rspec (~> 3.0)
@@ -182,7 +201,7 @@ DEPENDENCIES
   rubycritic
   simplecov
   simplecov-console
-  sqlite3 (~> 1.4)
+  sqlite3 (~> 2.0.0)
 
 BUNDLED WITH
    2.2.33

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

@@ -0,0 +1,49 @@
+require 'bbk/app/dispatcher/message_stream'
+
+module BBK
+  module App
+    class Dispatcher
+      class DirectStreamStrategy
+
+        def initialize(pool, logger:)
+          @pool = pool
+          @logger = logger
+          @stopped = false
+        end
+
+        def run(consumers, &block)
+          @block = block
+          @unblocker = Queue.new
+
+          consumers.each {|cons| cons.run(self) }
+          @pool.wait_for_termination(0)
+
+          begin
+            @pool.shutdown
+          rescue StandardError
+            nil
+          end
+          @pool.kill unless @pool.wait_for_termination(@stop_queue_timeout)
+        ensure
+          @unblocker.push(:ok)
+        end
+
+        def push(message)
+          @logger.debug "[#{self.class}] Consumed message #{message.headers}"
+          @pool.post(message, &@block) unless @stopped
+        end
+        alias << push
+
+        def stop(timeout = 5)
+          @stopped = true
+          @stop_queue_timeout = timeout
+
+          @pool.shutdown rescue nil
+          @unblocker.pop
+        end
+
+      end
+    end
+  end
+end
+

data/lib/bbk/app/dispatcher.rb

@@ -3,6 +3,7 @@ require 'bbk/app/thread_pool'
 require 'bbk/app/dispatcher/message_stream'
 require 'bbk/app/dispatcher/message'
 require 'bbk/app/dispatcher/queue_stream_strategy'
+require 'bbk/app/dispatcher/direct_stream_strategy'
 require 'bbk/app/dispatcher/result'
 require 'bbk/app/dispatcher/route'
 require 'bbk/utils/proxy_logger'
@@ -89,7 +90,7 @@ module BBK
       # 3. дождаться обработки всего в очереди или таймаут
       # 4. остановить потоки
       # 5. остановить паблишеры
-      def close(_timeout = 5)
+      def close(timeout = 5)
         ActiveSupport::Notifications.instrument 'dispatcher.close', dispatcher: self
         consumers.each do |cons|
           begin
@@ -100,7 +101,7 @@ module BBK
           end
         end
 
-        @stream_strategy&.stop(5)
+        @stream_strategy&.stop(timeout)
 
         consumers.each do |cons|
           begin

data/lib/bbk/app/version.rb

@@ -1,7 +1,7 @@
 module BBK
   module App
 
-    VERSION = '1.1.3'
+    VERSION = '1.1.4'.freeze
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-app
 version: !ruby/object:Gem::Version
-  version: 1.1.3.334031
+  version: 1.1.4.345154
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-29 00:00:00.000000000 Z
+date: 2025-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -70,14 +70,14 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -276,6 +276,7 @@ files:
 - bin/setup
 - lib/bbk/app.rb
 - lib/bbk/app/dispatcher.rb
+- lib/bbk/app/dispatcher/direct_stream_strategy.rb
 - lib/bbk/app/dispatcher/message.rb
 - lib/bbk/app/dispatcher/message_stream.rb
 - lib/bbk/app/dispatcher/queue_stream_strategy.rb