devcycle-ruby-server-sdk 2.0.3 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 960c105106387fcb10b360f0befbb77d2dda8c80dce5a51a5eed3c8c49528253
-  data.tar.gz: 1c9274022cece19d953ceba7adfed10cd6418e4a3097ad3305f1a539ace32e23
+  metadata.gz: bd92e3883469ddd7a7f1ca4a16012b1527d823c5d026db1830c597c32f740047
+  data.tar.gz: 6a064d33d9a4a3e260294a484c24e4c6f6899d70b226c2656726f7c1af7505f4
 SHA512:
-  metadata.gz: 67cb4a92cb5c9247bd10c838cfa0979d89d331c75c5626967af9b4602c55c30a2842f94f2c15471bb459686382be20432e43bf9951f1c27f516cbc5b2d8a504e
-  data.tar.gz: 802ec0ab8f6b2a7623fe58c94cd007484832c06c5742a38831bebd0991ef2c3b57cc99563ffcee89a545742c0fe1080beea95be01aab88f27983d5d808b359f1
+  metadata.gz: d566f41de3940df34ff782de63e05223bead0ca334fd8c31b59eeef074bf35dbefbcd03682fa178d709a0f637fa945f723b04eb80a3e80e794d2c05fa95cdd06
+  data.tar.gz: 7e8f10ff94003890b2350032ef06e997ec1aec81ce82c390fad9d762d47638166db61365b1040ad57944afc6f273122768cc94831623056167ef1b387a6c192d

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

@@ -32,8 +32,8 @@ module DevCycle
         @api_client.config.enable_edge_db = @dvc_options.enable_edge_db
         @api_client.config.logger = @logger
       else
-        @localbucketing = LocalBucketing.new(@sdkKey, dvc_options, wait_for_init)
-        @event_queue = EventQueue.new(@sdkKey, dvc_options.event_queue_options, @localbucketing)
+        @local_bucketing = LocalBucketing.new(@sdkKey, dvc_options, wait_for_init)
+        @event_queue = EventQueue.new(@sdkKey, dvc_options.event_queue_options, @local_bucketing)
       end
     end
 
@@ -42,15 +42,15 @@ module DevCycle
         @logger.info("Cloud Bucketing does not require closing.")
         return
       end
-      if @localbucketing != nil
-        if !@localbucketing.initialized
+      if @local_bucketing != nil
+        if !@local_bucketing.initialized
           @logger.info("Awaiting client initialization before closing")
-          while !@localbucketing.initialized
+          while !@local_bucketing.initialized
             sleep(0.5)
           end
         end
-        @localbucketing.close
-        @localbucketing = nil
+        @local_bucketing.close
+        @local_bucketing = nil
         @logger.info("Closed DevCycle Local Bucketing Engine.")
       end
 
@@ -65,7 +65,7 @@ module DevCycle
       end
 
       if local_bucketing_initialized?
-        @localbucketing.set_client_custom_data(customdata)
+        @local_bucketing.set_client_custom_data(customdata)
       else
         @logger.warn("Local bucketing not initialized. Unable to set client custom data.")
       end
@@ -93,8 +93,8 @@ module DevCycle
         return data
       end
 
-      if local_bucketing_initialized? && @localbucketing.has_config
-        bucketed_config = @localbucketing.generate_bucketed_config(user_data)
+      if local_bucketing_initialized? && @local_bucketing.has_config
+        bucketed_config = @local_bucketing.generate_bucketed_config(user_data)
         bucketed_config.features
       else
         {}
@@ -176,60 +176,38 @@ module DevCycle
         return data
       end
 
-      if local_bucketing_initialized? && @localbucketing.has_config
-        bucketed_config = @localbucketing.generate_bucketed_config(user_data)
-        variable_json = bucketed_config.variables[key]
+      value = default
+      type = determine_variable_type(default)
+      defaulted = true
+      if local_bucketing_initialized? && @local_bucketing.has_config
+        type_code = variable_type_code_from_type(type)
+        variable_json = variable_for_user(user_data, key, type_code)
         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,
