splitclient-rb 7.3.3.pre.rc9-java → 7.3.3.pre.rc13-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7559596cd586d0f10072b19ae92405c4dbe86769
-  data.tar.gz: 33c75e02ac664366d0ad33b37b1ec189ff0dd152
+  metadata.gz: bda10ef63962bd679c7bbbf81acbfab53a979ae1
+  data.tar.gz: c43fe83870c73a31b65a42a86a53899b560e8037
 SHA512:
-  metadata.gz: 3a83f873bec9b91ae7e176cc96b247236aa9eb7e5c693ce74a7f3adb16823c42ebd4b239eb6210c981e5e37cd912943510eb21a92414025416224114bcbbb9da
-  data.tar.gz: 6775ae98766d910f269ba6a114099ed853b14ca9794c2324a3b5c0a4bbfff3bfb6de133e18ca85ab5771a03c53b88677f5ca8a6161685e6ca93b54f13fd08266
+  metadata.gz: 8586c95577da16d0e9bdd9e2d2afceb432b6515aa998031a2d84c975422dbb8bfecc365fd49a064991c86dc8deffeb73823ea2db084c6a129dafbb02095ccdbf
+  data.tar.gz: 7a9298c48bb8b789ea924a8970dca46c37383291255961265c8188ed0847c5375bca325d7ffbdd57151b8b17d35cf231ee598f028511b641b53447a54421cfeb

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

@@ -18,7 +18,7 @@ module SplitIoClient
         @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])
+          schedule_next_token_refresh(150)
           @back_off.reset
           record_telemetry(response[:exp])
 
@@ -34,8 +34,13 @@ module SplitIoClient
       end
 
       def stop_sse
+        @config.logger.error('## STOP SSE')
         @sse_handler.process_disconnect if @sse_handler.sse_client.nil?
         @sse_handler.stop
+        stop_next_token_refresh
+      end
+
+      def stop_next_token_refresh
         SplitIoClient::Helpers::ThreadHelper.stop(:schedule_next_token_refresh, @config)
       end
 
@@ -47,9 +52,12 @@ module SplitIoClient
             @config.logger.debug("schedule_next_token_refresh refresh in #{time} seconds.") if @config.debug_enabled
             sleep(time)
             @config.logger.debug('schedule_next_token_refresh starting ...') if @config.debug_enabled
+            @config.logger.error('## SCHEDULE NEXT TOKEN')
+
             @sse_handler.stop
             start_sse
           rescue StandardError => e
+            @config.logger.error("## SCHEDULE EXCEPTION #{e.inspect}")
             @config.logger.debug("schedule_next_token_refresh error: #{e.inspect}") if @config.debug_enabled
           end
         end

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

@@ -67,6 +67,7 @@ module SplitIoClient
       end
 
       def process_action(action)
+        @config.logger.error("process_action #{action}")
         case action
         when Constants::PUSH_CONNECTED
           process_connected
@@ -117,8 +118,8 @@ module SplitIoClient
 
         @sse_connected.make_true
         @synchronizer.stop_periodic_fetch
-        @synchronizer.sync_all
         @sse_handler.start_workers
+        @synchronizer.sync_all
         record_telemetry(Telemetry::Domain::Constants::SYNC_MODE, SYNC_MODE_STREAMING)
       rescue StandardError => e
         @config.logger.error("process_connected error: #{e.inspect}")
@@ -131,11 +132,12 @@ module SplitIoClient
         end
 
         @sse_connected.make_false
-        @sse_handler.stop_workers
         @synchronizer.start_periodic_fetch
+        @sse_handler.stop_workers
         record_telemetry(Telemetry::Domain::Constants::SYNC_MODE, SYNC_MODE_POLLING)
 
         if reconnect
+          @push_manager.stop_sse
           @synchronizer.sync_all
           @push_manager.start_sse
         end

data/lib/splitclient-rb/helpers/thread_helper.rb

@@ -7,9 +7,8 @@ module SplitIoClient
         thread = config.threads[thread_sym]
 
         unless thread.nil?
-          config.logger.debug("Stopping #{thread_sym} thread...") if config.debug_enabled
-          sleep(0.1) while thread.status == 'run'
-          Thread.kill(thread)
+          Thread.kill thread
+          config.logger.debug("#{thread_sym} killed.") if config.debug_enabled
         end
       rescue StandardError => e
         config.logger.error(e.inspect)

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

@@ -35,11 +35,15 @@ module SplitIoClient
           @on[:action] = action
         end
 
-        def close(action = Constants::PUSH_NONRETRYABLE_ERROR)
+        def close
+          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)
+          @config.logger.error('## CLOSE SSE')
         rescue StandardError => e
           @config.logger.error("SSEClient close Error: #{e.inspect}")
         end
@@ -71,13 +75,17 @@ module SplitIoClient
 
         def connect_thread(latch)
           @config.threads[:connect_stream] = Thread.new do
+            @config.logger.error('## CONNECT THREAD')
             @config.logger.info('Starting connect_stream thread ...') if @config.debug_enabled
-            connect_stream(latch)
+            closed_with_exception = connect_stream(latch)
+            dispatch_action(closed_with_exception) unless closed_with_exception.nil?
+            @config.logger.info('connect_stream thread finished.') if @config.debug_enabled
+            @config.logger.error('#### DISCONNECTED')
           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 +94,28 @@ module SplitIoClient
               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
+              @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 @@ module SplitIoClient
         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

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.3.3.pre.rc9'
+  VERSION = '7.3.3.pre.rc13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.3.3.pre.rc9
+  version: 7.3.3.pre.rc13
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement