radiator 0.3.0dev4 → 0.3.0dev5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b709aac2407041d491d0d08abb766ce404dc0cf
-  data.tar.gz: d007d6f2d7d20b096450f05c196790da6374b76e
+  metadata.gz: a0300379f694e6b5d2fe18be77196a8f9b4b9f37
+  data.tar.gz: 00b66899ce104b1c808e29f7eb54c4db3c62972a
 SHA512:
-  metadata.gz: 073339bb35cbffff34c4adedfef58534b0827aac9757f903f94f7a2ae56adb27ef8468dc85271895a725a70eb425015faa3609424fc266d88581e81f0acd023e
-  data.tar.gz: a7cae3da19c410b1fceb01b717de6b4199dea2f7ebbd8018b7f1ef21c07e6da58439c0016508d60c7d1b9c6f8bd9f488b66179519018f7c40afc50a6e2a5f581
+  metadata.gz: 5ae0d2cc76c491041bcdcc438fbe32bede7173ce9249a2b170990a605bd9a95aba01901589e7acc452a42776eefbb71767f52313004f5638ffdfc1e376164f0b
+  data.tar.gz: 348db9e3128b82025986f9972199fd8063bf46266fbfcf6e1424d973c879cca7c96ab20fc3c8c0cfec720d570ff91f697a413bc197cd917be9c60356e84c5ed6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    radiator (0.3.0dev4)
+    radiator (0.3.0dev5)
       bitcoin-ruby (= 0.0.11)
       ffi (= 1.9.18)
       hashie (~> 3.5, >= 3.5.5)

data/lib/radiator/api.rb

@@ -336,6 +336,7 @@ module Radiator
     def method_missing(m, *args, &block)
       super unless respond_to_missing?(m)
       
+      method_name = [api_name, m].join('.')
       response = nil
       options = {
         jsonrpc: "2.0",
@@ -351,12 +352,12 @@ module Radiator
         tries += 1
         
         begin
-          if @recover_transactions_on_error
+          if @recover_transactions_on_error && api_name == :network_broadcast_api
             signatures = extract_signatures(options)
             
             if tries > 1 && !!signatures && signatures.any?
               if !!(response = recover_transaction(signatures, rpc_id, timestamp))
-                @logger.warn 'Found recovered transaction after retry.'
+                warning 'Found recovered transaction after retry.', method_name
                 response = Hashie::Mash.new(response)
               end
             end
@@ -366,54 +367,61 @@ module Radiator
             response = request(options)
             
             response = if response.nil?
-              @logger.error "No response, retrying ..."; nil
+              error "No response, retrying ...", method_name
             elsif !response.kind_of? Net::HTTPSuccess
-              @logger.warn "Unexpected response (code: #{response.code}): #{response.inspect}, retrying ..."; nil
+              warning "Unexpected response (code: #{response.code}): #{response.inspect}, retrying ...", method_name
             else
               case response.code
               when '200'
                 body = response.body
                 response = JSON[body]
                 
-                if response.keys.include?('result') && response['result'].nil?
-                  @logger.warn 'Invalid response from node, retrying ...'; nil
+                if response['id'] != options[:id]
+                  warning "Unexpected rpc_id (expected: #{options[:id]}, got: #{response['id']}), retrying ...", method_name
+                elsif response.keys.include?('error')
+                  case response['error']['code']
+                  when -32601 # Assert Exception:method_itr != api_itr->second.end(): Could not find method ...
+                    nil
+                  else
+                    Hashie::Mash.new(response)
+                  end
                 else
                   Hashie::Mash.new(response)
                 end
-              when '400' then @logger.warn 'Code 400: Bad Request, retrying ...'; nil
-              when '502' then @logger.warn 'Code 502: Bad Gateway, retrying ...'; nil
-              when '503' then @logger.warn 'Code 503: Service Unavailable, retrying ...'; nil
-              when '504' then @logger.warn 'Code 504: Gateway Timeout, retrying ...'; nil
+              when '400' then warning 'Code 400: Bad Request, retrying ...', method_name
+              when '502' then warning 'Code 502: Bad Gateway, retrying ...', method_name
+              when '503' then warning 'Code 503: Service Unavailable, retrying ...', method_name
+              when '504' then warning 'Code 504: Gateway Timeout, retrying ...', method_name
               else
-                @logger.warn "Unknown code #{response.code}, retrying ..."
+                warning "Unknown code #{response.code}, retrying ...", method_name
                 ap response
               end
             end
           end
         rescue Net::HTTP::Persistent::Error => e
-          @logger.warn "Unable to perform request: #{e} :: #{!!e.cause ? "cause: #{e.cause.message}" : ''}, retrying ..."
+          warning "Unable to perform request: #{e} :: #{!!e.cause ? "cause: #{e.cause.message}" : ''}, retrying ...", method_name
         rescue Errno::ECONNREFUSED => e
-          @logger.warn 'Connection refused, retrying ...'
+          warning 'Connection refused, retrying ...', method_name
         rescue Errno::EADDRNOTAVAIL => e
-          @logger.warn 'Node not available, retrying ...'
+          warning 'Node not available, retrying ...', method_name
         rescue Net::ReadTimeout => e
-          @logger.warn 'Node read timeout, retrying ...'
+          warning 'Node read timeout, retrying ...', method_name
         rescue Net::OpenTimeout => e
-          @logger.warn 'Node timeout, retrying ...'
+          warning 'Node timeout, retrying ...', method_name
         rescue RangeError => e
-          @logger.warn 'Range Error, retrying ...'
+          warning 'Range Error, retrying ...', method_name
         rescue OpenSSL::SSL::SSLError => e
-          @logger.warn "SSL Error (#{e.message}), retrying ..."
+          warning "SSL Error (#{e.message}), retrying ...", method_name
         rescue SocketError => e
-          @logger.warn "Socket Error (#{e.message}), retrying ..."
+          warning "Socket Error (#{e.message}), retrying ...", method_name
         rescue JSON::ParserError => e
-          @logger.warn "JSON Parse Error (#{e.message}), retrying ..."
+          warning "JSON Parse Error (#{e.message}), retrying ...", method_name
           response = nil
         rescue ApiError => e
-          @logger.warn "ApiError (#{e.message}), retrying ..."
-        rescue => e
-          @logger.warn "Unknown exception from request, retrying ..."
-          ap e if defined? ap
+          warning "ApiError (#{e.message}), retrying ...", method_name
+        # rescue => e
+        #   warning "Unknown exception from request, retrying ...", method_name
+        #   ap e if defined? ap
         end
         
         if !!response
@@ -479,8 +487,6 @@ module Radiator
     end
     
     def extract_signatures(options)
-      return unless options[:params].include? :network_broadcast_api
-      
       options[:params].map do |param|
         next unless defined? param.map
         
@@ -526,7 +532,7 @@ module Radiator
     def reset_failover
       @url = @preferred_url.dup
       @failover_urls = @preferred_failover_urls.dup
-      @logger.warn "Failover reset, going back to #{@url} ..."
+      warning "Failover reset, going back to #{@url} ..."
     end
     
     def pop_failover_url
@@ -538,7 +544,7 @@ module Radiator
       
       @uri = nil
       @url = pop_failover_url
-      @logger.warn "Failing over to #{@url} ..."
+      warning "Failing over to #{@url} ..."
     end
     
     def backoff
@@ -555,5 +561,18 @@ module Radiator
         @backoff_sleep = nil
       end
     end
+    
+    def send_log(level, message, prefix = nil)
+      if !!prefix
+        @logger.send level, "#{prefix} :: #{message}"
+      else
+        @logger.send level, "#{message}"
+      end
+      
+      nil
+    end
+    
+    def error(message, prefix = nil); send_log(:error, message, prefix); end
+    def warning(message, prefix = nil); send_log(:warn, message, prefix); end
   end
 end

data/lib/radiator/stream.rb

@@ -225,7 +225,7 @@ module Radiator
           head_block = api.get_dynamic_global_properties do |properties|
             if properties.head_block_number.nil?
               # This can happen if a reverse proxy is acting up.
-              @logger.warn "Bad block sequence after height: #{latest_block_number}"
+              warning "Bad block sequence after height: #{latest_block_number}"
               throw :sequence
             end
                 
@@ -242,7 +242,7 @@ module Radiator
             throw :sequence
           elsif head_block < latest_block_number
             # This can happen if a reverse proxy is acting up.
-            @logger.warn "Invalid block sequence at height: #{head_block}"
+            warning "Invalid block sequence at height: #{head_block}"
             sleep 0.5
             throw :sequence
           end
@@ -253,7 +253,7 @@ module Radiator
           if range.size > 400
             # When the range is 400 blocks, the stream will be behind by about
             # 20 minutes.  Time to warn.
-            @logger.warn "Stream behind by #{range.size} blocks (about #{(range.size * 3) / 60.0} minutes)."
+            warning "Stream behind by #{range.size} blocks (about #{(range.size * 3) / 60.0} minutes)."
           end
           
           [*range].each do |n|
@@ -263,8 +263,11 @@ module Radiator
             end
 
             api.get_block(n) do |current_block, error|
-              if !!error
-                @logger.warn "Node responded with: #{error.message || 'unknown error'}"
+              if current_block.nil?
+                warning "Node responded with: empty block, retrying ..."
+                throw :sequence
+              elsif !!error
+                warning "Node responded with: #{error.message || 'unknown error'}, retrying ..."
                 ap error
                 throw :sequence
               end
@@ -278,10 +281,10 @@ module Radiator
             sleep 3 / range.size
           end
         rescue StreamError; raise
-        rescue => e
-          @logger.warn "Unknown streaming error: #{e.inspect}, retrying ...  "
-          ap e
-          redo
+        # rescue => e
+        #   warning "Unknown streaming error: #{e.inspect}, retrying ...  "
+        #   ap e
+        #   redo
         end; end
       end
     end
@@ -292,7 +295,7 @@ module Radiator
       begin
         @api.shutdown
       rescue => e
-        @logger.warn("Unable to shut down: #{e}")
+        warning("Unable to shut down: #{e}")
       end
       
       @api = nil
@@ -360,7 +363,7 @@ module Radiator
               raise StreamError, JSON[response.error] if !!response.error
               result = response.result
               break if !!result
-              @logger.warn "#{key}: #{param} result missing, retrying with timeout: #{@timeout || INITIAL_TIMEOUT} seconds"
+              warnning "#{key}: #{param} result missing, retrying with timeout: #{@timeout || INITIAL_TIMEOUT} seconds"
               shutdown
               sleep timeout
             end

data/lib/radiator/version.rb

@@ -1,3 +1,3 @@
 module Radiator
-  VERSION = '0.3.0dev4'
+  VERSION = '0.3.0dev5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radiator
 version: !ruby/object:Gem::Version
-  version: 0.3.0dev4
+  version: 0.3.0dev5
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler