throttle_machines 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6450b4499ed28a6520bdc5d51a2c5bc7fcc55ba8e1f1e327def0ca9ab5c80d62
-  data.tar.gz: af1addd1f524c9f5663f3f241ce15bfb1aa9a6b5365463f3c9d453a9e03f0b05
+  metadata.gz: f3b31d5fbfe9776c3fce6b2dfa90a77932536992f5a182313bb36b12f58d04af
+  data.tar.gz: db51e8f4c56ac00ce340debbc10202614ec68bf2d3dc64596705c529897df6fd
 SHA512:
-  metadata.gz: 564076859ef7219e48060400a26295cffc830a74fbf82d757766753e19d2020fce390ce8b91b9daf996147689dd47fec0911037a34a0208cd160ec3d6009ac70
-  data.tar.gz: 39590d460f59b66a700487146ea3309aa8df4d9f3b31e0248acb1b0748bc04b3a26f9a55f52f18b4beb3fca7618a8142092b4d434f45a4ce833a265d8e2c5fdb
+  metadata.gz: e4ffd7243f769547032d4ec7e15c7e390142e0b22f178a6eff6f651d10fd7fba31389bb80f6ff843c81ce1491528c1e70c9e57c4c7f02da6d4d71b61d0ed3bcc
+  data.tar.gz: 28e290c3e45461f6491e156594c4625be6b6073d8856a5448038c2a872323ecfa1532d31deb18dac35dd9b8dfa91614f6cb3df076dbaaba122e102d7efcff265

data/lib/throttle_machines/storage/redis.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'digest/sha1'
+
 module ThrottleMachines
   module Storage
     class Redis < Base
@@ -13,17 +15,18 @@ module ThrottleMachines
       INCREMENT_COUNTER_SCRIPT = File.read(File.join(LUA_SCRIPTS_DIR, 'increment_counter.lua'))
       # Breaker scripts removed: breaker state is owned by BreakerMachines
 
+      # Redis caches scripts by the SHA1 of their source, so the SHAs are known
+      # without a SCRIPT LOAD round trip.
+      GCRA_SHA = Digest::SHA1.hexdigest(GCRA_SCRIPT)
+      TOKEN_BUCKET_SHA = Digest::SHA1.hexdigest(TOKEN_BUCKET_SCRIPT)
+      PEEK_GCRA_SHA = Digest::SHA1.hexdigest(PEEK_GCRA_SCRIPT)
+      PEEK_TOKEN_BUCKET_SHA = Digest::SHA1.hexdigest(PEEK_TOKEN_BUCKET_SCRIPT)
+
       def initialize(options = {})
         super
         @redis = options[:redis] || options[:client] || options[:pool]
         @prefix = options[:prefix] || 'throttle:'
 
-        # Cache scripts to avoid repeated script loads
-        @gcra_sha = nil
-        @token_bucket_sha = nil
-        @peek_gcra_sha = nil
-        @peek_token_bucket_sha = nil
-
         # Validate Redis connection
         validate_redis_connection!
       end
@@ -56,15 +59,9 @@ module ThrottleMachines
 
       # GCRA operations (atomic via Lua)
       def check_gcra_limit(key, emission_interval, delay_tolerance, ttl)
-        ensure_gcra_script_loaded!
-
-        result = with_redis do |redis|
-          redis.evalsha(
-            @gcra_sha,
-            keys: [prefixed(key)],
-            argv: [emission_interval, delay_tolerance, ttl, current_time]
-          )
-        end
+        result = run_script(GCRA_SCRIPT, GCRA_SHA,
+                            keys: [prefixed(key)],
+                            argv: [emission_interval, delay_tolerance, ttl, current_time])
 
         allowed = result[0] == 1
         tat = result[1]
@@ -75,24 +72,13 @@ module ThrottleMachines
           retry_after: allowed ? 0 : (tat - now - delay_tolerance),
           tat: tat
         }
-      rescue ::Redis::CommandError => e
-        raise unless e.message.include?('NOSCRIPT')
-
-        @gcra_sha = nil
-        retry
       end
 
       # Token bucket operations (atomic via Lua)
       def check_token_bucket(key, capacity, refill_rate, ttl)
-        ensure_token_bucket_script_loaded!
-
-        result = with_redis do |redis|
-          redis.evalsha(
-            @token_bucket_sha,
-            keys: [prefixed(key)],
-            argv: [capacity, refill_rate, ttl, current_time]
-          )
-        end
+        result = run_script(TOKEN_BUCKET_SCRIPT, TOKEN_BUCKET_SHA,
+                            keys: [prefixed(key)],
+                            argv: [capacity, refill_rate, ttl, current_time])
 
         allowed = result[0] == 1
         tokens = result[1]
@@ -102,24 +88,13 @@ module ThrottleMachines
           retry_after: allowed ? 0 : (1 - tokens) / refill_rate,
           tokens_remaining: tokens.floor
         }
-      rescue ::Redis::CommandError => e
-        raise unless e.message.include?('NOSCRIPT')
-
-        @token_bucket_sha = nil
-        retry
       end
 
       # Peek methods for non-consuming checks
       def peek_gcra_limit(key, emission_interval, delay_tolerance)
-        ensure_peek_gcra_script_loaded!
-
-        result = with_redis do |redis|
-          redis.evalsha(
-            @peek_gcra_sha,
-            keys: [prefixed(key)],
-            argv: [emission_interval, delay_tolerance, current_time]
-          )
-        end
+        result = run_script(PEEK_GCRA_SCRIPT, PEEK_GCRA_SHA,
+                            keys: [prefixed(key)],
+                            argv: [emission_interval, delay_tolerance, current_time])
 
         allowed = result[0] == 1
         tat = result[1]
@@ -130,23 +105,12 @@ module ThrottleMachines
           retry_after: allowed ? 0 : (tat - now - delay_tolerance),
           tat: tat
         }
-      rescue ::Redis::CommandError => e
-        raise unless e.message.include?('NOSCRIPT')
-
-        @peek_gcra_sha = nil
-        retry
       end
 
       def peek_token_bucket(key, capacity, refill_rate)
-        ensure_peek_token_bucket_script_loaded!
-
-        result = with_redis do |redis|
-          redis.evalsha(
-            @peek_token_bucket_sha,
-            keys: [prefixed(key)],
-            argv: [capacity, refill_rate, current_time]
-          )
-        end
+        result = run_script(PEEK_TOKEN_BUCKET_SCRIPT, PEEK_TOKEN_BUCKET_SHA,
+                            keys: [prefixed(key)],
+                            argv: [capacity, refill_rate, current_time])
 
         allowed = result[0] == 1
         tokens_remaining = result[1]
@@ -156,11 +120,6 @@ module ThrottleMachines
           retry_after: allowed ? 0 : (1 - tokens_remaining) / refill_rate,
           tokens_remaining: tokens_remaining.floor
         }
-      rescue ::Redis::CommandError => e
-        raise unless e.message.include?('NOSCRIPT')
-
-        @peek_token_bucket_sha = nil
-        retry
       end
 
       # No circuit breaker operations: breaker state is owned by BreakerMachines
@@ -192,20 +151,17 @@ module ThrottleMachines
         "#{@prefix}#{key}"
       end
 
-      def ensure_gcra_script_loaded!
-        @ensure_gcra_script_loaded ||= with_redis { |r| r.script(:load, GCRA_SCRIPT) }
-      end
-
-      def ensure_token_bucket_script_loaded!
-        @ensure_token_bucket_script_loaded ||= with_redis { |r| r.script(:load, TOKEN_BUCKET_SCRIPT) }
-      end
-
-      def ensure_peek_gcra_script_loaded!
-        @ensure_peek_gcra_script_loaded ||= with_redis { |r| r.script(:load, PEEK_GCRA_SCRIPT) }
-      end
+      # EVALSHA by the precomputed SHA. A server without the script cached (a
+      # restart, SCRIPT FLUSH, failover) answers NOSCRIPT; EVAL then runs the
+      # source once and caches it for later calls. Any other error propagates.
+      def run_script(script, sha, keys:, argv:)
+        with_redis do |redis|
+          redis.evalsha(sha, keys: keys, argv: argv)
+        rescue ::Redis::CommandError => e
+          raise unless e.message.include?('NOSCRIPT')
 
-      def ensure_peek_token_bucket_script_loaded!
-        @ensure_peek_token_bucket_script_loaded ||= with_redis { |r| r.script(:load, PEEK_TOKEN_BUCKET_SCRIPT) }
+          redis.eval(script, keys: keys, argv: argv)
+        end
       end
 
       def validate_redis_connection!

data/lib/throttle_machines/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ThrottleMachines
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: throttle_machines
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Abdelkader Boudih
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.4
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.4
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -71,42 +71,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: chrono_machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.16'
+        version: '6.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.16'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rb_sys
   requirement: !ruby/object:Gem::Requirement