Use a new class to keep @env within the thread.

Author: caifara

lib/inertia_rails/middleware.rb

@@ -5,78 +5,91 @@ def initialize(app)
     end
 
     def call(env)
-      status, headers, body = @app.call(env)
-      request = ActionDispatch::Request.new(env)
+      InertiaRailsRequest.new(@app, env)
+                         .response
+    end
 
-      ::InertiaRails.reset!
+    class InertiaRailsRequest
+      def initialize(app, env)
+        @app = app
+        @env = env
+      end
 
-      # Inertia errors are added to the session via redirect_to
-      request.session.delete(:inertia_errors) unless keep_inertia_errors?(status, env)
+      def response
+        status, headers, body = @app.call(@env)
+        request = ActionDispatch::Request.new(@env)
 
-      status = 303 if inertia_non_post_redirect?(status, env)
+        ::InertiaRails.reset!
 
-      return stale_inertia_get?(env) ? force_refresh(request) : [status, headers, body]
-    end
+        # Inertia errors are added to the session via redirect_to 
+        request.session.delete(:inertia_errors) unless keep_inertia_errors?(status)
 
-    private
+        status = 303 if inertia_non_post_redirect?(status)
 
-    def keep_inertia_errors?(status, env)
-      redirect_status?(status) || stale_inertia_request?(env)
-    end
+        stale_inertia_get? ? force_refresh(request) : [status, headers, body]
+      end
 
-    def stale_inertia_request?(env)
-      inertia_request?(env) && version_stale?(env)
-    end
+      private
 
-    def redirect_status?(status)
-      [301, 302].include? status
-    end
+      def keep_inertia_errors?(status)
+        redirect_status?(status) || stale_inertia_request?
+      end
 
-    def non_get_redirectable_method?(env)
-      ["PUT", "PATCH", "DELETE"].include? request_method(env)
-    end
+      def stale_inertia_request?
+        inertia_request? && version_stale?
+      end
 
-    def inertia_non_post_redirect?(status, env)
-      inertia_request?(env) && redirect_status?(status) && non_get_redirectable_method?(env)
-    end
+      def redirect_status?(status)
+        [301, 302].include? status
+      end
 
-    def stale_inertia_get?(env)
-      get?(env) && stale_inertia_request?(env)
-    end
+      def non_get_redirectable_method?
+        ['PUT', 'PATCH', 'DELETE'].include? request_method
+      end
 
-    def get?(env)
-      request_method(env) == "GET"
-    end
+      def inertia_non_post_redirect?(status)
+        inertia_request? && redirect_status?(status) && non_get_redirectable_method?
+      end
 
-    def request_method(env)
-      env["REQUEST_METHOD"]
-    end
+      def stale_inertia_get?
+        get? && stale_inertia_request?
+      end
 
-    def inertia_version(env)
-      env["HTTP_X_INERTIA_VERSION"]
-    end
+      def get?
+        request_method == 'GET'
+      end
 
-    def inertia_request?(env)
-      env["HTTP_X_INERTIA"].present?
-    end
+      def request_method
+        @env['REQUEST_METHOD']
+      end
 
-    def version_stale?(env)
-      sent_version(env) != saved_version
-    end
+      def inertia_version
+        @env['HTTP_X_INERTIA_VERSION']
+      end
 
-    def sent_version(env)
-      return nil if inertia_version(env).nil?
+      def inertia_request?
+        @env['HTTP_X_INERTIA'].present?
+      end
 
-      InertiaRails.version.is_a?(Numeric) ? inertia_version(env).to_f : inertia_version(env)
-    end
+      def version_stale?
+        sent_version != saved_version
+      end
 
-    def saved_version
-      InertiaRails.version.is_a?(Numeric) ? InertiaRails.version.to_f : InertiaRails.version
-    end
+      def sent_version
+        return nil if inertia_version.nil?
+
+        InertiaRails.version.is_a?(Numeric) ? inertia_version.to_f : inertia_version
+      end
 
-    def force_refresh(request)
-      request.flash.keep
-      Rack::Response.new("", 409, { "X-Inertia-Location" => request.original_url }).finish
+      def saved_version
+        InertiaRails.version.is_a?(Numeric) ? InertiaRails.version.to_f : InertiaRails.version
+      end
+
+      def force_refresh(request)
+        request.flash.keep
+        Rack::Response.new('', 409, {'X-Inertia-Location' => request.original_url}).finish
+      end
     end
   end
 end
+