faraday-throttler-rx 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90bfffb43e9cfb65219fe3325686b7c3d8e4cf410bcd91802e9a84222306de0
-  data.tar.gz: bfd4da59b12e9b86fdcc3706eb669817dab02b1054aba2c08749c6997eda8d95
+  metadata.gz: 010e832af2e263e60bc76346f22620976f8b0a9a169d916c9929a004909ec5c0
+  data.tar.gz: dc4043fe5b8a4333ef456981b2a8bc3d7ecef535aba2bb11471d6e3088639b8e
 SHA512:
-  metadata.gz: 703f490b28de0dba22faa60e0de17aaf2a513b610272f8f939973950f01e2e95a5a21abafa9f9421c95e1555a3e2f18d3d74b1448790f9e67bae4ff324620946
-  data.tar.gz: 3b09c9b0fdaef98b68bf28451d626dd6903673cc863e327410067fbfa3702e8e4559f479af5b347092daa28f5be7550b469828e87b7423a9509cbf409eb88aca
+  metadata.gz: 99503113453a6c9107d68a5e1240cfb3507b1376fa1a7bb91fafd62949628326f2a9040d6c7047d4ca78ef1d31055244d3a35a958c3da7fcbc70c8c5c183d34e
+  data.tar.gz: c1eb7322b9240e8abc6ef153ee8aca7c4ca28fd878e9da984158b73ebd9fe9e83a1dd94ff6643a1ce1bf8fa60e07954f6c757a2dff85529b95e035d710ce7929

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/examples/client.rb

@@ -6,7 +6,7 @@ require 'faraday_throttler/redis_cache'
 
 
 redis = Redis.new
-cache = FaradayThrottler::RedisCache.new(redis: redis, ttl: 60)
+cache = FaradayThrottler::RedisCache.new(redis: redis, default_ttl: 60)
 
 conn = Faraday.new(:url => 'http://localhost:9800') do |faraday|
   # faraday.response :logger                  # log requests to STDOUT

data/lib/faraday_throttler/cache.rb

@@ -5,7 +5,7 @@ module FaradayThrottler
       @store = store
     end
 
-    def set(key, resp)
+    def set(key, resp, _ = {})
       mutex.synchronize { store[key] = resp }
     end
 

data/lib/faraday_throttler/middleware.rb

@@ -97,9 +97,7 @@ module FaradayThrottler
     def fetch_and_check_rate_limit(request_env, cache_key, start)
       app.call(request_env).on_complete do |response_env|
         if rate_limit_response_checker.call(response_env)
-          sleep wait
-          logger.debug logline(cache_key, "C.1.1. Rate limited on backend. Took #{Time.now - start}")
-          fetch_and_check_rate_limit(request_env, cache_key, start)
+          wait_and_replay_call(request_env, cache_key, start)
         else
           # Everything alright
           logger.debug logline(cache_key, "C.1.2. Everything alright, request finished. Took #{Time.now - start}")
@@ -107,6 +105,20 @@ module FaradayThrottler
           release_request_stick(cache_key)
         end
       end
+    rescue Faraday::Error => e
+      if e.is_a?(Faraday::ClientError) && rate_limit_response_checker.call(e.response)
+        wait_and_replay_call(request_env, cache_key, start)
+      else
+        release_request_stick(cache_key)
+        raise e
+      end
+    end
+
+    def wait_and_replay_call(request_env, cache_key, start)
+      # Replay request call
+      sleep wait
+      logger.debug logline(cache_key, "C.1.1. Rate limited on backend. Took #{Time.now - start}")
+      fetch_and_check_rate_limit(request_env, cache_key, start)
     end
 
     def validate_dep!(dep, dep_name, *methods)
@@ -131,8 +143,7 @@ module FaradayThrottler
     end
 
     def request_stick?(cache_key)
-      counter = cache.get(cache_key, 0).to_i
-      p "#{counter}, #{cache_key}"
+      counter = cache.get(cache_key).to_i
       if counter < rate
         cache.set(cache_key, counter + 1)
         true
@@ -142,7 +153,7 @@ module FaradayThrottler
     end
 
     def release_request_stick(cache_key)
-      counter = cache.get(cache_key, 0).to_i
+      counter = cache.get(cache_key).to_i
       cache.set(cache_key, counter - 1) if counter > 0
     end
 

data/lib/faraday_throttler/redis_cache.rb

@@ -2,14 +2,14 @@ module FaradayThrottler
   class RedisCache
     NAMESPACE = 'throttler:cache:'.freeze
 
-    def initialize(redis: Redis.new, ttl: 0)
+    def initialize(redis: Redis.new, default_ttl: 60)
       @redis = redis
-      @ttl = ttl
+      @default_ttl = default_ttl
     end
 
-    def set(key, value)
+    def set(key, value, ex: default_ttl)
       opts = {}
-      opts[:ex] = ttl if ttl > 0
+      opts[:ex] = ex if ex > 0
       redis.set [NAMESPACE, key].join, value, opts
     end
 
@@ -18,6 +18,6 @@ module FaradayThrottler
     end
 
     private
-    attr_reader :redis, :ttl
+    attr_reader :redis, :default_ttl
   end
 end

data/lib/faraday_throttler/version.rb

@@ -1,3 +1,3 @@
 module FaradayThrottler
-  VERSION = "0.0.4"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday-throttler-rx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Boris Koumondji
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday