istox 0.2.12 → 0.2.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e20a7e8c3bb246c95ff7ac01eb4b73049b429e8741c9347dac1d38ecfa349854
-  data.tar.gz: 859b3ade6a2587bfac4f760205afdbce1da4b64c3cdaa99c1a96003c59a486bc
+  metadata.gz: 0bce8aeff0172a935744cd551d7484db72b031c6d5c1987e333556ca78371472
+  data.tar.gz: c64f7d731ad1295b6713225e347484c20cc52e240f33c096a5b2196f4ab3f1e0
 SHA512:
-  metadata.gz: d9e42d23f68b197f2d446cbc3a978af16e02f71afb7694a74b3a6fd83460d0da81c13ac644e0c3bfde3f6671358f0f20f55d0b8c9bbb0ebd4c6d0cb6d0780ed7
-  data.tar.gz: d73207c0bfcb94e29a92723f57395dd475dc94102ab186727e7567dd4e586283d9e9f14dbb3353e5e60b09ad0c7a69edc8629ef03bbe43cb10510d64a23f4793
+  metadata.gz: 0aff2668703907f10658e8d083224e26a15b01871aa73f7118b4405475b96d1442b8c451fa0261a173cc8b42c06c60af939fb2be60b91811e8a36818de53f19b
+  data.tar.gz: c5bef66c72b43dcd00f9c536a6bc8e186c1d9f657ec749346638ccc624b1762c08a1a5f9173ba609b426187353c8af40784ebfad09aee849dc1a33fe3c1efb11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.2.12)
+    istox (0.2.14.2)
       amazing_print
       awesome_print
       aws-sdk-sns (~> 1)
@@ -74,7 +74,7 @@ GEM
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-sns (1.41.0)
+    aws-sdk-sns (1.42.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-xray (1.4.0)
@@ -112,36 +112,40 @@ GEM
       i18n (~> 0.5)
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (1.4.3)
+    faraday (1.5.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     ffi (1.15.3)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.17.3)
-    googleapis-common-protos-types (1.0.6)
+    google-protobuf (3.17.3-universal-darwin)
+    googleapis-common-protos-types (1.1.0)
       google-protobuf (~> 3.14)
     graphlient (0.5.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.12.12)
+    graphql (1.12.14)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.38.0)
+    grpc (1.38.0-universal-darwin)
       google-protobuf (~> 3.15)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.38.0)
@@ -174,7 +178,7 @@ GEM
     nokogiri (1.11.7)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    oj (3.11.7)
+    oj (3.12.2)
     ougai (2.0.0)
       oj (~> 3.10)
     paranoia (2.4.3)
@@ -260,7 +264,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
     set (1.0.1)
     slop (4.9.1)
     sorted_set (1.0.3)

data/lib/istox.rb

@@ -27,6 +27,7 @@ module Istox
   require 'istox/helpers/graphql_client'
   require 'istox/helpers/gruf_listener_hook'
   require 'istox/helpers/messaging'
+  require 'istox/helpers/race_condition_helper'
   require 'istox/helpers/blockchain_service'
   require 'istox/helpers/f_math'
   require 'istox/helpers/my_open_struct'

data/lib/istox/helpers/blockchain_service.rb

@@ -30,6 +30,7 @@ module Istox
           request_reason: request_reason,
           resource_action: action
         )
+        key = nil
 
         chainhub_processing = true
 
@@ -39,6 +40,13 @@ module Istox
           # execute before proc, and get the model that blockchain receipt should bind to
           model = before.call(uuid)
 
+          key = model.class.name + '-' + model.id.to_s
+          ## for request there we need a lock to prevent there is not duplicate request exist for single model
+          ::Istox::RaceConditionHelper.acquire!(key) if is_request
+
+          ## validate the request, this validation is overridable by inherited class
+          receipt.validate_request!(model.class.name, model.id) if is_request
+
           # delete the previous existing blockchain receipts
           klass.where(resource_name: model.class.name, resource_id: model.id).destroy_all
 
@@ -57,11 +65,14 @@ module Istox
               chainhub_processing = false
             end
           end
+
+          ::Istox::RaceConditionHelper.release(key) if is_request
         end
 
         chainhub_processing
       rescue StandardError => e
         receipt&.destroy
+        ::Istox::RaceConditionHelper.release(key) if is_request && key.present?
         raise e
       end
 

data/lib/istox/helpers/formatter.rb

@@ -13,7 +13,9 @@ module Istox
 
         result = format("%.#{precision}f", input)
 
-        result.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse
+        parts = result.to_s.split('.')
+        parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, '\\1,')
+        parts.join('.')
       end
 
       # format a money, eg. 20000.134 > SGD 20,000.14, position can be :front or :behind, abs_num: whether to absolute the number

data/lib/istox/helpers/race_condition_helper.rb

@@ -0,0 +1,30 @@
+module Istox
+  class RaceConditionHelper
+    class << self
+      def acquire!(key, expired_seconds: 20)
+        result = acquire(key, expired_seconds: expired_seconds)
+
+        raise 'Duplicate request detected, please refresh the page and try again.' if result == false
+      end
+
+      def acquire(key, expired_seconds: 20)
+        result = request_redis.set('race-condition||' + key.to_s, 'EMPTY', nx: true, ex: expired_seconds.to_i.seconds)
+
+        log.info("Acquiring lock for key: #{key}, expired in #{expired_seconds} seconds, result: #{result}")
+
+        # if result false means the key already exist
+        result
+      end
+
+      def release(key)
+        request_redis.del('race-condition||' + key.to_s)
+
+        log.info("Releasing lock for key: #{key}")
+      end
+
+      def request_redis
+        @request_redis ||= ::Istox::RedisManager.request_redis
+      end
+    end
+  end
+end

data/lib/istox/models/blockchain_receipt.rb

@@ -5,5 +5,7 @@ module Istox
     def activity
       I18n.t("#{resource_name}.#{resource_action}") if resource_name.present? && resource_action.present?
     end
+
+    def validate_request!(model_name, model_id); end
   end
 end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.2.12'.freeze
+  VERSION = '0.2.14.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.14.2
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -495,6 +495,7 @@ files:
 - lib/istox/helpers/order_book_price_time.rb
 - lib/istox/helpers/order_book_prorate.rb
 - lib/istox/helpers/publisher.rb
+- lib/istox/helpers/race_condition_helper.rb
 - lib/istox/helpers/rate_limit.rb
 - lib/istox/helpers/redis_boot.rb
 - lib/istox/helpers/redis_manager.rb