istox 0.1.156.1 → 0.1.157

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff41ac998f85a03dba3cf04311aa1a32a77d74296257a60ff118e45fcf45d850
-  data.tar.gz: 6d693142d844ac5b4b2cbd749aee72d4d9840ae8d7bb07f638f433423d535fc7
+  metadata.gz: f51fbf74138fecbca4e019e075b3c6331cf78d20a5b274c8222c333430e66f68
+  data.tar.gz: 68a475a848f0118566ec6ea8bb8369ffb80ad90781441fc01d357bcd49f7ed78
 SHA512:
-  metadata.gz: 007a55882ae2e7c0e83fd2ddf9d7a9eb9ce8631fdd9265754e68a4463faebfdf2bebcd62012b1a49f99395b198a456109f20c17a2dd39854a944bc049a1fb035
-  data.tar.gz: 674b7cdd25bfc8a78416823cc5e9fdc206324c1e08f980a6592ca12a1e8667e833af973834258cd70b4c8c413162aa4a91ba699bdffc591f08fdd345975da08a
+  metadata.gz: 07becada18723f399368b68194ec4ae9e5f42184fb33296f3358034920e41859865024a1926a51acbde84eb0f2897c5c40d60e5180ed78c7a65b0d54aed8947b
+  data.tar.gz: f9b7aff484d33556e91311e31a0c9a6d4e1166105d80335e6923e9b89511e8fb2873180598ca4e6e06b2e3b871bb43aafcf2c130b2a1d02739be6987b811f307

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    istox (0.1.156)
+    istox (0.1.157)
       amazing_print
       awesome_print
+      aws-sdk-sns (~> 1)
       binding_of_caller
       bunny (>= 2.12.0)
       exponential-backoff (= 0.0.4)
@@ -63,8 +64,8 @@ GEM
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    amazing_print (1.2.0)
-    amq-protocol (2.3.1)
+    amazing_print (1.2.1)
+    amq-protocol (2.3.2)
     arel (9.0.0)
     awesome_print (1.8.0)
     aws-eventstream (1.1.0)
@@ -74,6 +75,9 @@ GEM
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
+    aws-sdk-sns (1.24.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
     aws-sdk-xray (1.4.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
@@ -82,13 +86,14 @@ GEM
     aws-xray-sdk (0.11.4)
       aws-sdk-xray (~> 1.4.0)
       multi_json (~> 1)
+    bigdecimal (2.0.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
     bullet (5.7.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
-    bunny (2.15.0)
+    bunny (2.16.1)
       amq-protocol (~> 2.3, >= 2.3.1)
     byebug (11.1.3)
     coderay (1.1.2)
@@ -115,21 +120,21 @@ GEM
     ffi (1.13.1)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.12.2-universal-darwin)
+    google-protobuf (3.13.0-universal-darwin)
     googleapis-common-protos-types (1.0.5)
       google-protobuf (~> 3.11)
     graphlient (0.4.0)
       faraday (>= 1.0)
       faraday_middleware
       graphql-client
-    graphql (1.10.10)
+    graphql (1.11.3)
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.28.0-universal-darwin)
-      google-protobuf (~> 3.11)
+    grpc (1.31.1-universal-darwin)
+      google-protobuf (~> 3.12)
       googleapis-common-protos-types (~> 1.0)
-    grpc-tools (1.28.0)
+    grpc-tools (1.31.1)
     gruf (2.8.1)
       activesupport (> 4)
       concurrent-ruby (> 1)
@@ -166,7 +171,8 @@ GEM
     nio4r (2.3.1)
     nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
-    oj (3.10.6)
+    oj (3.10.9)
+      bigdecimal (~> 2.0)
     ougai (1.8.5)
       oj (~> 3.10)
     paranoia (2.4.2)
@@ -218,16 +224,16 @@ GEM
     redis-activesupport (5.2.0)
       activesupport (>= 3, < 7)
       redis-store (>= 1.3, < 2)
-    redis-namespace (1.7.0)
+    redis-namespace (1.8.0)
       redis (>= 3.0.4)
-    redis-rack (2.1.2)
+    redis-rack (2.1.3)
       rack (>= 2.0.8, < 3)
       redis-store (>= 1.2, < 2)
     redis-rails (5.0.2)
       redis-actionpack (>= 5.0, < 6)
       redis-activesupport (>= 5.0, < 6)
       redis-store (>= 1.2, < 2)
-    redis-store (1.8.2)
+    redis-store (1.9.0)
       redis (>= 4, < 5)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -250,7 +256,7 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    slop (4.8.1)
+    slop (4.8.2)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -265,7 +271,7 @@ GEM
     tzinfo (1.2.6)
       thread_safe (~> 0.1)
     uniform_notifier (1.11.0)
-    vault (0.14.0)
+    vault (0.15.0)
       aws-sigv4
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)

data/istox.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'amazing_print'
   spec.add_dependency 'awesome_print'
+  spec.add_dependency 'aws-sdk-sns', '~> 1'
   spec.add_dependency 'binding_of_caller'
   spec.add_dependency 'bunny', '>= 2.12.0'
   spec.add_dependency 'exponential-backoff', '0.0.4'

data/lib/istox.rb

@@ -16,6 +16,7 @@ module Istox
   require 'istox/helpers/logger'
   require 'istox/interfaces/chainhub/transaction'
   require 'istox/helpers/publisher'
+  require 'istox/helpers/sns_publisher'
   require 'istox/helpers/subscriber'
   require 'istox/helpers/bunny_boot'
   require 'istox/helpers/rate_limit'

data/lib/istox/consumers/blockchain_status_handler.rb

@@ -88,7 +88,7 @@ module Istox
       end
 
       def mark_resource_handled(receipt)
-        receipt.update(resource_handled: true)
+        receipt.reload.update(resource_handled: true)
       rescue StandardError => e
         log.warn "Unable to update resource_handled for receipt #{receipt.inspect},
         but will silently ignore the error"

data/lib/istox/helpers/bunny_boot.rb

@@ -276,6 +276,10 @@ module Istox
         end
         options_dup.merge!(persistent: persistent)
         options_dup.merge!(mandatory: mandatory)
+
+        options_dup[:headers] = {} if options[:headers].nil?
+        options_dup[:headers][:sender] = Thread.current.object_id
+
         # message.merge!(locale: I18n.locale)
 
         publisher_interceptors.each do |interceptor|

data/lib/istox/helpers/formatter.rb

@@ -2,21 +2,23 @@ module Istox
   class Formatter
     class << self
       # format a number, eg. 20000.134 > 20,000.14
-      def number(input, round_mode: :half_up, precision: 2)
+      def number(input, round_mode: :half_up, precision: 2, abs_num: false)
         BigDecimal.mode(BigDecimal::ROUND_MODE, round_mode)
 
         input = 0 if input.blank?
 
         input = ::BigDecimal.new(input.to_s).round(precision, round_mode)
 
+        input = input.abs if abs_num
+
         result = format("%.#{precision}f", input)
 
         result.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1,').reverse
       end
 
-      # format a money, eg. 20000.134 > SGD 20,000.14, position can be :front or :behind
-      def money(input, round_mode: :half_up, precision: 2, currency:, position: :front)
-        result = number(input, round_mode: round_mode, precision: precision)
+      # format a money, eg. 20000.134 > SGD 20,000.14, position can be :front or :behind, abs_num: whether to absolute the number
+      def money(input, round_mode: :half_up, precision: 2, currency:, position: :front, abs_num: false)
+        result = number(input, round_mode: round_mode, precision: precision, abs_num: abs_num)
 
         return currency + ' ' + result if position == :front
 

data/lib/istox/helpers/publisher.rb

@@ -1,6 +1,9 @@
 require 'securerandom'
 require 'istox/helpers/logger'
 
+class RabbitMQPublishError < StandardError
+end
+
 module Istox
   # Publisher is relying on BunnyBoot to publish message, please make sure BunnyBoot is initalised properly first during runtime.
   class Publisher
@@ -174,21 +177,20 @@ module Istox
         # when an unroutable message is returned, the BasicReturn is fired first and then an ack is sent, firing the BasicAck second.
         # So if the current status is unroutable then we need to make sure that we don't overwrite that status with Success (ack).
         ex.on_return do |return_info, properties, content|
-          return_info = return_info.to_hash
-          properties = properties.to_hash
+          return_info = return_info.to_hash.deep_symbolize_keys
+          properties = properties.to_hash.deep_symbolize_keys
           log.debug "Got a returned message info: #{return_info}"
           log.debug "Got a returned message properties: #{properties}"
           log.debug "Got a returned message content: #{content}"
-=begin
-          ::Istox::BunnyBoot.find_trackers("message_id:#{properties[:message_id]}").each do |key|
-            log.debug("On_return, update key #{key} in redis on status and retry counter")
-            ::Istox::BunnyBoot.update_tracker_by_status(key, 2)
-            ::Istox::BunnyBoot.update_tracker_incr_retry(key)
+
+          if properties[:headers] && properties[:headers][:sender]
+            @error = Hash.new if @error.nil?
+            tid = properties[:headers][:sender]
+            @error[tid] = Hash.new if @error[Thread.current.object_id].nil?
+            @error[tid][:return_info] = return_info
+            @error[tid][:properties] = properties
+            @error[tid][:content] = content
           end
-=end
-          options = properties.clone
-          options[:routing_key] = return_info[:routing_key]
-          republish(ex, options, content)
         end
 
         exchanges[id] = ex
@@ -199,7 +201,7 @@ module Istox
       end
 
       # Handle republish: check and increase retry count
-      def republish(ex, options = {}, message)
+      def republish(ex, options = {}, message, error)
         options[:headers] = {} if options[:headers].nil?
 
         if options[:headers][:republish].nil?
@@ -208,11 +210,12 @@ module Istox
         else
           options[:headers][:republish_count] += 1
           if options[:headers][:republish_count] > 10
-            log.info "Already retry to publish for 10 times, and give up retry"
+            log.fatal "Already retry to publish for 10 times, and give up retry"
             log.info "Publish options: #{options.inspect}"
             log.info "Publish to exchange: #{ex.name}"
             log.info "Publish payload: #{message.inspect}"
-            return false
+
+            raise RabbitMQPublishError, "Publish fails after retries(10): #{error}"
           end
         end
 
@@ -245,27 +248,34 @@ module Istox
           success = ex.channel.wait_for_confirms
           if success
             log.debug("Message confirm success: remove message for #{channel_id}")
-            # ::Istox::BunnyBoot.del_tracker_on_channel channel_id
-            # republish(ex, options, message)
-            true
+            if @error.nil? || @error[Thread.current.object_id].nil?
+              # republish(ex, options, message, 'simulate errors')
+              true
+            else
+              error = @error[Thread.current.object_id][:return_info][:reply_text]
+              @error[Thread.current.object_id] = nil
+              republish(ex, options, message, error)
+            end
           else
             ex.channel.nacked_set.each do |n|
               log.debug("Publish Error: UNACK delivery tag is #{n}, republish message")
               # options = ::Istox::BunnyBoot.find_tracker_on_channel(channel_id, n, 'options')
               # options = JSON.parse(options, :symbolize_names => true)
               # options[:delivery_tag] = n
-              republish(ex, options, message)
+              republish(ex, options, message, 'broker processing fails')
             end
           end
         end
       rescue Bunny::ConnectionClosedError => e
-        log.debug "Publish fails due to #{e}"
+        log.error "Publish fails due to #{e}"
         # For network related retry, sleep 2 second before retry
         # Because it may take some seconds for automatic recovery of network
         sleep 2
-        republish(ex,options,message)
+        republish(ex, options, message, e.message)
+      rescue RabbitMQPublishError => e
+        raise RabbitMQPublishError, e.message
       rescue => e
-        log.debug "Publish error happening: #{e.message}"
+        log.error "Publish error happening: #{e.message}"
 
         # If the error indicates that the channel is already closed
         # then clear hash @channel and @exchange
@@ -277,7 +287,7 @@ module Istox
         end
 
         # Republish msg
-        republish(ex, options, message)
+        republish(ex, options, message, e.message)
       end
     end
   end

data/lib/istox/helpers/sns_publisher.rb

@@ -0,0 +1,38 @@
+require 'aws-sdk-sns'
+
+module Istox
+  class SnsPublisher
+    class << self
+      # exception will not be thrown if throw_exception is set to false, exception will only be printed out and swallowed
+      def publish(message, topic_arn: nil, throw_exception: false)
+        if message.nil?
+          log.info('No message to publish, skipping SNS publish now...')
+          return
+        end
+
+        log.info('Publishing to SNS...')
+
+        message = JSON.generate(message) unless message.is_a? String
+
+        sns_client.publish({ topic_arn: topic_arn || ENV.fetch('PUSHER_TOPIC_ARN', ''), message: message })
+
+        log.info('Publish to SNS successfully.')
+      rescue StandardError => e
+        log.fatal 'Unable to publish SNS message.'
+        log.fatal(e)
+        log.info('Failed to publish SNS, ignoring...') unless throw_exception
+
+        raise e if throw_exception
+      end
+
+      def sns_client
+        return @sns_client if @sns_client.present?
+
+        Aws.config.update({ region: ENV.fetch('AWS_REGION', 'ap-southeast-1'),
+                            credentials: Aws::Credentials.new('AWS_STS_ACCESS_KEY_ID', 'AWS_STS_SECRET_ACCESS_KEY') })
+
+        @sns_client = Aws::SNS::Client.new(region: ENV.fetch('AWS_REGION', 'ap-southeast-1'))
+      end
+    end
+  end
+end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.156.1'.freeze
+  VERSION = '0.1.157'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.156.1
+  version: 0.1.157
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-09 00:00:00.000000000 Z
+date: 2020-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amazing_print
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-sns
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
@@ -509,6 +523,7 @@ files:
 - lib/istox/helpers/regex_helper.rb
 - lib/istox/helpers/remote_model_cache.rb
 - lib/istox/helpers/result_handler.rb
+- lib/istox/helpers/sns_publisher.rb
 - lib/istox/helpers/subscriber.rb
 - lib/istox/helpers/vault.rb
 - lib/istox/helpers/xray/grpc_client_xray_interceptor.rb