radiator 0.2.3 → 0.3.0dev1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4680bd4799cc89d96debf2bc7bed9840ac7d4ee
-  data.tar.gz: baa7e04d9ed7218394d4c25252c69a3fd457dc1f
+  metadata.gz: db2757e072c1d05c7f12eb6228245cb66680af4a
+  data.tar.gz: 33ade0af04c25fdae0dce9bf94322367d68cfbe3
 SHA512:
-  metadata.gz: 3c54e0c4298930546d10e0bf372c73cdfdd26c4b90aff0da21a975693ce87e53aed4842b1f6e8c1f7be53ab3a816a99c9896aa1512ae37d4063440ce65e25035
-  data.tar.gz: 6afbb0439e165b2f8c7270f92e63638362f6b9f51a8644b1fad9a42ee94ab758940c89e33d8de05d7f6f4048e58e7ea925e4c67e83a67664a436b6d81a053f1e
+  metadata.gz: 8c5a3a4079b0f5d92f142fee590f3e6e0256bdba99c2f78951f2030dc68ad4f3f42cc6fd013293cab4342b596be3789432acea19f518de5cf06a8097da1048c1
+  data.tar.gz: 836ea02d0e39a9ac338b301ff65ed9efc8256336b3fccc482e377f573d131970459cb4dee3af3102c49583b61b308a8e77b1241cbca9cdd2755f8bc901285de8

data/.gitignore

@@ -48,3 +48,4 @@ build-iPhoneSimulator/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+hashie.log

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    radiator (0.2.3)
+    radiator (0.3.0dev1)
       bitcoin-ruby (= 0.0.11)
       ffi (= 1.9.18)
       hashie (~> 3.5, >= 3.5.5)
-      json (~> 1.8, >= 1.8.6)
+      json (~> 2.0, >= 2.0.2)
       logging (~> 2.2, >= 2.2.0)
       net-http-persistent (~> 2.9, >= 2.9.4)
 
@@ -29,7 +29,7 @@ GEM
     ffi (1.9.18)
     hashdiff (0.3.6)
     hashie (3.5.6)
-    json (1.8.6)
+    json (2.0.2)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -48,9 +48,9 @@ GEM
     public_suffix (3.0.0)
     rake (11.3.0)
     safe_yaml (1.0.4)
-    simplecov (0.11.2)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     slop (3.6.0)
@@ -76,7 +76,7 @@ DEPENDENCIES
   pry (~> 0.10.3)
   radiator!
   rake (~> 11.2, >= 11.2.2)
-  simplecov (~> 0.11.2)
+  simplecov (~> 0.15.1)
   typhoeus (~> 1.0, >= 1.0.2)
   vcr (~> 2.9, >= 2.9.2)
   webmock (~> 2.1, >= 2.1.0)

data/lib/radiator/api.rb

@@ -7,14 +7,36 @@ require 'net/http/persistent'
 
 module Radiator
   class Api
+    DEFAULT_URL = 'https://steemd.steemit.com'
+    
+    DEFAULT_FAILOVER_URLS = [
+      DEFAULT_URL,
+      'https://steemd.steemitdev.com',
+      'https://steemd-int.steemit.com',
+      'https://steemd.steemitstage.com',
+      'https://gtg.steem.house:8090',
+      'https://rpc.steemliberator.com'
+    ]
+    
+    POST_HEADERS = {
+      'Content-Type' => 'application/json'
+    }
+    
     def initialize(options = {})
       @user = options[:user]
       @password = options[:password]
-      @url = options[:url] || 'https://steemd.steemit.com'
+      @url = options[:url] || DEFAULT_URL
+      @preferred_url = @url.dup
+      @failover_urls = options[:failover_urls] || (DEFAULT_FAILOVER_URLS - [@url])
+      @preferred_failover_urls = @failover_urls.dup
       @debug = !!options[:debug]
       @net_http_persistent_enabled = true
       @logger = options[:logger] || Radiator.logger
-      @hashie_logger = options[:hashie_logger] || Logger.new('/dev/null')
+      @hashie_logger = options[:hashie_logger] || Logger.new(nil)
+      
+      unless @hashie_logger.respond_to? :warn
+        @hashie_logger = Logger.new(@hashie_logger)
+      end
       
       Hashie.logger = @hashie_logger
       @method_names = nil
@@ -113,59 +135,53 @@ module Radiator
         begin
           response = request(options)
           
-          if !!response
-            case response.code
-            when '200'
-              response = JSON[response.body]
-              
-              return Hashie::Mash.new(response)
-            when '400'
-              @logger.warn('Code 400: Bad Request, retrying ...')
-              backoff
-            when '502'
-              @logger.warn('Code 502: Bad Gateway, retrying ...')
-              backoff
-            when '503'
-              @logger.warn('Code 503: Service Unavailable, retrying ...')
-              backoff
-            when '504'
-              @logger.warn('Code 504: Gateway Timeout, retrying ...')
-              backoff
-            else
-              ap "Unknown code #{response.code}, retrying ..."
-              ap response
-              backoff
-            end
+          if response.nil?
+            @logger.error "No response, retrying ..."
+            backoff
+            redo
+          end
+          
+          case response.code
+          when '200'
+            response = JSON[response.body]
+            
+            return Hashie::Mash.new(response)
+          when '400'
+            @logger.warn 'Code 400: Bad Request, retrying ...'
+          when '502'
+            @logger.warn 'Code 502: Bad Gateway, retrying ...'
+          when '503'
+            @logger.warn 'Code 503: Service Unavailable, retrying ...'
+          when '504'
+            @logger.warn 'Code 504: Gateway Timeout, retrying ...'
+          else
+            @logger.warn "Unknown code #{response.code}, retrying ..."
+            ap response
           end
           
-          @logger.error("No response.")
-          break
-        rescue Errno::ECONNREFUSED => e
-          @logger.warn('Connection refused, retrying ...')
           backoff
+        rescue Errno::ECONNREFUSED => e
+          @logger.warn 'Connection refused, retrying ...'
         rescue Errno::EADDRNOTAVAIL => e
-          @logger.warn('Node not available, retrying ...')
-          backoff
+          @logger.warn 'Node not available, retrying ...'
         rescue Net::ReadTimeout => e
-          @logger.warn('Node read timeout, retrying ...')
-          backoff
+          @logger.warn 'Node read timeout, retrying ...'
         rescue Net::OpenTimeout => e
-          @logger.warn('Node timeout, retrying ...')
-          backoff
+          @logger.warn 'Node timeout, retrying ...'
         rescue RangeError => e
-          @logger.warn('Range Error, retrying ...')
-          backoff
+          @logger.warn 'Range Error, retrying ...'
         rescue OpenSSL::SSL::SSLError => e
-          @logger.warn("SSL Error (#{e.message}), retrying ...")
-          backoff
+          @logger.warn "SSL Error (#{e.message}), retrying ..."
         rescue SocketError => e
-          @logger.warn("Socket Error (#{e.message}), retrying ...")
-          backoff
+          @logger.warn "Socket Error (#{e.message}), retrying ..."
+        rescue JSON::ParserError => e
+          @logger.warn "JSON Parse Error (#{e.message}), retrying ..."
         rescue => e
-          puts "Unknown exception from request ..."
+          @logger.warn "Unknown exception from request ..."
           ap e
-          backoff
         end
+          
+        backoff
       end # loop
     end
     
@@ -184,12 +200,12 @@ module Radiator
         e if e['api'].to_sym == api_name
       end.compact.freeze
     end
-
+    
     def rpc_id
       @rpc_id ||= 0
       @rpc_id = @rpc_id + 1
     end
-  
+    
     def uri
       @uri ||= URI.parse(@url)
     end
@@ -205,7 +221,7 @@ module Radiator
     end
     
     def post_request
-      Net::HTTP::Post.new uri.request_uri, 'Content-Type' => 'application/json'
+      Net::HTTP::Post.new uri.request_uri, POST_HEADERS
     end
     
     def request(options)
@@ -213,17 +229,17 @@ module Radiator
         begin
           request = post_request
           request.body = JSON[options]
+          response = http.request(uri, request)
           
-          if (response = http.request(uri, request)).kind_of? Net::HTTPSuccess
-            return response
-          else
-            @logger.warn "Unexpeced response: #{response.inspect}; temporarily falling back to non-persistent-http"
-          end
+          return response if response.kind_of? Net::HTTPSuccess
+          @logger.warn "Unexpeced response: #{response.inspect}; temporarily falling back to non-persistent-http"
+          backoff
+          @net_http_persistent_enabled = false
         rescue Net::HTTP::Persistent::Error => e
           @logger.warn "Unable to perform request: #{request} :: #{e} :: #{!!e.cause ? "cause: #{e.cause.message}" : ''}; temporarily falling back to non-persistent-http"
+          backoff
+          @net_http_persistent_enabled = false
         end
-        
-        @net_http_persistent_enabled = false
       end
         
       unless @net_http_persistent_enabled
@@ -240,7 +256,27 @@ module Radiator
       end
     end
     
+    def reset_failover
+      @url = @preferred_url.dup
+      @failover_urls = @preferred_failover_urls.dup
+      @logger.warn "Failover reset, going back to #{@url} ..."
+    end
+    
+    def pop_failover_url
+      @failover_urls.delete(@failover_urls.sample) || @url
+    end
+    
+    def bump_failover
+      reset_failover if @failover_urls.none?
+      
+      @uri = nil
+      @url = pop_failover_url
+      @logger.warn "Failing over to #{@url} ..."
+    end
+    
     def backoff
+      shutdown
+      bump_failover if !!@backoff_at && Time.now - @backoff_at < 300
       @backoff_at ||= Time.now
       @backoff_sleep ||= 0.01
       

data/lib/radiator/version.rb

@@ -1,3 +1,3 @@
 module Radiator
-  VERSION = '0.2.3'
+  VERSION = '0.3.0dev1'
 end

data/radiator.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.9', '>= 5.9.0'
   spec.add_development_dependency 'minitest-line', '~> 0.6.3'
   spec.add_development_dependency 'webmock', '~> 2.1', '>= 2.1.0'
-  spec.add_development_dependency 'simplecov', '~> 0.11.2'
+  spec.add_development_dependency 'simplecov', '~> 0.15.1'
   spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.5.2'
   spec.add_development_dependency 'vcr', '~> 2.9', '>= 2.9.2'
   spec.add_development_dependency 'faraday', '~> 0.9.2'
@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   # Maximum for net-http-persistent is 2.9.4, required by ruby-2.0.0-p645, which
   # is the darwin default at the moment.
   spec.add_dependency('net-http-persistent', '~> 2.9', '>= 2.9.4')
-  spec.add_dependency('json', '~> 1.8', '>= 1.8.6')
+  spec.add_dependency('json', '~> 2.0', '>= 2.0.2')
   spec.add_dependency('logging', '~> 2.2', '>= 2.2.0')
   spec.add_dependency('hashie', '~> 3.5', '>= 3.5.5')
   spec.add_dependency('bitcoin-ruby', '0.0.11')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: radiator
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0dev1
 platform: ruby
 authors:
 - Anthony Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,14 +110,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.15.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -260,20 +260,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.6
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement
@@ -405,12 +405,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: STEEM RPC Ruby Client