splitclient-rb 7.1.0.pre.rc3-java → 7.1.0.pre.rc4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c75816a4a2e0708abbf38abc2c72924c6d1068c
-  data.tar.gz: dab65344398758a3fea78f2bb6b77f3370d5503e
+  metadata.gz: 3773978239a090c92def574c430f8b4fae75b8aa
+  data.tar.gz: ddf8b97ce2c9b5f429a2e69d0b20545067a59e3e
 SHA512:
-  metadata.gz: b388ef6f01412098f6931b0ea926eaf11bece7a9cb39ea2debee3a392b91c275e7657e22a12c3fd6c7f75db481a3a464217f17e12ea69f5383bf55da4ecc9a88
-  data.tar.gz: 7fe83812cea04eb70909eeb282be4030ccf45894d8bff68e7470c95c249ec45beceb9cb4add420243cc062d05772e39ce885b780a45324170008d4204fc5057f
+  metadata.gz: 0fedca3dbb628ca64f46f72b516e7ab8add756746b10bf95de2579b2f007f700e5c4c8db7c2a326034b2ccc528fb4cdf3274543301167cad9b7f0c2bcbc4f9b6
+  data.tar.gz: a2ea5d71f11ddef491e89b168b837ebe3a692f83b6664ba7dee913f036b13b7947bcc821d1f8f9c266fddecdeb999801d131d711acbde6c10a14a851cb1eb8ff

data/.rubocop.yml

@@ -14,6 +14,7 @@ Metrics/LineLength:
   Max: 130
   Exclude:
     - spec/sse/**/*
+    - spec/integrations/**/*
 
 Metrics/BlockLength:
   Exclude:

data/lib/splitclient-rb/cache/fetchers/segment_fetcher.rb

@@ -10,6 +10,7 @@ module SplitIoClient
           @metrics = metrics
           @config = config
           @sdk_blocker = sdk_blocker
+          @semaphore = Mutex.new
         end
 
         def call
@@ -27,15 +28,17 @@ module SplitIoClient
         end
 
         def fetch_segment(name)
-          segments_api.fetch_segments_by_names([name])
+          @semaphore.synchronize { segments_api.fetch_segments_by_names([name]) }
         rescue StandardError => error
           @config.log_found_exception(__method__.to_s, error)
         end
 
         def fetch_segments
-          segments_api.fetch_segments_by_names(@segments_repository.used_segment_names)
+          @semaphore.synchronize do
+            segments_api.fetch_segments_by_names(@segments_repository.used_segment_names)
 
-          @sdk_blocker.segments_ready!
+            @sdk_blocker.segments_ready!
+          end
         rescue StandardError => error
           @config.log_found_exception(__method__.to_s, error)
         end

data/lib/splitclient-rb/cache/fetchers/split_fetcher.rb

@@ -10,6 +10,7 @@ module SplitIoClient
           @metrics = metrics
           @config = config
           @sdk_blocker = sdk_blocker
+          @semaphore = Mutex.new
         end
 
         def call
@@ -27,18 +28,20 @@ module SplitIoClient
         end
 
         def fetch_splits
-          data = splits_since(@splits_repository.get_change_number)
+          @semaphore.synchronize do
+            data = splits_since(@splits_repository.get_change_number)
 
-          data[:splits] && data[:splits].each do |split|
-            add_split_unless_archived(split)
-          end
+            data[:splits] && data[:splits].each do |split|
+              add_split_unless_archived(split)
+            end
 
-          @splits_repository.set_segment_names(data[:segment_names])
-          @splits_repository.set_change_number(data[:till])
+            @splits_repository.set_segment_names(data[:segment_names])
+            @splits_repository.set_change_number(data[:till])
 
-          @config.logger.debug("segments seen(#{data[:segment_names].length}): #{data[:segment_names].to_a}") if @config.debug_enabled
+            @config.logger.debug("segments seen(#{data[:segment_names].length}): #{data[:segment_names].to_a}") if @config.debug_enabled
 
-          @sdk_blocker.splits_ready!
+            @sdk_blocker.splits_ready!
+          end
         rescue StandardError => error
           @config.log_found_exception(__method__.to_s, error)
         end

data/lib/splitclient-rb/engine/push_manager.rb

@@ -14,6 +14,7 @@ module SplitIoClient
       def start_sse
         response = @auth_api_client.authenticate(@api_key)
 
+        @config.logger.debug("Auth service response push_enabled: #{response[:push_enabled]}")
         if response[:push_enabled]
           @sse_handler.start(response[:token], response[:channels])
           schedule_next_token_refresh(response[:exp])

data/lib/splitclient-rb/engine/sync_manager.rb

@@ -19,6 +19,7 @@ module SplitIoClient
         @synchronizer = Synchronizer.new(repositories, api_key, config, sdk_blocker, sync_params)
         notification_manager_keeper = SplitIoClient::SSE::NotificationManagerKeeper.new(config) do |manager|
           manager.on_occupancy { |publisher_available| process_occupancy(publisher_available) }
+          manager.on_push_shutdown { process_push_shutdown }
         end
         @sse_handler = SplitIoClient::SSE::SSEHandler.new(
           config,
@@ -57,8 +58,8 @@ module SplitIoClient
       def start_poll
         @synchronizer.start_periodic_fetch
         @synchronizer.start_periodic_data_recording
-      rescue StandardError => error
-        @config.logger.error(error)
+      rescue StandardError => e
+        @config.logger.error(e)
       end
 
       # Starts thread which fetch splits and segments once and trigger task to periodic data recording.
@@ -67,8 +68,8 @@ module SplitIoClient
           begin
             @synchronizer.sync_all
             @synchronizer.start_periodic_data_recording
-          rescue StandardError => error
-            @config.logger.error(error)
+          rescue StandardError => e
+            @config.logger.error(e)
           end
         end
       end
@@ -78,8 +79,8 @@ module SplitIoClient
         @config.threads[:sync_manager_start_sse] = Thread.new do
           begin
             @push_manager.start_sse
-          rescue StandardError => error
-            @config.logger.error(error)
+          rescue StandardError => e
+            @config.logger.error(e)
           end
         end
       end
@@ -103,9 +104,17 @@ module SplitIoClient
         @synchronizer.start_periodic_fetch
       end
 
-      def process_occupancy(publisher_available)
-        process_disconnect unless publisher_available
-        process_connected if publisher_available
+      def process_occupancy(push_enable)
+        process_disconnect unless push_enable
+        process_connected if push_enable
+      end
+
+      def process_push_shutdown
+        @sse_handler.stop_workers
+        @push_manager.stop_sse
+        start_poll
+      rescue StandardError => e
+        @config.logger.error(e)
       end
     end
   end

data/lib/splitclient-rb/sse/notification_manager_keeper.rb

@@ -7,14 +7,18 @@ module SplitIoClient
     class NotificationManagerKeeper
       def initialize(config)
         @config = config
-        @polling_on = Concurrent::AtomicBoolean.new(false)
-        @on = { occupancy: ->(_) {} }
+        @publisher_available = Concurrent::AtomicBoolean.new(true)
+        @on = { occupancy: ->(_) {}, push_shutdown: ->(_) {} }
 
         yield self if block_given?
       end
 
       def handle_incoming_occupancy_event(event)
-        process_event(event.data['metrics']['publishers']) if event.channel == SplitIoClient::Constants::CONTROL_PRI
+        if event.data['type'] == 'CONTROL'
+          process_event_control(event.data['controlType'])
+        elsif event.channel == SplitIoClient::Constants::CONTROL_PRI
+          process_event_occupancy(event.data['metrics']['publishers'])
+        end
       rescue StandardError => e
         @config.logger.error(e)
       end
@@ -23,22 +27,46 @@ module SplitIoClient
         @on[:occupancy] = action
       end
 
+      def on_push_shutdown(&action)
+        @on[:push_shutdown] = action
+      end
+
       private
 
-      def process_event(publishers)
-        @config.logger.debug("Occupancy process event with #{publishers} publishers and polling on: #{@polling_on.value}")
-        if publishers <= 0 && !@polling_on.value
-          @polling_on.make_true
+      def process_event_control(type)
+        case type
+        when 'STREAMING_PAUSED'
           dispatch_occupancy_event(false)
-        elsif publishers >= 1 && @polling_on.value
-          @polling_on.make_false
+        when 'STREAMING_RESUMED'
+          dispatch_occupancy_event(true) if @publisher_available.value
+        when 'STREAMING_DISABLED'
+          dispatch_push_shutdown
+        else
+          @config.logger.error("Incorrect event type: #{incoming_notification}")
+        end
+      end
+
+      def process_event_occupancy(publishers)
+        @config.logger.debug(
+          "Occupancy process event with #{publishers} publishers and polling on: #{@publisher_available.value}"
+        )
+        if publishers <= 0 && @publisher_available.value
+          @publisher_available.make_false
+          dispatch_occupancy_event(false)
+        elsif publishers >= 1 && !@publisher_available.value
+          @publisher_available.make_true
           dispatch_occupancy_event(true)
         end
       end
 
-      def dispatch_occupancy_event(publisher_available)
-        @config.logger.debug("Dispatching occupancy event with publisher avaliable: #{publisher_available}")
-        @on[:occupancy].call(publisher_available)
+      def dispatch_occupancy_event(push_enable)
+        @config.logger.debug("Dispatching occupancy event with publisher avaliable: #{push_enable}")
+        @on[:occupancy].call(push_enable)
+      end
+
+      def dispatch_push_shutdown
+        @config.logger.debug('Dispatching push shutdown')
+        @on[:push_shutdown].call
       end
     end
   end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.1.0.pre.rc3'
+  VERSION = '7.1.0.pre.rc4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.1.0.pre.rc3
+  version: 7.1.0.pre.rc4
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement