splitclient-rb 7.0.4.pre.rc3-java → 7.1.0-java

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

@@ -4,22 +4,33 @@ module SplitIoClient
   module SSE
     module Workers
       class SegmentsWorker
-        def initialize(adapter, config, segments_repository)
-          @adapter = adapter
+        def initialize(synchronizer, config, segments_repository)
+          @synchronizer = synchronizer
           @config = config
           @segments_repository = segments_repository
-          @queue = Queue.new
+          @queue = nil
+        end
 
-          perform_thread
+        def start
+          return if SplitIoClient::Helpers::ThreadHelper.alive?(:segment_update_worker, @config)
 
-          perform_passenger_forked if defined?(PhusionPassenger)
+          @queue = Queue.new
+          perform_thread
         end
 
         def add_to_queue(change_number, segment_name)
+          return if @queue.nil?
+
           item = { change_number: change_number, segment_name: segment_name }
+          @config.logger.debug("SegmentsWorker add to queue #{item}")
           @queue.push(item)
         end
 
+        def stop
+          SplitIoClient::Helpers::ThreadHelper.stop(:segment_update_worker, @config)
+          @queue = nil
+        end
+
         private
 
         def perform
@@ -28,12 +39,16 @@ module SplitIoClient
             change_number = item[:change_number]
             since = @segments_repository.get_change_number(segment_name)
 
-            @adapter.segment_fetcher.fetch_segment(segment_name) unless since >= change_number
+            unless since >= change_number
+              @config.logger.debug("SegmentsWorker fetch_segment with #{since}")
+              @synchronizer.fetch_segment(segment_name)
+            end
           end
         end
 
         def perform_thread
           @config.threads[:segment_update_worker] = Thread.new do
+            @config.logger.debug('Starting segments worker ...') if @config.debug_enabled
             perform
           end
         end

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

@@ -4,37 +4,55 @@ module SplitIoClient
   module SSE
     module Workers
       class SplitsWorker
-        def initialize(adapter, config, splits_repository)
-          @adapter = adapter
+        def initialize(synchronizer, config, splits_repository)
+          @synchronizer = synchronizer
           @config = config
           @splits_repository = splits_repository
-          @queue = Queue.new
+        end
 
-          perform_thread
+        def start
+          return if SplitIoClient::Helpers::ThreadHelper.alive?(:split_update_worker, @config)
 
-          perform_passenger_forked if defined?(PhusionPassenger)
+          @queue = Queue.new
+          perform_thread
         end
 
         def add_to_queue(change_number)
+          return if @queue.nil?
+
+          @config.logger.debug("SplitsWorker add to queue #{change_number}")
           @queue.push(change_number)
         end
 
         def kill_split(change_number, split_name, default_treatment)
+          return if @queue.nil?
+
+          @config.logger.debug("SplitsWorker kill #{split_name}, #{change_number}")
           @splits_repository.kill(change_number, split_name, default_treatment)
           add_to_queue(change_number)
         end
 
+        def stop
+          SplitIoClient::Helpers::ThreadHelper.stop(:split_update_worker, @config)
+          @queue = nil
+        end
+
         private
 
         def perform
           while (change_number = @queue.pop)
             since = @splits_repository.get_change_number
-            @adapter.split_fetcher.fetch_splits unless since >= change_number
+
+            unless since.to_i >= change_number
+              @config.logger.debug("SplitsWorker fetch_splits with #{since}")
+              @synchronizer.fetch_splits
+            end
           end
         end
 
         def perform_thread
           @config.threads[:split_update_worker] = Thread.new do
+            @config.logger.debug('Starting splits worker ...') if @config.debug_enabled
             perform
           end
         end

data/lib/splitclient-rb/version.rb

@@ -1,3 +1,3 @@
 module SplitIoClient
-  VERSION = '7.0.4.pre.rc3'
+  VERSION = '7.1.0'
 end

data/lib/splitclient-rb.rb

@@ -2,6 +2,7 @@ require 'forwardable'
 
 require 'splitclient-rb/version'
 
+require 'splitclient-rb/constants'
 require 'splitclient-rb/exceptions'
 require 'splitclient-rb/cache/routers/impression_router'
 require 'splitclient-rb/cache/adapters/memory_adapters/map_adapter'
@@ -35,6 +36,7 @@ require 'splitclient-rb/cache/stores/localhost_split_store'
 
 require 'splitclient-rb/clients/split_client'
 require 'splitclient-rb/managers/split_manager'
+require 'splitclient-rb/helpers/thread_helper'
 require 'splitclient-rb/split_factory'
 require 'splitclient-rb/split_factory_builder'
 require 'splitclient-rb/split_config'
@@ -52,7 +54,6 @@ require 'splitclient-rb/engine/api/splits'
 require 'splitclient-rb/engine/api/events'
 require 'splitclient-rb/engine/parser/condition'
 require 'splitclient-rb/engine/parser/partition'
-require 'splitclient-rb/engine/parser/split_adapter'
 require 'splitclient-rb/engine/parser/evaluator'
 require 'splitclient-rb/engine/matchers/matcher'
 require 'splitclient-rb/engine/matchers/combiners'
@@ -83,18 +84,24 @@ require 'splitclient-rb/engine/metrics/binary_search_latency_tracker'
 require 'splitclient-rb/engine/models/split'
 require 'splitclient-rb/engine/models/label'
 require 'splitclient-rb/engine/models/treatment'
+require 'splitclient-rb/engine/auth_api_client'
+require 'splitclient-rb/engine/push_manager'
+require 'splitclient-rb/engine/sync_manager'
+require 'splitclient-rb/engine/synchronizer'
 require 'splitclient-rb/utilitites'
 
 # redis metrics fixer
 require 'splitclient-rb/redis_metrics_fixer'
 
 # SSE 
+require 'splitclient-rb/sse/event_source/back_off'
 require 'splitclient-rb/sse/event_source/client'
 require 'splitclient-rb/sse/event_source/event_types'
-require 'splitclient-rb/sse/event_source/status'
-require 'splitclient-rb/sse/workers/control_worker'
+require 'splitclient-rb/sse/event_source/stream_data'
 require 'splitclient-rb/sse/workers/segments_worker'
 require 'splitclient-rb/sse/workers/splits_worker'
+require 'splitclient-rb/sse/notification_manager_keeper'
+require 'splitclient-rb/sse/notification_processor'
 require 'splitclient-rb/sse/sse_handler'
 
 # C extension

data/splitclient-rb.gemspec

@@ -51,6 +51,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_runtime_dependency 'faraday', '>= 0.8'
   spec.add_runtime_dependency 'json', '>= 1.8'
+  spec.add_runtime_dependency 'jwt', '>= 2.2.1'
   spec.add_runtime_dependency 'lru_redux'
   spec.add_runtime_dependency 'net-http-persistent', '>= 2.9'
   spec.add_runtime_dependency 'redis', '>= 3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: splitclient-rb
 version: !ruby/object:Gem::Version
-  version: 7.0.4.pre.rc3
+  version: 7.1.0
 platform: java
 authors:
 - Split Software
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2020-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  name: jwt
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -346,6 +360,7 @@ files:
 - lib/splitclient-rb/cache/stores/sdk_blocker.rb
 - lib/splitclient-rb/cache/stores/store_utils.rb
 - lib/splitclient-rb/clients/split_client.rb
+- lib/splitclient-rb/constants.rb
 - lib/splitclient-rb/engine/api/client.rb
 - lib/splitclient-rb/engine/api/events.rb
 - lib/splitclient-rb/engine/api/faraday_adapter/patched_net_http_persistent.rb
@@ -354,6 +369,7 @@ files:
 - lib/splitclient-rb/engine/api/metrics.rb
 - lib/splitclient-rb/engine/api/segments.rb
 - lib/splitclient-rb/engine/api/splits.rb
+- lib/splitclient-rb/engine/auth_api_client.rb
 - lib/splitclient-rb/engine/evaluator/splitter.rb
 - lib/splitclient-rb/engine/matchers/all_keys_matcher.rb
 - lib/splitclient-rb/engine/matchers/between_matcher.rb
@@ -385,8 +401,11 @@ files:
 - lib/splitclient-rb/engine/parser/condition.rb
 - lib/splitclient-rb/engine/parser/evaluator.rb
 - lib/splitclient-rb/engine/parser/partition.rb
-- lib/splitclient-rb/engine/parser/split_adapter.rb
+- lib/splitclient-rb/engine/push_manager.rb
+- lib/splitclient-rb/engine/sync_manager.rb
+- lib/splitclient-rb/engine/synchronizer.rb
 - lib/splitclient-rb/exceptions.rb
+- lib/splitclient-rb/helpers/thread_helper.rb
 - lib/splitclient-rb/managers/split_manager.rb
 - lib/splitclient-rb/redis_metrics_fixer.rb
 - lib/splitclient-rb/split_config.rb
@@ -394,11 +413,13 @@ files:
 - lib/splitclient-rb/split_factory_builder.rb
 - lib/splitclient-rb/split_factory_registry.rb
 - lib/splitclient-rb/split_logger.rb
+- lib/splitclient-rb/sse/event_source/back_off.rb
 - lib/splitclient-rb/sse/event_source/client.rb
 - lib/splitclient-rb/sse/event_source/event_types.rb
-- lib/splitclient-rb/sse/event_source/status.rb
+- lib/splitclient-rb/sse/event_source/stream_data.rb
+- lib/splitclient-rb/sse/notification_manager_keeper.rb
+- lib/splitclient-rb/sse/notification_processor.rb
 - lib/splitclient-rb/sse/sse_handler.rb
-- lib/splitclient-rb/sse/workers/control_worker.rb
 - lib/splitclient-rb/sse/workers/segments_worker.rb
 - lib/splitclient-rb/sse/workers/splits_worker.rb
 - lib/splitclient-rb/utilitites.rb
@@ -423,9 +444,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.6.14

