idempotent-request 0.1.2 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25467dbc0ee42d2648e2dd267edb23be7972a6af0ba2d233e21d455c663fc643
-  data.tar.gz: 4dc4e7373dce6370eb850134d25c164fd67ef5c54dc12c3585267d4774d1f58f
+  metadata.gz: 5791ba0801f04874aca3ba71bde40a860d314409f63608f29c11a0e736c887b8
+  data.tar.gz: ccc7d160e6fb70fa22730f13c1fc6f8aa433953dcb4715499387039bf16a7fe0
 SHA512:
-  metadata.gz: 9af0cf3e406cbea6807cdfedc32110984ac63225dbe9ffe671cfcd8b842dd639db8e80ead393b1bbb7a14d6977f4edbe02aec913f4a5b2e41093a8cf12577c23
-  data.tar.gz: b54740669825c315a164fb42a4a58e54fd1ac1cc6e2802d3c40f4c8e5123bbfb9742e93f53f42667c392982e68784ff3721cb6123e7ea77b41cd4ca3ae762dca
+  metadata.gz: 147935f35c5b61def21a0a25f7e3ba4e5bc7b4f76e5d9034da1b44506ab4b064444405fd28086061ea71d9e2100b107c178d0fa101731cf9d65a9736906f7994
+  data.tar.gz: d11013511ed396e74388644d4f9cdbc80d35780bf305861920524f96a0ec682329fe58f033f96e98c0d16bc64fb9a111bd4c6fde2d060c3f307ec3331a1d3a41

data/.travis.yml

@@ -1,13 +1,21 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.2
-deploy:
-  skip_cleanup: true
-  provider: rubygems
-  api_key:
-    secure: JOZUQM6qAYJN/N0k4UmV3jBSKMaW3oMYiZ4boPrGm7MsUY8ETHXSYR+dDhrWOvDR4Wdr6DVbTmMtXkWJHaQaM/LkrjN2FM6mTuDfmhkcvi9VBOMstptwXeHMS9fWeogtQwHyd+pKac9vUlaMhRYyoeYyJ1i6/LHua4NftZZ8oPu/9kMuKDD3Rj8zPJNui+fGcZxq90XdxjafCfRJu7EnzSZXzVi5msaEBKcUVxsHxprBjyjmp/yh/Wn0GLyBkYYXkKEUNx9DhxVtWaNG2FfOzznj3HLXQgBdz1or1tDxG8iIegC5jEj4G+gLtldLhMYWfHDaEr4iqKLF1LkjO9TK0RjcVzGNHNxCTQaDDcjgimcVNozWg707IzT5Ap6jG4Y9JWk5KY4ysOaVFqhemafoDwQcXkPb+39N/tpeBPCByCVNrZ+5lgWaHvs+iDv0X9PyAFs5nTz6/u6bz7GDZ91oJOGs9OW6szzHwkQn5TN4omdGiOFca7lviz6OyjXeSn+a6whU2DsRXxp+omrPT/gELLGl21Wd3GGTpiGAdnu/vwvoKOZqGfkr8HS/Bozc0S/vafFJ5KoPAkNQ9iwxPgL1xcEbSF5uK67T2EYVKg7z4psXDeWGBWzk8657SBCB1VCgujkmhg+lWt0TGgrckupKSyUXL4/nnAECgizSLJSbgRE=
-  gem: idempotent-request
-  on:
-    tags: true
-    repo: qonto/idempotent-request
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
+
+jobs:
+  include:
+    - stage: gem release
+      rvm: 2.7.1
+      deploy:
+        skip_cleanup: true
+        provider: rubygems
+        api_key:
+          secure: JOZUQM6qAYJN/N0k4UmV3jBSKMaW3oMYiZ4boPrGm7MsUY8ETHXSYR+dDhrWOvDR4Wdr6DVbTmMtXkWJHaQaM/LkrjN2FM6mTuDfmhkcvi9VBOMstptwXeHMS9fWeogtQwHyd+pKac9vUlaMhRYyoeYyJ1i6/LHua4NftZZ8oPu/9kMuKDD3Rj8zPJNui+fGcZxq90XdxjafCfRJu7EnzSZXzVi5msaEBKcUVxsHxprBjyjmp/yh/Wn0GLyBkYYXkKEUNx9DhxVtWaNG2FfOzznj3HLXQgBdz1or1tDxG8iIegC5jEj4G+gLtldLhMYWfHDaEr4iqKLF1LkjO9TK0RjcVzGNHNxCTQaDDcjgimcVNozWg707IzT5Ap6jG4Y9JWk5KY4ysOaVFqhemafoDwQcXkPb+39N/tpeBPCByCVNrZ+5lgWaHvs+iDv0X9PyAFs5nTz6/u6bz7GDZ91oJOGs9OW6szzHwkQn5TN4omdGiOFca7lviz6OyjXeSn+a6whU2DsRXxp+omrPT/gELLGl21Wd3GGTpiGAdnu/vwvoKOZqGfkr8HS/Bozc0S/vafFJ5KoPAkNQ9iwxPgL1xcEbSF5uK67T2EYVKg7z4psXDeWGBWzk8657SBCB1VCgujkmhg+lWt0TGgrckupKSyUXL4/nnAECgizSLJSbgRE=
+        gem: idempotent-request
+        on:
+          tags: true
+          repo: qonto/idempotent-request

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Idempotent Request Changelog #
 
+## v0.1.5 ##
+
+* use ActiveSupport::Notifications to instrument events
+* fix an issue when getting an exception inside application would not delete lock, so client could receive 429 after 500
+
+## v0.1.4 ##
+
+* Fix an issue, when http response from backend != 200..226 caused lock to be taken
+
+## v0.1.3 ##
+
+* Fix an issue, when concurrent requests sent to an endpoint won't be protected by idempotency until the 1st request is finished
+
 ## v0.1.2 ##
 
 * Fix rack response

data/README.md

@@ -84,6 +84,23 @@ module IdempotentRequest
 end
 ```
 
+
+### Use ActiveSupport::Notifications to read events
+
+```ruby
+# config/initializers/idempotent_request.rb
+ActiveSupport::Notifications.subscribe('idempotent.request') do |name, start, finish, request_id, payload|
+  notification = payload[:request].env['idempotent.request']
+  if notification['read']
+    Rails.logger.info "IdempotentRequest: Hit cached response from key #{notification['key']}, response: #{notification['read']}"
+  elsif notification['write']
+    Rails.logger.info "IdempotentRequest: Write: key #{notification['key']}, status: #{notification['write'][0]}, headers: #{notification['write'][1]}, unlocked? #{notification['unlocked']}"
+  elsif notification['concurrent_request_response']
+    Rails.logger.warn "IdempotentRequest: Concurrent request detected with key #{notification['key']}"
+  end
+end
+```
+
 ## Custom options
 
 ```ruby
@@ -92,7 +109,8 @@ config.middleware.use IdempotentRequest::Middleware,
   header_key: 'X-Qonto-Idempotency-Key', # by default Idempotency-key
   policy: IdempotentRequest::Policy,
   callback: IdempotentRequest::RailsCallback,
-  storage: IdempotentRequest::RedisStorage.new(::Redis.current, expire_time: 1.day, namespace: 'idempotency_keys')
+  storage: IdempotentRequest::RedisStorage.new(::Redis.current, expire_time: 1.day, namespace: 'idempotency_keys'),
+  conflict_response_status: 409
 ```
 
 ### Policy
@@ -117,7 +135,7 @@ end
 
 ### Callback
 
-Get notified when the client sends a request with the same idempotency key:
+Get notified when a client sends a request with the same idempotency key:
 
 ```ruby
 class RailsCallback
@@ -133,6 +151,10 @@ class RailsCallback
 end
 ```
 
+### Conflict response status
+
+Define http status code that should be returned when a client sends concurrent requests with the same idempotency key.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/idempotent-request. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/idempotent-request.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rack', '~> 2.0'
   spec.add_dependency 'oj', '~> 3.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'fakeredis', '~> 0.6'
-  spec.add_development_dependency 'pry', '~> 0.11'
+  spec.add_development_dependency 'byebug', '~> 10.0'
 end

data/lib/idempotent-request/middleware.rb

@@ -4,6 +4,8 @@ module IdempotentRequest
       @app = app
       @config = config
       @policy = config.fetch(:policy)
+      @notifier = ActiveSupport::Notifications if defined?(ActiveSupport::Notifications)
+      @conflict_response_status = config.fetch(:conflict_response_status, 429)
     end
 
     def call(env)
@@ -13,14 +15,45 @@ module IdempotentRequest
 
     def process(env)
       set_request(env)
+      request.env['idempotent.request'] = {}
       return app.call(request.env) unless process?
-      storage = RequestManager.new(request, config)
-      storage.read || storage.write(*app.call(request.env))
+      request.env['idempotent.request']['key'] = request.key
+      response = read_idempotent_request || write_idempotent_request || concurrent_request_response
+      instrument(request)
+      response
     end
 
     private
 
-    attr_reader :app, :env, :config, :request, :policy
+    def storage
+      @storage ||= RequestManager.new(request, config)
+    end
+
+    def read_idempotent_request
+      request.env['idempotent.request']['read'] = storage.read
+    end
+
+    def write_idempotent_request
+      return unless storage.lock
+      begin
+        result = app.call(request.env)
+        request.env['idempotent.request']['write'] = result
+        storage.write(*result)
+      ensure
+        request.env['idempotent.request']['unlocked'] = storage.unlock
+        result
+      end
+    end
+
+    def concurrent_request_response
+      status = @conflict_response_status
+      headers = { 'Content-Type' => 'application/json' }
+      body = [ Oj.dump('error' => 'Concurrent requests detected') ]
+      request.env['idempotent.request']['concurrent_request_response'] = true
+      Rack::Response.new(body, status, headers).finish
+    end
+
+    attr_reader :app, :env, :config, :request, :policy, :notifier
 
     def process?
       !request.key.to_s.empty? && should_be_idempotent?
@@ -31,6 +64,10 @@ module IdempotentRequest
       policy.new(request).should?
     end
 
+    def instrument(request)
+      notifier.instrument('idempotent.request', request: request) if notifier
+    end
+
     def set_request(env)
       @env = env
       @request ||= Request.new(env, config)

data/lib/idempotent-request/redis_storage.rb

@@ -8,25 +8,37 @@ module IdempotentRequest
       @expire_time = config[:expire_time]
     end
 
+    def lock(key)
+      setnx_with_expiration(lock_key(key), Time.now.to_f)
+    end
+
+    def unlock(key)
+      redis.del(lock_key(key))
+    end
+
     def read(key)
       redis.get(namespaced_key(key))
     end
 
     def write(key, payload)
-      redis.set(
-        namespaced_key(key),
-        payload,
-        {}.tap do |options|
-          options[:nx] = true
-          options[:ex] = expire_time.to_i if expire_time.to_i > 0
-        end
-      )
+      setnx_with_expiration(namespaced_key(key), payload)
     end
 
     private
 
-    def namespaced_key(idempotency_key)
-      [namespace, idempotency_key.strip]
+    def setnx_with_expiration(key, data)
+      options = {nx: true}
+      options[:ex] = expire_time.to_i if expire_time.to_i > 0
+
+      redis.set(key, data, **options)
+    end
+
+    def lock_key(key)
+      namespaced_key("lock:#{key}")
+    end
+
+    def namespaced_key(key)
+      [namespace, key.strip]
         .compact
         .join(':')
         .downcase

data/lib/idempotent-request/request.rb

@@ -22,10 +22,9 @@ module IdempotentRequest
     private
 
     def header_name
-      key = @header_name
-        .to_s
-        .upcase
-        .gsub('-', '_')
+      key = @header_name.to_s
+                        .upcase
+                        .tr('-', '_')
 
       key.start_with?('HTTP_') ? key : "HTTP_#{key}"
     end

data/lib/idempotent-request/request_manager.rb

@@ -8,6 +8,14 @@ module IdempotentRequest
       @callback = config[:callback]
     end
 
+    def lock
+      storage.lock(key)
+    end
+
+    def unlock
+      storage.unlock(key)
+    end
+
     def read
       status, headers, response = parse_data(storage.read(key)).values
 
@@ -19,8 +27,11 @@ module IdempotentRequest
     def write(*data)
       status, headers, response = data
       response = response.body if response.respond_to?(:body)
-      return data unless (200..226).include?(status)
-      storage.write(key, payload(status, headers, response))
+
+      if (200..226).cover?(status)
+        storage.write(key, payload(status, headers, response))
+      end
+
       data
     end
 
@@ -33,17 +44,15 @@ module IdempotentRequest
     end
 
     def payload(status, headers, response)
-      Oj.dump({
-        status: status,
-        headers: headers.to_h,
-        response: Array(response)
-      })
+      Oj.dump(status: status,
+              headers: headers.to_h,
+              response: Array(response))
     end
 
-    def run_callback(action, args)
+    def run_callback(action, **args)
       return unless @callback
 
-      @callback.new(request).send(action, args)
+      @callback.new(request).send(action, **args)
     end
 
     def key

data/lib/version.rb

@@ -1,3 +1,3 @@
 module IdempotentRequest
-  VERSION = "0.1.2"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: idempotent-request
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.7
 platform: ruby
 authors:
 - Dmytro Zakharov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -42,30 +42,30 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '10.0'
 description: 
 email:
 - dmytro@qonto.eu
@@ -152,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Rack middleware ensuring at most once requests for mutating endpoints.