fixed sse connection and polishing streaming flow

Author: sanzmauro

lib/splitclient-rb/engine/push_manager.rb

@@ -34,7 +34,6 @@ def start_sse
       end
 
       def stop_sse
-        @sse_handler.process_disconnect if @sse_handler.sse_client.nil?
         @sse_handler.stop
         SplitIoClient::Helpers::ThreadHelper.stop(:schedule_next_token_refresh, @config)
       end

lib/splitclient-rb/engine/sync_manager.rb

@@ -136,6 +136,7 @@ def process_disconnect(reconnect)
         record_telemetry(Telemetry::Domain::Constants::SYNC_MODE, SYNC_MODE_POLLING)
 
         if reconnect
+          @push_manager.stop_sse
           @synchronizer.sync_all
           @push_manager.start_sse
         end

lib/splitclient-rb/helpers/thread_helper.rb

@@ -8,7 +8,6 @@ def self.stop(thread_sym, config)
 
         unless thread.nil?
           config.logger.debug("Stopping #{thread_sym} thread...") if config.debug_enabled
-          sleep(0.1) while thread.status == 'run'
           Thread.kill(thread)
         end
       rescue StandardError => e

lib/splitclient-rb/sse/event_source/client.rb

@@ -35,11 +35,15 @@ def on_action(&action)
           @on[:action] = action
         end
 
-        def close(action = Constants::PUSH_NONRETRYABLE_ERROR)
-          dispatch_action(action)
+        def close(action = nil)
+          unless connected?
+            @config.logger.error('SSEClient already disconected.') if @config.debug_enabled
+            return
+          end
+
           @connected.make_false
-          SplitIoClient::Helpers::ThreadHelper.stop(:connect_stream, @config)
           @socket&.close
+          dispatch_action(action) unless action.nil?
         rescue StandardError => e
           @config.logger.error("SSEClient close Error: #{e.inspect}")
         end
@@ -72,12 +76,14 @@ def connected?
         def connect_thread(latch)
           @config.threads[:connect_stream] = Thread.new do
             @config.logger.info('Starting connect_stream thread ...') if @config.debug_enabled
-            connect_stream(latch)
+            action = connect_stream(latch)
+            dispatch_action(action) unless action.nil?
+            @config.logger.info('connect_stream thread finished.') if @config.debug_enabled
           end
         end
 
         def connect_stream(latch)
-          socket_write(latch)
+          return Constants::PUSH_NONRETRYABLE_ERROR unless socket_write(latch)
 
           while connected? || @first_event.value
             begin
@@ -86,24 +92,30 @@ def connect_stream(latch)
               read_first_event(partial_data, latch)
 
               raise 'eof exception' if partial_data == :eof
+            rescue Errno::EBADF, IOError => e
+              @config.logger.error(e.inspect)
+              return nil
             rescue StandardError => e
-              @config.logger.error('Error reading partial data: ' + e.inspect) if @config.debug_enabled
-              close(Constants::PUSH_RETRYABLE_ERROR)
-              return
+              return nil if ENV['SPLITCLIENT_ENV'] == 'test'
+
+              @config.logger.error("Error reading partial data: #{e.inspect}") if @config.debug_enabled
+              return Constants::PUSH_RETRYABLE_ERROR
             end
 
             process_data(partial_data)
           end
+          nil
         end
 
         def socket_write(latch)
           @first_event.make_true
           @socket = socket_connect
           @socket.write(build_request(@uri))
+          true
         rescue StandardError => e
           @config.logger.error("Error during connecting to #{@uri.host}. Error: #{e.inspect}")
-          close(Constants::PUSH_NONRETRYABLE_ERROR)
           latch.count_down
+          false
         end
 
         def read_first_event(data, latch)
@@ -181,8 +193,10 @@ def dispatch_event(event)
         end
 
         def dispatch_action(action)
-          @config.logger.debug("Dispatching action: #{action}") if @config.debug_enabled
-          @on[:action].call(action)
+          @config.threads[:dispatch_action] = Thread.new do
+            @config.logger.debug("Dispatching action: #{action}") if @config.debug_enabled
+            @on[:action].call(action)
+          end
         end
       end
     end

lib/splitclient-rb/sse/sse_handler.rb

@@ -31,7 +31,7 @@ def start(token_jwt, channels)
       end
 
       def stop
-        @sse_client.close
+        @sse_client.close(Constants::PUSH_NONRETRYABLE_ERROR)
         stop_workers
       rescue StandardError => e
         @config.logger.debug("SSEHandler stop error: #{e.inspect}") if @config.debug_enabled

lib/splitclient-rb/sse/workers/segments_worker.rb

@@ -13,11 +13,6 @@ def initialize(synchronizer, config, segments_repository)
         end
 
         def add_to_queue(change_number, segment_name)
-          unless @running.value
-            @config.logger.debug('segments worker not running.')
-            return
-          end
-
           item = { change_number: change_number, segment_name: segment_name }
           @config.logger.debug("SegmentsWorker add to queue #{item}")
           @queue.push(item)

lib/splitclient-rb/sse/workers/splits_worker.rb

@@ -33,21 +33,11 @@ def stop
         end
 
         def add_to_queue(change_number)
-          unless @running.value
-            @config.logger.debug('splits worker not running.')
-            return
-          end
-
           @config.logger.debug("SplitsWorker add to queue #{change_number}")
           @queue.push(change_number)
         end
 
         def kill_split(change_number, split_name, default_treatment)
-          unless @running.value
-            @config.logger.debug('splits worker not running.')
-            return
-          end
-
           return if @splits_repository.get_change_number.to_i > change_number
 
           @config.logger.debug("SplitsWorker kill #{split_name}, #{change_number}")

lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.3.3.pre.rc8'
+  VERSION = '7.3.3.pre.rc18'
 end

spec/engine/push_manager_spec.rb

@@ -93,7 +93,6 @@
 
       expect(connected).to eq(false)
       expect(sse_handler.connected?).to eq(false)
-      expect(action_event).to eq(SplitIoClient::Constants::PUSH_NONRETRYABLE_ERROR)
     end
 
     it 'must not connect to server. Auth server return 401' do
@@ -119,7 +118,6 @@
 
       expect(connected).to eq(false)
       expect(sse_handler.connected?).to eq(false)
-      expect(action_event).to eq(SplitIoClient::Constants::PUSH_NONRETRYABLE_ERROR)
     end
   end
 

spec/engine/sync_manager_spec.rb

@@ -74,7 +74,7 @@
       sleep(2)
       expect(a_request(:get, 'https://sdk.split.io/api/splitChanges?since=-1')).to have_been_made.once
 
-      expect(config.threads.size).to eq(10)
+      expect(config.threads.size).to eq(11)
     end
   end
 
@@ -93,7 +93,7 @@
       sleep(2)
       expect(a_request(:get, 'https://sdk.split.io/api/splitChanges?since=-1')).to have_been_made.once
 
-      expect(config.threads.size).to eq(6)
+      expect(config.threads.size).to eq(7)
     end
   end