data/lib/splitclient-rb/engine/parser/split_adapter.rb

@@ -1,105 +0,0 @@
-require 'json'
-require 'thread'
-
-include SplitIoClient::Cache::Fetchers
-include SplitIoClient::Cache::Stores
-include SplitIoClient::Cache::Senders
-
-module SplitIoClient
-  #
-  # acts as an api adapater to connect to split endpoints
-  # uses a configuration object that can be modified when creating the client instance
-  # also, uses safe threads to execute fetches and post give the time execution values from the config
-  #
-  class SplitAdapter < NoMethodError
-    attr_reader :splits_repository, :segments_repository, :impressions_repository, :metrics, :split_fetcher, :segment_fetcher
-
-    #
-    # Creates a new split api adapter instance that consumes split api endpoints
-    #
-    # @param api_key [String] the API key for your split account
-    # @param splits_repository [SplitsRepository] SplitsRepository instance to store splits in
-    # @param segments_repository [SegmentsRepository] SegmentsRepository instance to store segments in
-    # @param impressions_repository [ImpressionsRepository] ImpressionsRepository instance to store impressions in
-    # @param metrics_repository [MetricsRepository] MetricsRepository instance to store metrics in
-    # @param sdk_blocker [SDKBlocker] SDKBlocker instance which blocks splits_repository/segments_repository
-    #
-    # @return [SplitIoClient] split.io client instance
-    def initialize(
-      api_key,
-      splits_repository,
-      segments_repository,
-      impressions_repository,
-      metrics_repository,
-      events_repository,
-      sdk_blocker,
-      config
-    )
-      @api_key = api_key
-      @splits_repository = splits_repository
-      @segments_repository = segments_repository
-      @impressions_repository = impressions_repository
-      @metrics_repository = metrics_repository
-      @events_repository = events_repository
-      @metrics = Metrics.new(100, @metrics_repository)
-      @sdk_blocker = sdk_blocker
-      @config = config
-
-      start_localhost_components if @config.localhost_mode
-
-      start_standalone_components if @config.standalone? && !@config.localhost_mode
-    end
-
-    def start_standalone_components
-      split_fetch
-      segment_fetch
-      metrics_sender
-      impressions_sender
-      events_sender
-    end
-
-    def start_localhost_components
-      localhost_split_store
-      localhost_repo_cleaner
-    end
-
-    # Starts thread which loops constantly and retrieves splits from a file source
-    def localhost_split_store
-      LocalhostSplitStore.new(@splits_repository, @config, @sdk_blocker).call
-    end
-
-    # Starts thread which loops constantly and cleans up repositories to avoid memory issues in localhost mode
-    def localhost_repo_cleaner
-      LocalhostRepoCleaner.new(@impressions_repository, @metrics_repository, @events_repository, @config).call
-    end
-
-    # Starts thread which loops constantly and stores splits in the splits_repository of choice
-    def split_fetch
-      @split_fetcher = SplitFetcher.new(@splits_repository, @api_key, @metrics, @config, @sdk_blocker)
-      @split_fetcher.fetch_splits if @config.push_notification_enabled
-      @split_fetcher.call unless @config.push_notification_enabled
-    end
-
-    # Starts thread which loops constantly and stores segments in the segments_repository of choice
-    def segment_fetch
-      @segment_fetcher = SegmentFetcher.new(@segments_repository, @api_key, @metrics, @config, @sdk_blocker)
-      @segment_fetcher.fetch_segments if @config.push_notification_enabled
-      @segment_fetcher.call unless @config.push_notification_enabled
-    end
-
-    # Starts thread which loops constantly and sends impressions to the Split API
-    def impressions_sender
-      ImpressionsSender.new(@impressions_repository, @api_key, @config).call
-    end
-
-    # Starts thread which loops constantly and sends metrics to the Split API
-    def metrics_sender
-      MetricsSender.new(@metrics_repository, @api_key, @config).call
-    end
-
-    # Starts thread which loops constantly and sends events to the Split API
-    def events_sender
-      EventsSender.new(@events_repository, @config).call
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module SplitIoClient
-  module SSE
-    module EventSource
-      class Status
-        CONNECTING = 'Connecting'
-        CONNECTED  = 'Connected'
-        DISCONNECTED = 'Disconnected'
-      end
-    end
-  end
-end

data/lib/splitclient-rb/sse/workers/control_worker.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module SplitIoClient
-  module SSE
-    module Workers
-      class ControlWorker
-        def initialize(adapter, config)
-          @adapter = adapter
-          @config = config
-
-          perform_thread
-
-          perform_passenger_forked if defined?(PhusionPassenger)
-        end
-
-        private
-
-        def perform
-          # TODO: IMPLEMENT THIS METHOD
-        end
-
-        def perform_thread
-          @config.threads[:segment_update_worker] = Thread.new do
-            perform
-          end
-        end
-
-        def perform_passenger_forked
-          PhusionPassenger.on_event(:starting_worker_process) { |forked| perform_thread if forked }
-        end
-      end
-    end
-  end
-end