-            type: determine_variable_type(default),
-            value: default,
-            defaultValue: default,
-            isDefaulted: true
-          })
+          @logger.warn("No variable found or type mismatch for key #{key}, returning default value")
+        else
+          value = variable_json['value']
+          defaulted = false
         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_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 })
+        bucketed_config = BucketedUserConfig.new({}, {}, {}, {}, {}, {}, [])
         @event_queue.queue_aggregate_event(variable_event, bucketed_config)
-
-        Variable.new({
-          key: key,
-          type: determine_variable_type(default),
-          value: default,
-          defaultValue: default,
-          isDefaulted: true
-        })
       end
+
+      Variable.new({
+        key: key,
+        value: value,
+        type: type,
+        defaultValue: default,
+        isDefaulted: defaulted
+      })
+    end
+
+    def variable_for_user(user, key, variable_type_code)
+      json_str = @local_bucketing.variable_for_user(user, key, variable_type_code)
+      return nil if json_str.nil?
+      JSON.parse(json_str)
     end
 
     # Get variable by key for user data
@@ -319,8 +297,8 @@ module DevCycle
         return data
       end
 
-      if local_bucketing_initialized? && @localbucketing.has_config
-        bucketed_config = @localbucketing.generate_bucketed_config(user_data)
+      if local_bucketing_initialized? && @local_bucketing.has_config
+        bucketed_config = @local_bucketing.generate_bucketed_config(user_data)
         bucketed_config.variables
       else
         {}
@@ -486,7 +464,7 @@ module DevCycle
     end
 
     def local_bucketing_initialized?
-      !@localbucketing.nil? && @localbucketing.initialized
+      !@local_bucketing.nil? && @local_bucketing.initialized
     end
 
     def determine_variable_type(variable_value)
@@ -502,5 +480,20 @@ module DevCycle
         raise ArgumentError, "Invalid type for variable: #{variable_value}"
       end
     end
+
+    def variable_type_code_from_type(type)
+      case type
+      when 'String'
+        @local_bucketing.variable_type_codes[:string]
+      when 'Boolean'
+        @local_bucketing.variable_type_codes[:boolean]
+      when 'Number'
+        @local_bucketing.variable_type_codes[:number]
+      when 'JSON'
+        @local_bucketing.variable_type_codes[:json]
+      else
+        raise ArgumentError.new("Invalid type for variable: #{type}")
+      end
+    end
   end
 end

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

@@ -1,5 +1,3 @@
-require 'oj'
-
 module DevCycle
   class DVCOptions
     attr_reader :config_polling_interval_ms

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

@@ -13,6 +13,7 @@ module DevCycle
     extend T::Sig
 
     attr_reader :options
+    attr_reader :variable_type_codes
     attr_accessor :initialized
     attr_accessor :has_config
 
@@ -48,6 +49,8 @@ module DevCycle
       result
     }
 
+    @@stack_tracer_raise = lambda { |message| raise message }
+    # each method reassigns stack_tracer so the call stack is properly displayed
     @@stack_tracer = lambda {}
 
     @@linker.func_new("env", "abort", [:i32, :i32, :i32, :i32], []) do |_caller, messagePtr, filenamePtr, lineNum, colNum|
@@ -91,6 +94,13 @@ module DevCycle
       @sdkkey = sdkkey
       @options = options
       @logger = options.logger
+      @wasm_mutex = Mutex.new
+      @variable_type_codes = {
+        boolean: @@instance.export("VariableType.Boolean").to_global.get.to_i,
+        string: @@instance.export("VariableType.String").to_global.get.to_i,
+        number: @@instance.export("VariableType.Number").to_global.get.to_i,
+        json: @@instance.export("VariableType.JSON").to_global.get.to_i
+      }
       set_sdk_key_internal(sdkkey)
       platform_data = PlatformData.new('server', VERSION, RUBY_VERSION, nil, 'Ruby', Socket.gethostname)
       set_platform_data(platform_data)
@@ -104,123 +114,158 @@ module DevCycle
 
     sig { params(user: UserData).returns(BucketedUserConfig) }
     def generate_bucketed_config(user)
-      user_addr = malloc_asc_string(user.to_json)
-      @@stack_tracer = lambda { |message| raise message }
-      config_addr = @@instance.invoke("generateBucketedConfigForUser", @sdkKeyAddr, user_addr)
-      bucketed_config_json = read_asc_string(config_addr)
-      bucketed_config_hash = Oj.load(bucketed_config_json)
-
-      BucketedUserConfig.new(bucketed_config_hash['project'],
-                             bucketed_config_hash['environment'],
-                             bucketed_config_hash['features'],
-                             bucketed_config_hash['featureVariationMap'],
-                             bucketed_config_hash['variableVariationMap'],
-                             bucketed_config_hash['variables'],
-                             bucketed_config_hash['knownVariableKeys'])
+      @wasm_mutex.synchronize do
+        user_addr = malloc_asc_string(user.to_json)
+        @@stack_tracer = @@stack_tracer_raise
+        config_addr = @@instance.invoke("generateBucketedConfigForUser", @sdkKeyAddr, user_addr)
+        bucketed_config_json = read_asc_string(config_addr)
+        bucketed_config_hash = Oj.load(bucketed_config_json)
+
+        BucketedUserConfig.new(bucketed_config_hash['project'],
+                              bucketed_config_hash['environment'],
+                              bucketed_config_hash['features'],
+                              bucketed_config_hash['featureVariationMap'],
+                              bucketed_config_hash['variableVariationMap'],
+                              bucketed_config_hash['variables'],
+                              bucketed_config_hash['knownVariableKeys'])
+      end
+    end
+
+    sig { params(user: UserData, key: String, variable_type: Integer).returns(T.nilable(String)) }
+    def variable_for_user(user, key, variable_type)
+      @wasm_mutex.synchronize do
+        user_addr = malloc_asc_string(user.to_json)
+        key_addr = malloc_asc_string(key)
+        @@stack_tracer = @@stack_tracer_raise
+        var_addr = @@instance.invoke("variableForUser", @sdkKeyAddr, user_addr, key_addr, variable_type, 1)
+        read_asc_string(var_addr)
+      end
     end
 
     sig { returns(T::Array[EventsPayload]) }
     def flush_event_queue
-      @@stack_tracer = lambda { |message| raise message }
-      payload_addr = @@instance.invoke("flushEventQueue", @sdkKeyAddr)
-      raw_json = read_asc_string(payload_addr)
-      raw_payloads = Oj.load(raw_json)
-
-      if raw_payloads == nil
-        return []
+      @wasm_mutex.synchronize do
+        @@stack_tracer = @@stack_tracer_raise
+        payload_addr = @@instance.invoke("flushEventQueue", @sdkKeyAddr)
+        raw_json = read_asc_string(payload_addr)
+        raw_payloads = Oj.load(raw_json)
+
+        if raw_payloads == nil
+          return []
+        end
+        raw_payloads.map { |raw_payload| EventsPayload.new(raw_payload["records"], raw_payload["payloadId"], raw_payload["eventCount"]) }
       end
-      raw_payloads.map { |raw_payload| EventsPayload.new(raw_payload["records"], raw_payload["payloadId"], raw_payload["eventCount"]) }
     end
 
     sig { returns(Integer) }
     def check_event_queue_size
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("eventQueueSize", @sdkKeyAddr)
+      @wasm_mutex.synchronize do
+        @@stack_tracer = @@stack_tracer_raise
+        @@instance.invoke("eventQueueSize", @sdkKeyAddr)
+      end
     end
 
     sig { params(payload_id: String).returns(NilClass) }
     def on_payload_success(payload_id)
-      payload_addr = malloc_asc_string(payload_id)
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("onPayloadSuccess", @sdkKeyAddr, payload_addr)
+      @wasm_mutex.synchronize do
+        payload_addr = malloc_asc_string(payload_id)
+        @@stack_tracer = @@stack_tracer_raise
+        @@instance.invoke("onPayloadSuccess", @sdkKeyAddr, payload_addr)
+      end
+    end
+
+    sig { params(payload_id: String, retryable: Object).returns(NilClass) }
+    def on_payload_failure(payload_id, retryable)
+      @wasm_mutex.synchronize do
+        payload_addr = malloc_asc_string(payload_id)
+        @@stack_tracer = @@stack_tracer_raise
+        @@instance.invoke("onPayloadFailure", @sdkKeyAddr, payload_addr, retryable ? 1 : 0)
+      end
     end
 
     sig { params(user: UserData, event: Event).returns(NilClass) }
     def queue_event(user, event)
