amplitude-experiment 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e894e7e7ccce306d33d5078ae57fe08fb6a21ecb33e6be30f87c71a7bf119e93
-  data.tar.gz: '08a1e613c0eca928c2d4b5ac7c98e7eddc7a35df497c8b0b31881f51b060245b'
+  metadata.gz: 63ef7a08ffb4bb4b179da3f088c12598d2212ba7edd35a2f48ebb029420f33c0
+  data.tar.gz: c46a6553343175e1bda5287907f565009217b58a97b611684eb5afe073ea58ab
 SHA512:
-  metadata.gz: 4fe44dce88027b7d5e1912126a342bab21732e9657d5dadf46c533ea4f156f4d9aed81e97765e05ddcae2cb4ac703355e9b6e856fc2d2cbeb3a01ada5a3121ac
-  data.tar.gz: b51fc6e95b72c063bcd7572c7a13220e1ee2a2e164d5d4307d8a194ab77ef2892a24edff30b5dd61277baf124d488b5449c87dd5c5c6eb0b619b5e2be0b14b84
+  metadata.gz: f127b8d728912018fa3d4f2a96c091f474f71b38d5f4d72ca06076f52204c6999511a2e65f2f43ba1ad7ab4f92906ba3c827343bf7c1af0085d766b46df6f8ba
+  data.tar.gz: 29d5c170df67401d9f43f8a2fa5c689693ef535cb4977aa799fc6c3d61194df304d203f2dfd5b921a8cb3ff0b32defeaa4b064d370886b410f2e4bc1260f03cb

data/lib/experiment/cookie.rb

@@ -1,4 +1,5 @@
 require 'base64'
+require 'json'
 
 module AmplitudeExperiment
   # This class provides utility functions for parsing and handling identity from Amplitude cookies.
@@ -6,9 +7,17 @@ module AmplitudeExperiment
     # Get the cookie name that Amplitude sets for the provided
     #
     # @param [String] api_key The Amplitude API Key
+    # @param [Boolean] new_format True if the cookie is in the Browser SDK 2.0 format
     # @return [String] The cookie name that Amplitude sets for the provided
-    def self.cookie_name(api_key)
-      raise ArgumentError, 'Invalid Amplitude API Key' if api_key.nil? || api_key.length < 6
+    def self.cookie_name(api_key, new_format: false)
+      raise ArgumentError, 'Invalid Amplitude API Key' if api_key.nil?
+
+      if new_format
+        raise ArgumentError, 'Invalid Amplitude API Key' if api_key.length < 10
+
+        return "AMP_#{api_key[0..9]}"
+      end
+      raise ArgumentError, 'Invalid Amplitude API Key' if api_key.length < 6
 
       "amp_#{api_key[0..5]}"
     end
@@ -16,8 +25,20 @@ module AmplitudeExperiment
     # Parse a cookie string and returns user
     #
     # @param [String] amplitude_cookie A string from the amplitude cookie
+    # @param [Boolean] new_format True if the cookie is in the Browser SDK 2.0 format
     # @return [User] a Experiment User context containing a device_id and user_id
-    def self.parse(amplitude_cookie)
+    def self.parse(amplitude_cookie, new_format: false)
+      if new_format
+        begin
+          decoding = Base64.decode64(amplitude_cookie).force_encoding('UTF-8')
+          json_data = URI.decode_www_form_component(decoding)
+          user_session_hash = JSON.parse(json_data)
+          return User.new(user_id: user_session_hash['userId'], device_id: user_session_hash['deviceId'])
+        rescue StandardError => e
+          puts "Error parsing the Amplitude cookie: #{e.message}"
+          return nil
+        end
+      end
       values = amplitude_cookie.split('.', -1)
       user_id = nil
       unless values[1].nil? || values[1].empty?
@@ -33,9 +54,17 @@ module AmplitudeExperiment
     # Generates a cookie string to set for the Amplitude Javascript SDK
     #
     # @param [String] device_id A device id to set
+    # @param [Boolean] new_format True if the cookie is in the Browser SDK 2.0 format
     # @return [String] A cookie string to set for the Amplitude Javascript SDK to read
-    def self.generate(device_id)
-      "#{device_id}.........."
+    def self.generate(device_id, new_format: false)
+      return "#{device_id}.........." unless new_format
+
+      user_session_hash = {
+        'deviceId' => device_id
+      }
+      json_data = JSON.generate(user_session_hash)
+      encoded_json = URI.encode_www_form_component(json_data)
+      Base64.strict_encode64(encoded_json)
     end
   end
 end

data/lib/experiment/local/client.rb

@@ -88,9 +88,13 @@ module AmplitudeExperiment
 
     def run
       @is_running = true
-      flags = @fetcher.fetch_v1
-      @flags_mutex.synchronize do
-        @flags = flags
+      begin
+        flags = @fetcher.fetch_v1
+        @flags_mutex.synchronize do
+          @flags = flags
+        end
+      rescue StandardError => e
+        @logger.error("[Experiment] Flag poller - error: #{e.message}")
       end
       @poller_thread = Thread.new do
         sleep(@config.flag_config_polling_interval_millis / 1000.to_f)

data/lib/experiment/version.rb

@@ -1,3 +1,3 @@
 module AmplitudeExperiment
-  VERSION = '1.2.2'.freeze
+  VERSION = '1.2.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amplitude-experiment
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Amplitude
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby