splitclient-rb 8.11.1.pre.beta1 → 8.11.1.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a4db5832f1014e1affbb3d8dc9449fb5b90b5a85f711d2adc1b23c68930f0d1
-  data.tar.gz: fcaaf6956533c33c1208db241b7abd3e926b733721088688e57b7b7902f13427
+  metadata.gz: 6b8826705cc51c97b0fd56af17ba520dbc20932c4c658c3e55f0ec04cd9fc850
+  data.tar.gz: 3eb1a3e21d490fe80b80f67f73e3372bb822a15607f2231ca3fe335f37cb49ae
 SHA512:
-  metadata.gz: d1a06b2e4e9fc50d0c29e0b1a5a4b8525d89ce1e98212bb771a2237326ccfe5de5d2612a5dff9203efbdff3bae053289bc7c16a51a8200629f4bba11e392892f
-  data.tar.gz: 6bd725d5b1ff5e882f27f4d86dcdb4966e0d93f188e1f30a3031a6c291cd82b63fd72a7458f36d6d3b231878282a7ab485f0dc1cbda60c55b4f8d6ea566f0b5d
+  metadata.gz: 2abb05c726b7019e7f56240f5b6e69d50689fae3739e714e85c7134ff47fec1bffd54b68bca6c571162a590e87e87ae090376ad7b9854f65373060ddb532bd93
+  data.tar.gz: b80cbe9440ec9bf0ff54b057bd95b5c248da1781d1eea157ef9baaa8ff473826c280152e45a2c41b41e8f49dc219733234671984f715b5a7119a37f5dba71b9b

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

@@ -16,17 +16,21 @@ module SplitIoClient
         response = @auth_api_client.authenticate(@api_key)
         @config.logger.debug("Auth service response push_enabled: #{response[:push_enabled]}") if @config.debug_enabled
 
-        if response[:push_enabled] && @sse_handler.start(response[:token], response[:channels])
-          schedule_next_token_refresh(response[:exp])
-          @back_off.reset
-          record_telemetry(response[:exp])
+        unless response[:push_enabled]
+          schedule_next_token_refresh(@back_off.interval) if response[:retry]
+          return false
+        end
 
-          return true
+        unless @sse_handler.start(response[:token], response[:channels])
+          @config.logger.debug('Streaming server returned error') if @config.debug_enabled
+          stop_sse
+          return false
         end
 
-        stop_sse
-        schedule_next_token_refresh(@back_off.interval) if response[:retry]
-        false
+        schedule_next_token_refresh(response[:exp])
+        @back_off.reset
+        record_telemetry(response[:exp])
+        true
       rescue StandardError => e
         @config.logger.error("start_sse: #{e.inspect}")
       end

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

@@ -10,7 +10,7 @@ module SplitIoClient
     module EventSource
       class Client
         DEFAULT_READ_TIMEOUT = 70
-        CONNECT_TIMEOUT = 30_000
+        CONNECT_TIMEOUT = 30
         OK_CODE = 200
         KEEP_ALIVE_RESPONSE = "c\r\n:keepalive\n\n\r\n".freeze
         ERROR_EVENT_TYPE = 'error'.freeze
@@ -37,17 +37,15 @@ module SplitIoClient
         end
 
         def close(status = nil)
-          unless connected?
-            @config.logger.debug('SSEClient already disconected.') if @config.debug_enabled
-            return
-          end
-          @config.logger.debug("Closing SSEClient socket") if @config.debug_enabled
+          return if @socket.nil?
 
+          @config.logger.debug("Closing SSEClient socket") if @config.debug_enabled
           push_status(status)
           @connected.make_false
           @socket.sync_close = true if @socket.is_a? OpenSSL::SSL::SSLSocket
           @socket.close
-          @config.logger.debug("SSEClient socket state #{@socket.state}") if @socket.is_a? OpenSSL::SSL::SSLSocket && @config.debug_enabled
+          @config.logger.debug("SSEClient socket state #{@socket.state}") if @socket.is_a?(OpenSSL::SSL::SSLSocket) && @config.debug_enabled
+          @socket = nil
         rescue StandardError => e
           @config.logger.error("SSEClient close Error: #{e.inspect}")
         end
@@ -80,7 +78,7 @@ module SplitIoClient
           @config.threads[:connect_stream] = Thread.new do
             @config.logger.info('Starting connect_stream thread ...')
             new_status = connect_stream(latch)
-            push_status(new_status)
+            push_status(new_status) unless new_status.nil?
             @config.logger.info('connect_stream thread finished.')
           end
         end
@@ -93,8 +91,6 @@ module SplitIoClient
                 begin
                   partial_data = @socket.readpartial(10_000)
                   read_first_event(partial_data, latch)
-
-                  raise 'eof exception' if partial_data == :eof
                 rescue IO::WaitReadable => e
                   @config.logger.debug("SSE client IO::WaitReadable transient error: #{e.inspect}") if @config.debug_enabled
                   IO.select([@socket], nil, nil, @read_timeout)
@@ -107,8 +103,8 @@ module SplitIoClient
                   @config.logger.error("SSE read operation timed out!: #{e.inspect}")
                   return Constants::PUSH_RETRYABLE_ERROR
                 rescue EOFError => e
-                  @config.logger.error("SSE read operation EOF Exception!: #{e.inspect}")
-                  raise 'eof exception'
+                  @config.logger.error("SSE read operation EOF, server closed the connection, will reconnect: #{e.inspect}")
+                  return Constants::PUSH_RETRYABLE_ERROR
                 rescue Errno::EBADF, IOError => e
                   @config.logger.error("SSE read operation EBADF or IOError: #{e.inspect}")
                   return Constants::PUSH_RETRYABLE_ERROR
@@ -126,8 +122,6 @@ module SplitIoClient
             rescue Errno::EBADF
               @config.logger.debug("SSE socket is not connected (Errno::EBADF)") if @config.debug_enabled
               break
-            rescue RuntimeError
-              raise 'eof exception'
             rescue Exception => e
               @config.logger.debug("SSE socket is not connected: #{e.inspect}") if @config.debug_enabled
               break

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '8.11.1-beta1'
+  VERSION = '8.11.1-rc2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 8.11.1.pre.beta1
+  version: 8.11.1.pre.rc2
 platform: ruby
 authors:
 - Split Software