splitclient-rb 8.10.0.pre.rc3 → 8.10.0.pre.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a02d284b164c23bc6d6d42ff6ac09620e65879978700195e7f7a251fbf1c8f2
-  data.tar.gz: b2e23d3d62bceacaad46c11db2fd2e5f402c3cbbd3d60625a59eeb1c6a5a1159
+  metadata.gz: cd1c96c4c828e35b92aab1832e76f5b3e86b430d1c96063837b44e7149aa1cd8
+  data.tar.gz: e35412918b839f46cc7f547f7f1f1ac8f8163ab7d1c47de79a4ed013dc78b5eb
 SHA512:
-  metadata.gz: c51285c71b17d907f5f05c8a49c000d77f80e38a367d2288fb63106c4dbe62fc16b7397b84170530302c386164e5209fbb314601a170134a85a243fc40606f36
-  data.tar.gz: ac1d15560f3f1ab29623dc6052ac6f90fa8a76b44c973d261ef91b93a88c0c81fbfb82117d524b8f99b3084772e8ab07823444475cd752ee9c3ec413664e088c
+  metadata.gz: 57c47112c8de1cd38bde1bc462d67ce3f5bb63eb41b6c775fe08591c24e991938c89ed4fd1d48f05008c897dd7af7e79da08578e17a9919db2d547c3b746d6d6
+  data.tar.gz: 3541514099aef7a845b89eda8924e307916b7b1f32aff5406054907ac7823f2c9014d0352bb9cc7c6e781d84970de9eeb0a5d8a87afade7ecc8ec7aa8586a824

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

@@ -86,38 +86,46 @@ module SplitIoClient
         def connect_stream(latch)
           return Constants::PUSH_NONRETRYABLE_ERROR unless socket_write(latch)
           while connected? || @first_event.value
-            begin
-              partial_data = ""
-              Timeout::timeout @read_timeout do
+            log_if_debug("Inside coonnect_stream while loop.", 3)
+            if IO.select([@socket], nil, nil, @read_timeout)
+              begin
                 partial_data = @socket.readpartial(10_000)
-              end
-              read_first_event(partial_data, latch)
-
-              raise 'eof exception' if partial_data == :eof
-            rescue Timeout::Error => e
-              log_if_debug("SSE read operation timed out!: #{e.inspect}", 3)
-              return Constants::PUSH_RETRYABLE_ERROR
-            rescue EOFError => e
-              log_if_debug("SSE read operation EOF Exception!: #{e.inspect}", 3)
-              raise 'eof exception'
-            rescue  Errno::EAGAIN => e
-              log_if_debug("SSE client transient error: #{e.inspect}", 1)
-              IO.select([tcp_socket])
-              retry
-            rescue Errno::EBADF, IOError => e
-              log_if_debug("SSE read operation EBADF or IOError: #{e.inspect}", 3)
-              return nil
-            rescue StandardError => e
-              log_if_debug("SSE read operation StandardError: #{e.inspect}", 3)
-              return nil if ENV['SPLITCLIENT_ENV'] == 'test'
+                read_first_event(partial_data, latch)
 
-              log_if_debug("Error reading partial data: #{e.inspect}", 3)
+                raise 'eof exception' if partial_data == :eof
+              rescue IO::WaitReadable => e
+                log_if_debug("SSE client transient error: #{e.inspect}", 1)
+                IO.select([@socket], nil, nil, @read_timeout)
+                retry
+              rescue Errno::ETIMEDOUT => e
+                log_if_debug("SSE read operation timed out!: #{e.inspect}", 3)
+                return Constants::PUSH_RETRYABLE_ERROR
+              rescue EOFError => e
+                log_if_debug("SSE read operation EOF Exception!: #{e.inspect}", 3)
+                raise 'eof exception'
+              rescue  Errno::EAGAIN => e
+                log_if_debug("SSE client transient error: #{e.inspect}", 1)
+                IO.select([@socket], nil, nil, @read_timeout)
+                retry
+              rescue Errno::EBADF, IOError => e
+                log_if_debug("SSE read operation EBADF or IOError: #{e.inspect}", 3)
+                return nil
+              rescue StandardError => e
+                log_if_debug("SSE read operation StandardError: #{e.inspect}", 3)
+                return nil if ENV['SPLITCLIENT_ENV'] == 'test'
+
+                log_if_debug("Error reading partial data: #{e.inspect}", 3)
+                return Constants::PUSH_RETRYABLE_ERROR
+              end
+            else
+              # Timeout occurred, no data available
+              log_if_debug("SSE read operation timed out, no data available.", 3)
               return Constants::PUSH_RETRYABLE_ERROR
             end
 
             process_data(partial_data)
           end
-          log_if_debug("SSE read operation exited: #{connected}")
+          log_if_debug("SSE read operation exited: #{connected?}", 3)
 
           nil
         end
@@ -146,6 +154,7 @@ module SplitIoClient
 
           if response_code == OK_CODE && !error_event
             @connected.make_true
+            @config.logger.debug("SSE client first event Connected is true")
             @telemetry_runtime_producer.record_streaming_event(Telemetry::Domain::Constants::SSE_CONNECTION_ESTABLISHED, nil)
             push_status(Constants::PUSH_CONNECTED)
           end
@@ -183,9 +192,9 @@ module SplitIoClient
         end
 
         def process_data(partial_data)
+          log_if_debug("Event partial data: #{partial_data}", 1)
           return if partial_data.nil? || partial_data == KEEP_ALIVE_RESPONSE
 
-          log_if_debug("Event partial data: #{partial_data}", 1)
           events = @event_parser.parse(partial_data)
           events.each { |event| process_event(event) }
         rescue StandardError => e

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '8.10.0-rc3'
+  VERSION = '8.10.0-rc5'
 end

metadata

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