devcycle-ruby-server-sdk 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0fd57c7d492253c2a5aed803845d028057f5075f33ed40b7cd31d6862bd7b2
-  data.tar.gz: 3cf436a16d4ae282192e77687fccaf17d3346b1facb364a26f4ae932ed658140
+  metadata.gz: 86e5a04ee7157791c8ed075df281ecc09bad3ae898c7e48d520046953ed5aee7
+  data.tar.gz: 44271e4418ab7b2219403d9a90bbc702befabb034446bc58a2f32a365038f9cb
 SHA512:
-  metadata.gz: 8e463d4849b50cfd4a346e252909d968f2a41ed31e3bac91de33ad968ecca3afd0ceefb1243cb3326049853894502f8979cd8574fa81bc12cbc9cf66ea34edfb
-  data.tar.gz: f9467f2c7ad852e18b9de9bba1a96a73b55febe9ab25d64571e09e19ab9dac394a965d543f77c3aed44a4a1719368c677151d016ca8ba0c0772d2592a78489cf
+  metadata.gz: f5946e97ac8b2d0abda40af307609035945e1881587edc5d1d37c01fc1f75e9e0461527f3c232713ba0c839834b2447e4ab95a3f7a471e314fe28c01c15f3281
+  data.tar.gz: 147519317a620feef9d975bcb3a5cb844c94e03b7f6fb8631d34e98b57b770a5994c4324dd9c1359e7e744b0b5652f6a5f612fdbc0f68a600816187717b22c43

data/devcycle-ruby-server-sdk.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'typhoeus', '~> 1.0', '>= 1.0.1'
   s.add_runtime_dependency 'wasmtime', '5.0.0'
-  s.add_runtime_dependency 'concurrent-ruby', '1.2.0'
-  s.add_runtime_dependency 'sorbet-runtime', '0.5.10648'
+  s.add_runtime_dependency 'concurrent-ruby', '~> 1.2.0'
+  s.add_runtime_dependency 'sorbet-runtime', '~> 0.5'
   s.add_runtime_dependency 'oj', '3.13.2'
 
 

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

@@ -17,9 +17,9 @@ module DevCycle
   class DVCClient
     def initialize(sdkKey, dvc_options = DVCOptions.new, wait_for_init = false)
       if sdkKey.nil?
-        raise ArgumentError('Missing SDK key!')
+        raise ArgumentError.new('Missing SDK key!')
       elsif !sdkKey.start_with?('server') && !sdkKey.start_with?('dvc_server')
-        raise ArgumentError('Invalid SDK key!')
+        raise ArgumentError.new('Invalid SDK key!')
       end
 
       @sdkKey = sdkKey
@@ -56,6 +56,7 @@ module DevCycle
 
       @event_queue.close
       @logger.info("Closed DevCycle Client.")
+      nil
     end
 
     def set_client_custom_data(customdata)

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

@@ -23,8 +23,7 @@ module DevCycle
 
       @config_poller = Concurrent::TimerTask.new(
         {
-          execution_interval: @local_bucketing.options.config_polling_interval_ms.fdiv(1000),
-          run_now: true
+          execution_interval: @local_bucketing.options.config_polling_interval_ms.fdiv(1000)
         }) do |task|
         fetch_config(false, task)
       end
@@ -73,7 +72,7 @@ module DevCycle
         raise("Invalid JSON body parsed from Config Response")
       end
 
-      @local_bucketing.store_config(@sdkKey, config)
+      @local_bucketing.store_config(config)
       @config_e_tag = etag
 
       if @first_load

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

@@ -12,15 +12,16 @@ module DevCycle
 
     def initialize(
       enable_cloud_bucketing: false,
-      event_flush_interval_ms: 10 * 1000,
+      event_flush_interval_ms: 10_000,
       disable_custom_event_logging: false,
       disable_automatic_event_logging: false,
-      config_polling_interval_ms: 10000,
-      request_timeout_ms: 5000,
-      max_event_queue_size: 2000,
-      flush_event_queue_size: 1000,
+      config_polling_interval_ms: 10_000,
+      request_timeout_ms: 5_000,
+      max_event_queue_size: 2_000,
+      flush_event_queue_size: 1_000,
       event_request_chunk_size: 100,
       logger: nil,
+      config_cdn_uri: 'https://config-cdn.devcycle.com',
       events_api_uri: 'https://events.devcycle.com',
       enable_edge_db: false
     )
@@ -34,8 +35,7 @@ module DevCycle
       end
 
       if config_polling_interval_ms < 1000
-        @logger.warn('config_polling_interval cannot be less than 1000ms, defaulting to 10000ms')
-        config_polling_interval_ms = 10000
+        raise ArgumentError.new('config_polling_interval cannot be less than 1000ms')
       end
       @config_polling_interval_ms = config_polling_interval_ms
 
@@ -51,15 +51,21 @@ module DevCycle
       @event_flush_interval_ms = event_flush_interval_ms
 
       if flush_event_queue_size >= max_event_queue_size
-        raise ArgumentError.new("flush_event_queue_size: #{flush_event_queue_size} must be " +
-          "smaller than max_event_queue_size: #{@max_event_queue_size}")
+        raise ArgumentError.new(
+          "flush_event_queue_size: #{flush_event_queue_size} must be " +
+          "smaller than max_event_queue_size: #{@max_event_queue_size}"
+        )
       elsif flush_event_queue_size < event_request_chunk_size || max_event_queue_size < event_request_chunk_size
-        throw ArgumentError.new("flush_event_queue_size: #{flush_event_queue_size} and " +
+        throw ArgumentError.new(
+          "flush_event_queue_size: #{flush_event_queue_size} and " +
           "max_event_queue_size: #{max_event_queue_size} " +
-          "must be larger than event_request_chunk_size: #{event_request_chunk_size}")
+          "must be larger than event_request_chunk_size: #{event_request_chunk_size}"
+        )
       elsif flush_event_queue_size > 20000 || max_event_queue_size > 20000
-        raise ArgumentError.new("flush_event_queue_size: #{flush_event_queue_size} or " +
-          "max_event_queue_size: #{max_event_queue_size} must be smaller than 20,000")
+        raise ArgumentError.new(
+          "flush_event_queue_size: #{flush_event_queue_size} or " +
+          "max_event_queue_size: #{max_event_queue_size} must be smaller than 20,000"
+        )
       end
       @flush_event_queue_size = flush_event_queue_size
       @max_event_queue_size = max_event_queue_size
@@ -67,7 +73,7 @@ module DevCycle
 
       @disable_custom_event_logging = disable_custom_event_logging
       @disable_automatic_event_logging = disable_automatic_event_logging
-      @config_cdn_uri = "https://config-cdn.devcycle.com"
+      @config_cdn_uri = config_cdn_uri
       @events_api_uri = events_api_uri
       @bucketing_api_uri = "https://bucketing-api.devcyle.com"
     end

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

@@ -14,21 +14,15 @@ module DevCycle
       @event_flush_interval_ms = options.event_flush_interval_ms
       @flush_event_queue_size = options.flush_event_queue_size
       @max_event_queue_size = options.max_event_queue_size
-
       @flush_timer_task = Concurrent::TimerTask.new(
-        execution_interval: @event_flush_interval_ms.fdiv(1000),
-        run_now: true
+        execution_interval: @event_flush_interval_ms.fdiv(1000)
       ) {
         flush_events
       }
       @flush_timer_task.execute
-      @flush_timer_task.add_observer(FlushTimerTaskObserver.new)
-
+      @flush_mutex = Mutex.new
       @local_bucketing = local_bucketing
       @local_bucketing.init_event_queue(options)
-
-      @flush_mutex = Mutex.new
-      nil
     end
 
     def close
@@ -50,7 +44,7 @@ module DevCycle
           begin
             response = Typhoeus.post(
               @events_api_uri + '/v1/events/batch',
-              headers: { 'Authorization': @sdkKey },
+              headers: { 'Authorization': @sdkKey, 'Content-Type': 'application/json' },
               body: { 'batch': payload.records }.to_json
             )
             if response.code != 201
@@ -104,17 +98,4 @@ module DevCycle
       false
     end
   end
-
-  # Todo: remove when done testing
-  class FlushTimerTaskObserver
-    def update(time, result, ex)
-      return if ex.nil?
-
-      if ex.is_a?(Concurrent::TimeoutError)
-        print("DVC FlushTimerTaskObserver: Execution timed out")
-      else
-        print("DVC FlushTimerTaskObserver: Execution failed with error: #{ex}")
-      end
-    end
-  end
 end

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

@@ -89,7 +89,7 @@ module DevCycle
       @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)
@@ -102,12 +102,12 @@ module DevCycle
 
     sig { params(user: UserData).returns(BucketedUserConfig) }
     def generate_bucketed_config(user)
-      sdkkey_addr = malloc_asc_string(@sdkkey)
       user_addr = malloc_asc_string(user.to_json)
       @@stack_tracer = lambda { |message| raise message }
-      config_addr = @@instance.invoke("generateBucketedConfigForUser", sdkkey_addr, user_addr)
+      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'],
@@ -119,9 +119,8 @@ module DevCycle
 
     sig { returns(T::Array[EventsPayload]) }
     def flush_event_queue
-      sdkkey_addr = malloc_asc_string(@sdkkey)
       @@stack_tracer = lambda { |message| raise message }
-      payload_addr = @@instance.invoke("flushEventQueue", sdkkey_addr)
+      payload_addr = @@instance.invoke("flushEventQueue", @sdkKeyAddr)
       raw_json = read_asc_string(payload_addr)
       raw_payloads = Oj.load(raw_json)
 
@@ -133,66 +132,69 @@ module DevCycle
 
     sig { returns(Integer) }
     def check_event_queue_size
-      sdkkey_addr = malloc_asc_string(@sdkkey)
       @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("eventQueueSize", sdkkey_addr)
+      @@instance.invoke("eventQueueSize", @sdkKeyAddr)
     end
 
     sig { params(payload_id: String).returns(NilClass) }
     def on_payload_success(payload_id)
-      sdkkey_addr = malloc_asc_string(@sdkkey)
       payload_addr = malloc_asc_string(payload_id)
       @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("onPayloadSuccess", sdkkey_addr, payload_addr)
+      @@instance.invoke("onPayloadSuccess", @sdkKeyAddr, payload_addr)
     end
 
     sig { params(user: UserData, event: Event).returns(NilClass) }
     def queue_event(user, event)
-      sdkkey_addr = malloc_asc_string(@sdkkey)
-      user_addr = malloc_asc_string(Oj.dump(user))
-      event_addr = malloc_asc_string(Oj.dump(event))
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("queueEvent", sdkkey_addr, user_addr, event_addr)
+      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)
+      end
     end
 
     sig { params(event: Event, bucketeduser: T.nilable(BucketedUserConfig)).returns(NilClass) }
     def queue_aggregate_event(event, bucketeduser)
-      sdkkey_addr = malloc_asc_string(@sdkkey)
-      variable_variation_map =
-      if !bucketeduser.nil?
-        bucketeduser.variable_variation_map 
-      else
-        {}
+      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)
       end
-      varmap_addr = malloc_asc_string(Oj.dump(variable_variation_map))
-      event_addr = malloc_asc_string(Oj.dump(event))
-      @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("queueAggregateEvent", sdkkey_addr, event_addr, varmap_addr)
     end
 
     sig { params(payload_id: String, retryable: Object).returns(NilClass) }
     def on_payload_failure(payload_id, retryable)
-      sdkkey_addr = malloc_asc_string(@sdkkey)
       payload_addr = malloc_asc_string(payload_id)
       @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("onPayloadFailure", sdkkey_addr, payload_addr, retryable ? 1 : 0)
+      @@instance.invoke("onPayloadFailure", @sdkKeyAddr, payload_addr, retryable ? 1 : 0)
     end
 
-    sig { params(sdkkey: String, config: String).returns(NilClass) }
-    def store_config(sdkkey, config)
-      sdkkey_addr = malloc_asc_string(sdkkey)
+    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", sdkkey_addr, config_addr)
+      @@instance.invoke("setConfigData", @sdkKeyAddr, config_addr)
     end
 
     sig { params(options: EventQueueOptions).returns(NilClass) }
     def init_event_queue(options)
       options_json = Oj.dump(options)
-      sdkkey_addr = malloc_asc_string(@sdkkey)
       options_addr = malloc_asc_string(options_json)
       @@stack_tracer = lambda { |message| raise message }
-      @@instance.invoke("initEventQueue", sdkkey_addr, options_addr)
+      @@instance.invoke("initEventQueue", @sdkKeyAddr, options_addr)
     end
 
     sig { params(customdata: Hash).returns(NilClass) }
@@ -213,6 +215,20 @@ module DevCycle
       @@instance.invoke("setPlatformData", platformdata_addr)
     end
 
+    def set_sdk_key_internal(sdkKey)
+      addr = malloc_asc_string(sdkKey)
+      @sdkKeyAddr = addr
+      asc_pin(addr)
+    end
+
+    def asc_pin(addr)
+      @@instance.invoke("__pin", addr)
+    end
+
+    def asc_unpin(addr)
+      @@instance.invoke("__unpin", addr)
+    end
+
     # @param [String] string utf8 string to allocate
     # @return [Integer] address to WASM String
     sig { params(string: String).returns(Integer) }

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devcycle-ruby-server-sdk
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - DevCycleHQ
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -48,30 +48,30 @@ dependencies:
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sorbet-runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.10648
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.10648
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement