Merge a2763d25b9 into 74059a1442

lib/vmpooler/api/rate_limiter.rb

@@ -26,11 +26,9 @@ module Vmpooler
         client_id = identify_client(request)
         endpoint_type = classify_endpoint(request)
 
-        # Check rate limits
+        # Atomically increment and check in one step
-        return rate_limit_response(client_id, endpoint_type) if rate_limit_exceeded?(client_id, endpoint_type, request)
+        current_count = increment_request_count(client_id, endpoint_type)
-
+        return rate_limit_response(client_id, endpoint_type) if current_count.nil? || current_count > limit_for(endpoint_type)
-        # Track the request
-        increment_request_count(client_id, endpoint_type)
 
         @app.call(env)
       end
@@ -58,29 +56,22 @@ module Vmpooler
         :global_per_ip
       end
 
-      def rate_limit_exceeded?(client_id, endpoint_type, _request)
+      def limit_for(endpoint_type)
-        limit_config = @config[endpoint_type] || @config[:global_per_ip]
+        (@config[endpoint_type] || @config[:global_per_ip])[:limit]
-        key = "vmpooler__ratelimit__#{endpoint_type}__#{client_id}"
-
-        current_count = @redis.get(key).to_i
-        current_count >= limit_config[:limit]
-      rescue StandardError => e
-        # If Redis fails, allow the request through (fail open)
-        warn "Rate limiter Redis error: #{e.message}"
-        false
       end
 
       def increment_request_count(client_id, endpoint_type)
         limit_config = @config[endpoint_type] || @config[:global_per_ip]
         key = "vmpooler__ratelimit__#{endpoint_type}__#{client_id}"
 
-        @redis.pipelined do |pipeline|
+        count = @redis.incr(key)
-          pipeline.incr(key)
+        # Only set expiry on first request in the window
-          pipeline.expire(key, limit_config[:period])
+        @redis.expire(key, limit_config[:period]) if count == 1
-        end
+        count
       rescue StandardError => e
         # Log error but don't fail the request
         warn "Rate limiter increment error: #{e.message}"
+        nil
       end
 
       def rate_limit_response(client_id, endpoint_type)