mbuzz 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c9557bce57bad2c91864640fcfff650794bb4de6d56afd3497eaa693247cc10
-  data.tar.gz: fef9164f73131538bc7e6df11e2b5fc802a967580b65b26426aa671e5d68cc26
+  metadata.gz: b9b7f19e320205070a57b6af96ea48f602bae0c47dbd1820cf9dad16b459654c
+  data.tar.gz: d3e096d77166f68d07fade770c3345ac23cd110acaefb70dff0e060ad314dec2
 SHA512:
-  metadata.gz: 2c0a78057cf989d08703c758f70b2c6711542c12994662ae47e5b9c67d1462aacd6e80d65b790bb287bb70e6ca03d61c60342eecb16f6c62059f4762359233ad
-  data.tar.gz: 8a6782fb3f84ce855438f64066becfb411f46f3db8ae68504dc5a96774b6a9ed4b0a04607da386888fca6683663c2ceddd1bd466b448df2fe82f4900fc03eee5
+  metadata.gz: d1efd4303b4231615e0ead723970d6880b1567df106741fa51ed55ac2bc3d442b390677d97fb2ac2b2a7d73bf36c1de606ba33559fdc2ba3909539229a38e697
+  data.tar.gz: 43e1a0c65b9c23e99d63c33044d6b6c8ef5b413d15ddfda302248a5f2af3063799fd2fe480c612e7f64e93a9c236b809ff6d5629a0f80988fb1ba6591eb02d55

data/lib/mbuzz/middleware/tracking.rb

@@ -5,28 +5,25 @@ require "rack"
 module Mbuzz
   module Middleware
     class Tracking
-      attr_reader :app, :request
-
       def initialize(app)
         @app = app
       end
 
       def call(env)
-        return app.call(env) if skip_request?(env)
+        return @app.call(env) if skip_request?(env)
 
-        reset_request_state!
-        @request = Rack::Request.new(env)
+        request = Rack::Request.new(env)
+        context = build_request_context(request)
 
-        env[ENV_VISITOR_ID_KEY] = visitor_id
-        env[ENV_USER_ID_KEY] = user_id
-        env[ENV_SESSION_ID_KEY] = session_id
+        env[ENV_VISITOR_ID_KEY] = context[:visitor_id]
+        env[ENV_USER_ID_KEY] = context[:user_id]
+        env[ENV_SESSION_ID_KEY] = context[:session_id]
 
         RequestContext.with_context(request: request) do
-          create_session_if_new
+          create_session_if_new(context, request)
 
-          status, headers, body = app.call(env)
-          set_visitor_cookie(headers)
-          set_session_cookie(headers)
+          status, headers, body = @app.call(env)
+          set_cookies(headers, context, request)
           [status, headers, body]
         end
       end
@@ -49,76 +46,64 @@ module Mbuzz
 
       private
 
-      def reset_request_state!
-        @request = nil
-        @visitor_id = nil
-        @session_id = nil
-        @user_id = nil
-      end
+      # Build all request-specific context as a frozen hash
+      # This ensures thread-safety by using local variables only
+      def build_request_context(request)
+        visitor_id = visitor_id_from_cookie(request) || Visitor::Identifier.generate
+        session_id = session_id_from_cookie(request) || generate_session_id
+        user_id = user_id_from_session(request)
+        new_session = session_id_from_cookie(request).nil?
 
-      def visitor_id
-        @visitor_id ||= visitor_id_from_cookie || Visitor::Identifier.generate
+        {
+          visitor_id: visitor_id,
+          session_id: session_id,
+          user_id: user_id,
+          new_session: new_session
+        }.freeze
       end
 
-      def visitor_id_from_cookie
+      def visitor_id_from_cookie(request)
         request.cookies[VISITOR_COOKIE_NAME]
       end
 
-      def user_id
-        @user_id ||= user_id_from_session
+      def session_id_from_cookie(request)
+        request.cookies[SESSION_COOKIE_NAME]
       end
 
-      def user_id_from_session
+      def user_id_from_session(request)
         request.session[SESSION_USER_ID_KEY] if request.session
       end
 
-      def set_visitor_cookie(headers)
-        Rack::Utils.set_cookie_header!(headers, VISITOR_COOKIE_NAME, visitor_cookie_options)
-      end
-
-      def visitor_cookie_options
-        base_cookie_options.merge(
-          value: visitor_id,
-          max_age: VISITOR_COOKIE_MAX_AGE
-        )
-      end
-
-      # Session ID management
-
-      def session_id
-        @session_id ||= session_id_from_cookie || generate_session_id
-      end
-
-      def session_id_from_cookie
-        request.cookies[SESSION_COOKIE_NAME]
-      end
-
       def generate_session_id
         SecureRandom.hex(32)
       end
 
-      def new_session?
-        session_id_from_cookie.nil?
-      end
-
       # Session creation
 
-      def create_session_if_new
-        return unless new_session?
+      def create_session_if_new(context, request)
+        return unless context[:new_session]
 
-        create_session_async
+        create_session_async(context, request)
       end
 
-      def create_session_async
-        Thread.new { create_session }
+      def create_session_async(context, request)
+        # Capture values in local variables for thread safety
+        visitor_id = context[:visitor_id]
+        session_id = context[:session_id]
+        url = request.url
+        referrer = request.referer
+
+        Thread.new do
+          create_session(visitor_id, session_id, url, referrer)
+        end
       end
 
-      def create_session
+      def create_session(visitor_id, session_id, url, referrer)
         Client.session(
           visitor_id: visitor_id,
           session_id: session_id,
-          url: request.url,
-          referrer: request.referer
+          url: url,
+          referrer: referrer
         )
       rescue => e
         log_session_error(e)
@@ -128,22 +113,44 @@ module Mbuzz
         Mbuzz.config.logger&.error("Session creation failed: #{error.message}")
       end
 
-      # Session cookie
+      # Cookie setting
 
-      def set_session_cookie(headers)
-        Rack::Utils.set_cookie_header!(headers, SESSION_COOKIE_NAME, session_cookie_options)
+      def set_cookies(headers, context, request)
+        set_visitor_cookie(headers, context, request)
+        set_session_cookie(headers, context, request)
       end
 
-      def session_cookie_options
-        base_cookie_options.merge(
-          value: session_id,
-          max_age: SESSION_COOKIE_MAX_AGE
+      def set_visitor_cookie(headers, context, request)
+        Rack::Utils.set_cookie_header!(
+          headers,
+          VISITOR_COOKIE_NAME,
+          visitor_cookie_options(context, request)
+        )
+      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],
+          max_age: VISITOR_COOKIE_MAX_AGE
         )
       end
 
-      # Shared cookie options
+      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
+      def base_cookie_options(request)
         options = {
           path: VISITOR_COOKIE_PATH,
           httponly: true,

data/lib/mbuzz/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mbuzz
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - mbuzz team
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -67,7 +66,6 @@ metadata:
   source_code_uri: https://github.com/mbuzz/mbuzz-ruby
   changelog_uri: https://github.com/mbuzz/mbuzz-ruby/blob/main/CHANGELOG.md
   documentation_uri: https://mbuzz.co/docs
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -82,8 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Server-side multi-touch attribution for Ruby
 test_files: []