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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb3dfc125b557830b44424f5d6a42dbf5ba16f823d7741910020083a3e755b95
-  data.tar.gz: 940c7952301a2859e3d5f5c77b00587ec81015a2919f893aadd38adb73bad867
+  metadata.gz: cd1c96c4c828e35b92aab1832e76f5b3e86b430d1c96063837b44e7149aa1cd8
+  data.tar.gz: e35412918b839f46cc7f547f7f1f1ac8f8163ab7d1c47de79a4ed013dc78b5eb
 SHA512:
-  metadata.gz: 26170c1a732d710b4894a8c72b4c84a4d056fb6aa960fdfb3c91c9e7171dcd27fdd407808d4bd9684a70c9896487cdec4b9d57b8c8a9d07952eaf0f44934adee
-  data.tar.gz: 241aae97c4318d37d23284f4fb6cedc05f3991c49e4044048f8051c893177a6b0afecc80da393fa4b7d4e6037f5f09ba60e4a11381ab8d3ad2db2b653450828a
+  metadata.gz: 57c47112c8de1cd38bde1bc462d67ce3f5bb63eb41b6c775fe08591c24e991938c89ed4fd1d48f05008c897dd7af7e79da08578e17a9919db2d547c3b746d6d6
+  data.tar.gz: 3541514099aef7a845b89eda8924e307916b7b1f32aff5406054907ac7823f2c9014d0352bb9cc7c6e781d84970de9eeb0a5d8a87afade7ecc8ec7aa8586a824

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

@@ -87,32 +87,39 @@ module SplitIoClient
           return Constants::PUSH_NONRETRYABLE_ERROR unless socket_write(latch)
           while connected? || @first_event.value
             log_if_debug("Inside coonnect_stream while loop.", 3)
-            begin
-              partial_data = ""
-              Timeout::timeout @read_timeout do
+            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
 

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '8.10.0-rc4'
+  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.rc4
+  version: 8.10.0.pre.rc5
 platform: ruby
 authors:
 - Split Software