devcycle-ruby-server-sdk 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86e5a04ee7157791c8ed075df281ecc09bad3ae898c7e48d520046953ed5aee7
-  data.tar.gz: 44271e4418ab7b2219403d9a90bbc702befabb034446bc58a2f32a365038f9cb
+  metadata.gz: 960c105106387fcb10b360f0befbb77d2dda8c80dce5a51a5eed3c8c49528253
+  data.tar.gz: 1c9274022cece19d953ceba7adfed10cd6418e4a3097ad3305f1a539ace32e23
 SHA512:
-  metadata.gz: f5946e97ac8b2d0abda40af307609035945e1881587edc5d1d37c01fc1f75e9e0461527f3c232713ba0c839834b2447e4ab95a3f7a471e314fe28c01c15f3281
-  data.tar.gz: 147519317a620feef9d975bcb3a5cb844c94e03b7f6fb8631d34e98b57b770a5994c4324dd9c1359e7e744b0b5652f6a5f612fdbc0f68a600816187717b22c43
+  metadata.gz: 67cb4a92cb5c9247bd10c838cfa0979d89d331c75c5626967af9b4602c55c30a2842f94f2c15471bb459686382be20432e43bf9951f1c27f516cbc5b2d8a504e
+  data.tar.gz: 802ec0ab8f6b2a7623fe58c94cd007484832c06c5742a38831bebd0991ef2c3b57cc99563ffcee89a545742c0fe1080beea95be01aab88f27983d5d808b359f1

data/lib/devcycle-ruby-server-sdk/api/devcycle_api.rb

@@ -60,10 +60,16 @@ module DevCycle
     end
 
     def set_client_custom_data(customdata)
-      if @api_client.config.enable_cloud_bucketing
-        fail ArgumentError("Client Custom Data is only available in Local bucketing mode.")
+      if @dvc_options.enable_cloud_bucketing
+        raise StandardError.new("Client Custom Data is only available in Local bucketing mode.")
+      end
+
+      if local_bucketing_initialized?
+        @localbucketing.set_client_custom_data(customdata)
+      else
+        @logger.warn("Local bucketing not initialized. Unable to set client custom data.")
       end
-      @localbucketing.set_client_custom_data(customdata)
+      nil
     end
 
     def validate_model(model)
@@ -87,7 +93,7 @@ module DevCycle
         return data
       end
 
-      if local_bucketing_initialized?
+      if local_bucketing_initialized? && @localbucketing.has_config
         bucketed_config = @localbucketing.generate_bucketed_config(user_data)
         bucketed_config.features
       else
@@ -170,30 +176,59 @@ module DevCycle
         return data
       end
 
-      if local_bucketing_initialized?
+      if local_bucketing_initialized? && @localbucketing.has_config
         bucketed_config = @localbucketing.generate_bucketed_config(user_data)
         variable_json = bucketed_config.variables[key]
         if variable_json == nil
+          @logger.warn("No variable found for key #{key}, returning default value")
           variable_event = Event.new({ type: DevCycle::EventTypes[:agg_variable_defaulted], target: key })
           @event_queue.queue_aggregate_event(variable_event, bucketed_config)
 
-          return Variable.new({ key: key, value: default, isDefaulted: true })
+          return Variable.new({
+            key: key,
+            type: determine_variable_type(default),
+            value: default,
+            defaultValue: default,
+            isDefaulted: true
+          })
         end
+        default_type = determine_variable_type(default)
+        variable_type = variable_json['type']
+        if default_type != variable_type
+          @logger.warn("Type mismatch for variable #{key}, returning default value")
+          variable_event = Event.new({ type: DevCycle::EventTypes[:agg_variable_defaulted], target: key })
+          @event_queue.queue_aggregate_event(variable_event, bucketed_config)
 
+          return Variable.new({
+            key: key,
+            type: default_type,
+            value: default,
+            defaultValue: default,
+            isDefaulted: true
+          })
+        end
         variable_event = Event.new({ type: DevCycle::EventTypes[:agg_variable_evaluated], target: key })
         @event_queue.queue_aggregate_event(variable_event, bucketed_config)
 
         Variable.new({
-                       key: key,
-                       type: variable_json['type'],
-                       value: variable_json['value'],
-                       isDefaulted: false
-                     })
+          key: key,
+          type: variable_type,
+          value: variable_json['value'],
+          defaultValue: default,
+          isDefaulted: false
+        })
       else
+        @logger.warn("Local bucketing not initialized, returning default value for variable #{key}")
         variable_event = Event.new({ type: DevCycle::EventTypes[:agg_variable_defaulted], target: key })
         @event_queue.queue_aggregate_event(variable_event, bucketed_config)
 
-        Variable.new({ key: key, value: default, isDefaulted: true })
+        Variable.new({
+          key: key,
+          type: determine_variable_type(default),
+          value: default,
+          defaultValue: default,
+          isDefaulted: true
+        })
       end
     end
 
@@ -284,7 +319,7 @@ module DevCycle
         return data
       end
 
-      if local_bucketing_initialized?
+      if local_bucketing_initialized? && @localbucketing.has_config
         bucketed_config = @localbucketing.generate_bucketed_config(user_data)
         bucketed_config.variables
       else
@@ -453,5 +488,19 @@ module DevCycle
     def local_bucketing_initialized?
       !@localbucketing.nil? && @localbucketing.initialized
     end
+
+    def determine_variable_type(variable_value)
+      if variable_value.is_a?(String)
+        'String'
+      elsif variable_value.is_a?(TrueClass) || variable_value.is_a?(FalseClass)
+        'Boolean'
+      elsif variable_value.is_a?(Integer) || variable_value.is_a?(Float)
+        'Number'
+      elsif variable_value.is_a?(Hash)
+        'JSON'
+      else
+        raise ArgumentError, "Invalid type for variable: #{variable_value}"
+      end
+    end
   end
 end

data/lib/devcycle-ruby-server-sdk/localbucketing/config_manager.rb

@@ -20,19 +20,33 @@ module DevCycle
       @sdkKey = sdkKey
       @config_e_tag = ""
       @logger = local_bucketing.options.logger
+      @polling_enabled = true
+      @max_config_retries = 2
 
-      @config_poller = Concurrent::TimerTask.new(
-        {
+      @config_poller = Concurrent::TimerTask.new({
           execution_interval: @local_bucketing.options.config_polling_interval_ms.fdiv(1000)
         }) do |task|
-        fetch_config(false, task)
+        fetch_config
       end
 
-      t = Thread.new { fetch_config(false, nil) }
+      t = Thread.new { initialize_config }
       t.join if wait_for_init
     end
 
-    def fetch_config(retrying, task)
+    def initialize_config
+      begin
+        fetch_config
+        @config_poller.execute if @polling_enabled
+      rescue => e
+        @logger.error("DVC Error Initializing Config: #{e.message}")
+      ensure
+        @local_bucketing.initialized = true
+      end
+    end
+
+    def fetch_config
+      return unless @polling_enabled
+
       req = Typhoeus::Request.new(
         get_config_url,
         headers: {
@@ -43,25 +57,26 @@ module DevCycle
         req.options[:headers]['If-None-Match'] = @config_e_tag
       end
 
-      resp = req.run
-
-      case resp.code
-      when 304
-        return nil
-      when 200
-        return set_config(resp.body, resp.headers['Etag'])
-      when 403
-        raise("Failed to download DevCycle config; Invalid SDK Key.")
-      when 500...599
-        if !retrying
-          return fetch_config(true, task)
+      @max_config_retries.times do
+        resp = req.run
+        case resp.code
+        when 304
+          @logger.debug("Config not modified, using cache, etag: #{this.configEtag}")
+          return
+        when 200
+          set_config(resp.body, resp.headers['Etag'])
+          return
+        when 403
+          stop_polling
+          @logger.error("Failed to download DevCycle config; Invalid SDK Key.")
+          return
+        when 500...599
+          @logger.error("Failed to download DevCycle config. Status: #{resp.code}")
+        else
+          stop_polling
+          @logger.error("Unexpected response code - DevCycle Response: #{Oj.dump(resp)}")
+          return
         end
-        @logger.warn("Failed to download DevCycle config. Status: #{resp.code}")
-      else
-        if task != nil
-          task.shutdown
-        end
-        raise("Unexpected response code - DevCycle Response: #{Oj.dump(resp)}")
       end
 
       nil
@@ -74,13 +89,7 @@ module DevCycle
 
       @local_bucketing.store_config(config)
       @config_e_tag = etag
-
-      if @first_load
-        @logger.info("Config Set. Client Initialized.")
-        @first_load = false
-        @local_bucketing.initialized = true
-        @config_poller.execute
-      end
+      @local_bucketing.has_config = true
     end
 
     def get_config_url
@@ -88,8 +97,13 @@ module DevCycle
       "#{configBasePath}/config/#{@config_version}/server/#{@sdkKey}.json"
     end
 
+    def stop_polling
+      @polling_enabled = false
+      @config_poller.shutdown if @config_poller.running?
+    end
+
     def close
-      @config_poller.shutdown
+      @config_poller.shutdown if @config_poller.running?
       nil
     end
   end

data/lib/devcycle-ruby-server-sdk/localbucketing/local_bucketing.rb

@@ -14,6 +14,7 @@ module DevCycle
 
     attr_reader :options
     attr_accessor :initialized
+    attr_accessor :has_config
 
     @@rand = Random.new(seed = Random.new_seed)
     @@engine = Wasmtime::Engine.new
@@ -86,18 +87,19 @@ module DevCycle
     ).void }
     def initialize(sdkkey, options, wait_for_init)
       @initialized = false
+      @has_config = false
       @sdkkey = sdkkey
       @options = options
       @logger = options.logger
       set_sdk_key_internal(sdkkey)
       platform_data = PlatformData.new('server', VERSION, RUBY_VERSION, nil, 'Ruby', Socket.gethostname)
       set_platform_data(platform_data)
-      @configmanager = ConfigManager.new(@sdkkey, self, wait_for_init)
+      @config_manager = ConfigManager.new(@sdkkey, self, wait_for_init)
     end
 
     def close
-      @configmanager.close
-      @configmanager = nil
+      @config_manager.close
+      @config_manager = nil
     end
 
     sig { params(user: UserData).returns(BucketedUserConfig) }
@@ -236,7 +238,7 @@ module DevCycle
       wasm_object_id = 1
       @@stack_tracer = lambda { |message| raise message }
       wasm_new = @@instance.export("__new").to_func
-      utf8_bytes = string.encode("iso-8859-1").force_encoding("utf-8").bytes
+      utf8_bytes = string.bytes
       byte_len = utf8_bytes.length
 
       start_addr = wasm_new.call(byte_len * 2, wasm_object_id)

data/lib/devcycle-ruby-server-sdk/models/variable.rb

@@ -27,6 +27,8 @@ module DevCycle
     # Set to true if the Variable could not be fetched
     attr_accessor :isDefaulted
 
+    attr_accessor :defaultValue
+
     class EnumAttributeValidator
       attr_reader :datatype
       attr_reader :allowable_values
@@ -55,6 +57,7 @@ module DevCycle
         :'key' => :'key',
         :'type' => :'type',
         :'value' => :'value',
+        :'defaultValue' => :'defaultValue',
         :'isDefaulted' => :'isDefaulted'
       }
     end
@@ -70,6 +73,7 @@ module DevCycle
         :'key' => :'String',
         :'type' => :'String',
         :'value' => :'Object',
+        :'defaultValue' => :'Object',
         :'isDefaulted' => :'Boolean'
       }
     end
@@ -112,6 +116,10 @@ module DevCycle
       else
         self.isDefaulted = false
       end
+
+      if attributes.key?(:'defaultValue')
+        self.defaultValue = attributes[:'defaultValue']
+      end
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
@@ -296,7 +304,5 @@ module DevCycle
         value
       end
     end
-
   end
-
 end

data/lib/devcycle-ruby-server-sdk/version.rb

@@ -11,5 +11,5 @@ OpenAPI Generator version: 5.3.0
 =end
 
 module DevCycle
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devcycle-ruby-server-sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - DevCycleHQ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus