berater 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d007dbb664fa57c921047a28dd1e5a591cf5c51fba4931dbc367ab552e4b8a8d
-  data.tar.gz: c710d31a2d8cfdc50af4c2fae87cabad177096d13da52a7f9c48b61aa31b6038
+  metadata.gz: f57aeaa9319ae38bdd7d2468443fc5c9ea9ba44cecf47bc5a558f18ecd0ab274
+  data.tar.gz: ff14ef90856911e9e18cbfbad6f9799727c999697c5e4d96f47b5fbf665c725c
 SHA512:
-  metadata.gz: 0d9c211bb65e7341b98e637d3f0ce0e31f0a879437c1c309fb01e1efab5e5c6b2d5044158931ab16a67cbbdebd00ddb5f10afc97430230b153d8cc236f7517ab
-  data.tar.gz: 5d8b38bfd7683df641fd6891cd1a493079453ea6c61b2880581eeb2d963fb171365fb3448443e2548b34297d8dcfa352e67cff5688cd24d25422efb5e55d4afd
+  metadata.gz: c9d3abeeb9d35c608c194eaf505c5af1350a82583dd12257e70b9d4f96bd3a6cd30db802f57c3bf77d371b5deb5e856e9238eadd3990768205fd37ea3e2e3703
+  data.tar.gz: c98078a3c7d3a3eb4e2d523577f9d6dd7f1bbae76c9ecbd8d65961cc7aa1bab6e1a4b8fe84cfb30ee60f4d0ce11dcb58e3b94a3566cf50ee60d1f8e21bab82b1

data/lib/berater/concurrency_limiter.rb

@@ -32,7 +32,7 @@ module Berater
       @timeout = timeout
     end
 
-    LUA_SCRIPT = <<~LUA.gsub(/^\s*(--.*\n)?/, '')
+    LUA_SCRIPT = <<~LUA.gsub(/^\s*|\s*--.*/, '')
       local key = KEYS[1]
       local lock_key = KEYS[2]
       local capacity = tonumber(ARGV[1])

data/lib/berater/rate_limiter.rb

@@ -53,20 +53,56 @@ module Berater
       end
     end
 
-    def limit
-      ts = Time.now.to_i
+    LUA_SCRIPT = <<~LUA.gsub(/^\s*|\s*--.*/, '')
+      local key = KEYS[1]
+      local ts_key = KEYS[2]
+      local ts = tonumber(ARGV[1])
+      local capacity = tonumber(ARGV[2])
+      local usec_per_drip = tonumber(ARGV[3])
+      local count = 0
+
+      -- timestamp of last update
+      local last_ts = tonumber(redis.call('GET', ts_key))
+
+      if last_ts then
+        count = tonumber(redis.call('GET', key)) or 0
+
+        -- adjust for time passing
+        local drips = math.floor((ts - last_ts) / usec_per_drip)
+        count = math.max(0, count - drips)
+      end
+
+      local allowed = count + 1 <= capacity
 
-      # bucket into time slot
-      rkey = "%s:%d" % [ cache_key(key), ts - ts % @interval_sec ]
+      if allowed then
+        count = count + 1
 
-      count, _ = redis.multi do
-        redis.incr rkey
-        redis.expire rkey, @interval_sec * 2
+        -- time for bucket to empty, in milliseconds
+        local ttl = math.ceil((count * usec_per_drip) / 1000)
+
+        -- update count and last_ts, with expirations
+        redis.call('SET', key, count, 'PX', ttl)
+        redis.call('SET', ts_key, ts, 'PX', ttl)
       end
 
-      raise Overrated if count > @count
+      return { count, allowed }
+    LUA
+
+    def limit
+      usec_per_drip = (@interval_sec * 10**6) / @count
+
+      # timestamp in microseconds
+      ts = (Time.now.to_f * 10**6).to_i
+
+      count, allowed = redis.eval(
+        LUA_SCRIPT,
+        [ cache_key(key), cache_key("#{key}-ts") ],
+        [ ts, @count, usec_per_drip ]
+      )
+
+      raise Overrated unless allowed
 
-      lock = Lock.new(self, count, count)
+      lock = Lock.new(self, "#{ts}-#{count}", count)
 
       if block_given?
         begin

data/lib/berater/version.rb

@@ -1,3 +1,3 @@
 module Berater
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/test_mode_spec.rb

@@ -93,7 +93,7 @@ describe 'Berater.test_mode' do
       it_behaves_like 'a RateLimiter'
 
       it 'works per usual' do
-        expect(limiter.redis).to receive(:multi).twice.and_call_original
+        expect(limiter.redis).to receive(:eval).twice.and_call_original
         expect(limiter.limit).to be_a Berater::Lock
         expect { limiter.limit }.to be_overloaded
       end
@@ -109,7 +109,7 @@ describe 'Berater.test_mode' do
       it_behaves_like 'a RateLimiter'
 
       it 'always works and without calling redis' do
-        expect(limiter.redis).not_to receive(:multi)
+        expect(limiter.redis).not_to receive(:eval)
         expect {|block| limiter.limit(&block) }.to yield_control
         10.times { expect(limiter.limit).to be_a Berater::Lock }
       end
@@ -121,7 +121,7 @@ describe 'Berater.test_mode' do
       it_behaves_like 'a RateLimiter'
 
       it 'never works and without calling redis' do
-        expect(limiter.redis).not_to receive(:multi)
+        expect(limiter.redis).not_to receive(:eval)
         expect { limiter }.to be_overloaded
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berater
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Pepper