mbuzz 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb41261b9e19c46609f4e7a8867d73b5a902acecc3db3362b4a47e2cacefa9db
-  data.tar.gz: ce644b10fa63055065960bb72a61eb53077d4bbe110eac40ed5bd6918d2487c1
+  metadata.gz: 0d8514076473bbc4fa543510e84789f8cb91ccc99e916b3cef4f4928aaf6baf5
+  data.tar.gz: 159074f0dbac29eb6b721bab4288ce976e4e4361ba503caffc36f37e79cf315e
 SHA512:
-  metadata.gz: 03bed0944d6ee7286e4f002d05032c8ced19d013da1dae69d429046b1ebad510cae67510d48d9af53fac8a8832a1a1495657c6b671a16976fabb5eb8ec316f3d
-  data.tar.gz: 4a0693caaa53219fbf4368c1b194722889c516e88eea6f7bfe781f7a44293659977e6691901f238f45ef66f08f367d674c2f22e6f8a63e22f3326368e6ae8f10
+  metadata.gz: 3d515f639e577a68d9daa8afe13de92dec0a5556cfad2e335ea482f7db0240ff996dd1fb6bbf3388e7f632cb8300e439028091cf1c551627c9be1c22e73ca666
+  data.tar.gz: 9fbe4999f2ce0855d83847d61b4684f30217c01c9074df4cced51e4083167cf3ca24e0e5223f2e57fd859aab6d88f60a68a0adc3074bd0a7f4356c0f9d3e5116

data/lib/mbuzz/client/session_request.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+module Mbuzz
+  class Client
+    class SessionRequest
+      # Response keys
+      STATUS_KEY = "status"
+      VISITOR_ID_KEY = "visitor_id"
+      SESSION_ID_KEY = "session_id"
+      CHANNEL_KEY = "channel"
+
+      # Response values
+      ACCEPTED_STATUS = "accepted"
+
+      def initialize(visitor_id:, session_id:, url:, referrer: nil, device_fingerprint: nil, started_at: nil)
+        @visitor_id = visitor_id
+        @session_id = session_id
+        @url = url
+        @referrer = referrer
+        @device_fingerprint = device_fingerprint
+        @started_at = started_at
+      end
+
+      def call
+        return false unless valid?
+
+        parse_response(response)
+      rescue StandardError
+        false
+      end
+
+      private
+
+      attr_reader :visitor_id, :session_id, :url, :referrer, :device_fingerprint, :started_at
+
+      def valid?
+        present?(visitor_id) && present?(session_id) && present?(url)
+      end
+
+      def response
+        @response ||= Api.post_with_response(SESSIONS_PATH, { session: payload })
+      end
+
+      def payload
+        {
+          visitor_id: visitor_id,
+          session_id: session_id,
+          url: url,
+          referrer: referrer,
+          device_fingerprint: device_fingerprint,
+          started_at: started_at || Time.now.utc.iso8601
+        }.compact
+      end
+
+      def parse_response(resp)
+        return false unless accepted?(resp)
+
+        {
+          success: true,
+          visitor_id: resp[VISITOR_ID_KEY],
+          session_id: resp[SESSION_ID_KEY],
+          channel: resp[CHANNEL_KEY]
+        }
+      end
+
+      def accepted?(resp)
+        resp && resp[STATUS_KEY] == ACCEPTED_STATUS
+      end
+
+      def present?(value)
+        value && !value.to_s.strip.empty?
+      end
+    end
+  end
+end

data/lib/mbuzz/client.rb

@@ -3,6 +3,7 @@
 require_relative "client/track_request"
 require_relative "client/identify_request"
 require_relative "client/conversion_request"
+require_relative "client/session_request"
 
 module Mbuzz
   class Client
@@ -30,5 +31,16 @@ module Mbuzz
         identifier: identifier
       ).call
     end
+
+    def self.session(visitor_id:, session_id:, url:, referrer: nil, device_fingerprint: nil, started_at: nil)
+      SessionRequest.new(
+        visitor_id: visitor_id,
+        session_id: session_id,
+        url: url,
+        referrer: referrer,
+        device_fingerprint: device_fingerprint,
+        started_at: started_at
+      ).call
+    end
   end
 end

data/lib/mbuzz/current.rb

@@ -21,6 +21,7 @@ module Mbuzz
   #
   class Current < ActiveSupport::CurrentAttributes
     attribute :visitor_id
+    attribute :session_id
     attribute :user_id
     attribute :ip
     attribute :user_agent

data/lib/mbuzz/middleware/tracking.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "rack"
+require "digest"
+require "securerandom"
 
 module Mbuzz
   module Middleware
@@ -16,13 +18,17 @@ module Mbuzz
         context = build_request_context(request)
 
         env[ENV_VISITOR_ID_KEY] = context[:visitor_id]
+        env[ENV_SESSION_ID_KEY] = context[:session_id]
         env[ENV_USER_ID_KEY] = context[:user_id]
 
         store_in_current_attributes(context, request)
 
+        create_session_async(context, request) if context[:new_session]
+
         RequestContext.with_context(request: request) do
           status, headers, body = @app.call(env)
           set_visitor_cookie(headers, context, request)
+          set_session_cookie(headers, context, request)
           [status, headers, body]
         ensure
           reset_current_attributes