-      begin
-        user_addr = malloc_asc_string(Oj.dump(user))
-        asc_pin(user_addr)
-        event_addr = malloc_asc_string(Oj.dump(event))
-        @@stack_tracer = lambda { |message| raise message }
-        @@instance.invoke("queueEvent", @sdkKeyAddr, user_addr, event_addr)
-      ensure
-        asc_unpin(user_addr)
+      @wasm_mutex.synchronize do
+        begin
+          user_addr = malloc_asc_string(user.to_json)
+          asc_pin(user_addr)
+          event_addr = malloc_asc_string(event.to_json)
+          @@stack_tracer = @@stack_tracer_raise
+          @@instance.invoke("queueEvent", @sdkKeyAddr, user_addr, event_addr)
+        ensure
+          asc_unpin(user_addr)
+        end
       end
     end
 
     sig { params(event: Event, bucketeduser: T.nilable(BucketedUserConfig)).returns(NilClass) }
     def queue_aggregate_event(event, bucketeduser)
-      begin
-        variable_variation_map =
-          if !bucketeduser.nil?
-            bucketeduser.variable_variation_map
-          else
-            {}
-          end
-        varmap_addr = malloc_asc_string(Oj.dump(variable_variation_map))
-        asc_pin(varmap_addr)
-        event_addr = malloc_asc_string(Oj.dump(event))
-        @@stack_tracer = lambda { |message| raise message }
-        @@instance.invoke("queueAggregateEvent", @sdkKeyAddr, event_addr, varmap_addr)
-      ensure
-        asc_unpin(varmap_addr)
+      @wasm_mutex.synchronize do
+        begin
+          variable_variation_map =
+            if !bucketeduser.nil?
+              bucketeduser.variable_variation_map
+            else
+              {}
+            end
+          varmap_addr = malloc_asc_string(Oj.dump(variable_variation_map))
+          asc_pin(varmap_addr)
+          event_addr = malloc_asc_string(event.to_json)
+          @@stack_tracer = @@stack_tracer_raise
+          @@instance.invoke("queueAggregateEvent", @sdkKeyAddr, event_addr, varmap_addr)
+        ensure
+          asc_unpin(varmap_addr)
+        end
       end
     end
 
-    sig { params(payload_id: String, retryable: Object).returns(NilClass) }
-    def on_payload_failure(payload_id, retryable)
-      payload_addr = malloc_asc_string(payload_id)
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("onPayloadFailure", @sdkKeyAddr, payload_addr, retryable ? 1 : 0)
-    end
-
     sig { params(config: String).returns(NilClass) }
     def store_config(config)
-      config_addr = malloc_asc_string(config)
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("setConfigData", @sdkKeyAddr, config_addr)
+      @wasm_mutex.synchronize do
+        config_addr = malloc_asc_string(config)
+        @@stack_tracer = @@stack_tracer_raise
+        @@instance.invoke("setConfigData", @sdkKeyAddr, config_addr)
+      end
     end
 
     sig { params(options: EventQueueOptions).returns(NilClass) }
     def init_event_queue(options)
-      options_json = Oj.dump(options)
-      options_addr = malloc_asc_string(options_json)
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("initEventQueue", @sdkKeyAddr, options_addr)
+      @wasm_mutex.synchronize do
+        options_json = Oj.dump(options)
+        options_addr = malloc_asc_string(options_json)
+        @@stack_tracer = @@stack_tracer_raise
+        @@instance.invoke("initEventQueue", @sdkKeyAddr, options_addr)
+      end
     end
 
     sig { params(customdata: Hash).returns(NilClass) }
     def set_client_custom_data(customdata)
-      customdata_json = Oj.dump(customdata)
-      customdata_addr = malloc_asc_string(customdata_json)
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("setClientCustomData", customdata_addr)
+      @wasm_mutex.synchronize do
+        customdata_json = Oj.dump(customdata)
+        customdata_addr = malloc_asc_string(customdata_json)
+        @@stack_tracer = @@stack_tracer_raise
+        @@instance.invoke("setClientCustomData", @sdkKeyAddr, customdata_addr)
+      end
     end
 
     private
 
     sig { params(platformdata: PlatformData).returns(NilClass) }
     def set_platform_data(platformdata)
-      platformdata_json = Oj.dump(platformdata)
-      platformdata_addr = malloc_asc_string(platformdata_json)
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("setPlatformData", platformdata_addr)
+      @wasm_mutex.synchronize do
+        platformdata_json = Oj.dump(platformdata)
+        platformdata_addr = malloc_asc_string(platformdata_json)
+        @@stack_tracer = @@stack_tracer_raise
+        @@instance.invoke("setPlatformData", platformdata_addr)
+      end
     end
 
     def set_sdk_key_internal(sdkKey)
-      addr = malloc_asc_string(sdkKey)
-      @sdkKeyAddr = addr
-      asc_pin(addr)
+      @wasm_mutex.synchronize do
+        addr = malloc_asc_string(sdkKey)
+        @sdkKeyAddr = addr
+        asc_pin(addr)
+      end
     end
 
     def asc_pin(addr)
@@ -236,7 +281,7 @@ module DevCycle
     sig { params(string: String).returns(Integer) }
     def malloc_asc_string(string)
       wasm_object_id = 1
-      @@stack_tracer = lambda { |message| raise message }
+      @@stack_tracer = @@stack_tracer_raise
       wasm_new = @@instance.export("__new").to_func
       utf8_bytes = string.bytes
       byte_len = utf8_bytes.length
@@ -244,8 +289,8 @@ module DevCycle
       start_addr = wasm_new.call(byte_len * 2, wasm_object_id)
       i = 0
       while i < byte_len
-        @@stack_tracer = lambda { |message| raise message }
-        @@memory.write(start_addr + (i * 2), [utf8_bytes[i]].pack('U'))
+        @@stack_tracer = @@stack_tracer_raise
+        @@memory.write(start_addr + (i * 2), [utf8_bytes[i]].pack('c'))
         i += 1
       end
       start_addr
@@ -253,23 +298,23 @@ module DevCycle
 
     # @param [Integer] address start address of string.
     # @return [String] resulting string
-    sig { params(address: Integer).returns(String) }
+    sig { params(address: Integer).returns(T.nilable(String)) }
     def read_asc_string(address)
-      @@stack_tracer = lambda { |message| raise message }
+      if address == 0
+        @logger.debug("null address passed to read_asc_string")
+        return nil
+      end
+
+      @@stack_tracer = @@stack_tracer_raise
       raw_bytes = @@memory.read(address - 4, 4).bytes.reverse
       len = 0
       raw_bytes.each { |j|
         len = (len << 8) + (j & 0xFF)
       }
-      result = ""
-      i = 0
-      while i < len
-        @@stack_tracer = lambda { |message| raise message }
-        result += @@memory.read(address + i, 1)
-        i += 2
-      end
-      result
+
+      @@stack_tracer = @@stack_tracer_raise
+      result = @@memory.read(address, len).bytes
+      result.select.with_index { |_, i| i.even? }.pack('c*')
     end
   end
 end
-

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

@@ -12,6 +12,7 @@ OpenAPI Generator version: 5.3.0
 
 require 'date'
 require 'time'
+require 'oj'
 
 module DevCycle
   class Event
@@ -259,6 +260,9 @@ module DevCycle
       end
     end
 
+    def to_json
+      Oj.dump(to_hash, mode: :json)
+    end
   end
 
 end

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

@@ -17,9 +17,6 @@ require 'oj'
 module DevCycle
   class UserData
 
-    def to_json
-      Oj.dump(self)
-    end
     # Unique id to identify the user
     attr_accessor :user_id
 
@@ -414,5 +411,9 @@ module DevCycle
         value
       end
     end
+
+    def to_json
+      Oj.dump(to_hash, mode: :json)
+    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.3'
+  VERSION = '2.1.1'
 end

metadata

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