@@ -49,10 +55,26 @@ module Mbuzz
 
       # Build all request-specific context as a frozen hash
       # This ensures thread-safety by using local variables only
+      # IMPORTANT: All values needed by async session creation must be captured here,
+      # NOT accessed from the request object in the background thread (see #create_session)
       def build_request_context(request)
+        existing_session_id = session_id_from_cookie(request)
+        new_session = existing_session_id.nil?
+        ip = extract_ip(request)
+        user_agent = request.user_agent.to_s
+
         {
           visitor_id: resolve_visitor_id(request),
-          user_id: user_id_from_session(request)
+          session_id: existing_session_id || generate_session_id,
+          user_id: user_id_from_session(request),
+          new_session: new_session,
+          # Session creation data - captured here for thread-safety
+          # Background thread must NOT read from request object
+          url: request.url,
+          referrer: request.referer,
+          ip: ip,
+          user_agent: user_agent,
+          device_fingerprint: Digest::SHA256.hexdigest("#{ip}|#{user_agent}")[0, 32]
         }.freeze
       end
 
@@ -64,11 +86,47 @@ module Mbuzz
         request.cookies[VISITOR_COOKIE_NAME]
       end
 
+      def session_id_from_cookie(request)
+        request.cookies[SESSION_COOKIE_NAME]
+      end
+
+      def generate_session_id
+        SecureRandom.uuid
+      end
+
       def user_id_from_session(request)
         request.session[SESSION_USER_ID_KEY] if request.session
       end
 
-      # Cookie setting - only visitor cookie (sessions are server-side)
+      # Session creation - async to not block request
+      # IMPORTANT: This runs in a background thread. All data must come from
+      # the context hash, NOT from the request object (which may be invalid)
+
+      def create_session_async(context, _request)
+        Thread.new do
+          create_session(context)
+        rescue StandardError => e
+          log_error("Session creation failed: #{e.message}") if Mbuzz.config.debug
+        end
+      end
+
+      def create_session(context)
+        Client.session(
+          visitor_id: context[:visitor_id],
+          session_id: context[:session_id],
+          url: context[:url],
+          referrer: context[:referrer],
+          device_fingerprint: context[:device_fingerprint]
+        )
+      end
+
+      def log_error(message)
+        return unless defined?(Rails) && Rails.logger
+
+        Rails.logger.error("[Mbuzz] #{message}")
+      end
+
+      # Cookie setting - visitor and session cookies
 
       def set_visitor_cookie(headers, context, request)
         Rack::Utils.set_cookie_header!(
@@ -78,6 +136,14 @@ module Mbuzz
         )
       end
 
+      def set_session_cookie(headers, context, request)
+        Rack::Utils.set_cookie_header!(
+          headers,
+          SESSION_COOKIE_NAME,
+          session_cookie_options(context, request)
+        )
+      end
+
       def visitor_cookie_options(context, request)
         base_cookie_options(request).merge(
           value: context[:visitor_id],
@@ -85,6 +151,13 @@ module Mbuzz
         )
       end
 
+      def session_cookie_options(context, request)
+        base_cookie_options(request).merge(
+          value: context[:session_id],
+          max_age: SESSION_COOKIE_MAX_AGE
+        )
+      end
+
       def base_cookie_options(request)
         options = {
           path: VISITOR_COOKIE_PATH,
@@ -100,6 +173,7 @@ module Mbuzz
         return unless defined?(Mbuzz::Current)
 
         Mbuzz::Current.visitor_id = context[:visitor_id]
+        Mbuzz::Current.session_id = context[:session_id]
         Mbuzz::Current.user_id = context[:user_id]
         Mbuzz::Current.ip = extract_ip(request)
         Mbuzz::Current.user_agent = request.user_agent

data/lib/mbuzz/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mbuzz
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/mbuzz.rb

@@ -20,15 +20,20 @@ module Mbuzz
   EVENTS_PATH = "/events"
   IDENTIFY_PATH = "/identify"
   CONVERSIONS_PATH = "/conversions"
+  SESSIONS_PATH = "/sessions"
 
   VISITOR_COOKIE_NAME = "_mbuzz_vid"
   VISITOR_COOKIE_MAX_AGE = 60 * 60 * 24 * 365 * 2 # 2 years
   VISITOR_COOKIE_PATH = "/"
   VISITOR_COOKIE_SAME_SITE = "Lax"
 
+  SESSION_COOKIE_NAME = "_mbuzz_sid"
+  SESSION_COOKIE_MAX_AGE = 30 * 60 # 30 minutes
+
   SESSION_USER_ID_KEY = "user_id"
   ENV_USER_ID_KEY = "mbuzz.user_id"
   ENV_VISITOR_ID_KEY = "mbuzz.visitor_id"
+  ENV_SESSION_ID_KEY = "mbuzz.session_id"
 
   # ============================================================================
   # Configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mbuzz
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - mbuzz team
@@ -44,6 +44,7 @@ files:
 - lib/mbuzz/client.rb
 - lib/mbuzz/client/conversion_request.rb
 - lib/mbuzz/client/identify_request.rb
+- lib/mbuzz/client/session_request.rb
 - lib/mbuzz/client/track_request.rb
 - lib/mbuzz/configuration.rb
 - lib/mbuzz/controller_helpers.rb