coinrpc 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f80efb4ad16cc2494f8c143fa84607c207317cfe0594f086d59fa068a4807072
-  data.tar.gz: d9c5104d11491b5495eda5aa23eb275d576ccd5d7e934c79d22309abc81727b5
+  metadata.gz: a3493555e3ce9e403bbd0d884396b0c6ccf803f7757e8a6bbab45408df54dfc6
+  data.tar.gz: 35e3547a5fe14792629730f271c0e6148bae8be395f82b76ff5a49994629d299
 SHA512:
-  metadata.gz: 9dc237a79a5084bb2457faefdf885d49f5c50c5543ffa9f9c65ac0b66d7fa8454559433caae0f92d08c82dbf7124809b8810a815194ac21cd56125f5e35e4fa8
-  data.tar.gz: 35f065275ae97da765aee7054ec77836928356d8d2efbd17fdd046f6337d71c6fb6c8ae997258c1fd7c7d60e167c2f5bf52fc1faece9cce387e8d9ba59c1e3ce
+  metadata.gz: 8849abd81ed97fadc7ce19778cef998b64536af4142cbf0e249d4eea777e386f565a5dc26ccb766cd78d670a627f8dc2b946880f8f24f122a474157b8d11b363
+  data.tar.gz: db827e4d80c96fc4dddcc79e1fea46c2f69aab1aa6afbad68222616c5c91ac21651d39a60853cb85024f22a8c0fbeae56d56c18f9a362b38f653862e06be3b7d

data/coinrpc.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", ">= 13.0", "< 14.0"
   spec.add_runtime_dependency "json", "~> 2.0", ">= 2.3.1", "< 3.0"
   spec.add_runtime_dependency "oj", ">= 3.10", "< 4.0"
-  spec.add_runtime_dependency "http", ">= 4.4", "< 5.2"
+  spec.add_runtime_dependency "typhoeus", ">= 1.0", "< 2.0"
 end

data/lib/coinrpc/version.rb

@@ -1,3 +1,3 @@
 module CoinRPC
-  VERSION = "2.0.1"
+  VERSION = "3.0.0".freeze
 end

data/lib/coinrpc.rb

@@ -1,26 +1,38 @@
-require "http"
+require "uri"
+require "typhoeus"
 require "oj"
 require "json"
+require "securerandom"
 require "coinrpc/version"
 
 # let OJ mimic JSON
 Oj.mimic_JSON
 
 module CoinRPC
+
+  class TimeoutError < Exception; end
+  class UnsuccessfulError < Exception; end
+  class NoResponseError < Exception; end
+  
   class Client
 
     JSONRPC_V1_1 = "1.1".freeze
     JSONRPC_V2_0 = "2.0".freeze
+    TIMEOUT = 60.freeze
     
     def initialize(url)
 
       urinfo = URI.parse(url)
 
-      @client = HTTP.persistent("http://#{urinfo.host}:#{urinfo.port}").timeout(60).basic_auth({:user => urinfo.user, :pass => urinfo.password})
-      @id = rand(1000000)
-
+      @options = {:timeout => TIMEOUT, :userpwd => "#{urinfo.user}:#{urinfo.password}", :headers => {"User-Agent" => "CoinRPC/#{CoinRPC::VERSION}"}}.freeze
+      @url = "http://#{urinfo.host}:#{urinfo.port}/".freeze
+      
     end
-
+    
+    def random_id
+      SecureRandom.hex(4).to_i(16)
+    end
+    
     def method_missing(method, *args)
 
       fixed_method = method.to_s.gsub(/\_/,"").freeze
@@ -28,9 +40,9 @@ module CoinRPC
       
       if args[0].is_a?(Array) and args[0].size > 0 then
         # batch request
-        post_data = args.map{|arg| {:jsonrpc => JSONRPC_V2_0, :method => fixed_method, :params => arg, :id => (@id += 1)} }
+        post_data = args.map{|arg| {:jsonrpc => JSONRPC_V2_0, :method => fixed_method, :params => arg, :id => random_id} }
       else
-        post_data = {:method => fixed_method, :params => args, :jsonrpc => JSONRPC_V1_1, :id => (@id += 1)}
+        post_data = {:method => fixed_method, :params => args, :jsonrpc => JSONRPC_V1_1, :id => random_id}
       end
       
       api_call(post_data)
@@ -40,10 +52,14 @@ module CoinRPC
     private
     def api_call(params)
 
-      response = @client.post("/", :body => Oj.dump(params, mode: :compat)).to_s
+      response = Typhoeus::Request.post(@url, :body => Oj.dump(params, :mode => :compat), **@options)
+
+      raise CoinRPC::TimeoutError if response.timed_out?
+      raise CoinRPC::NoResponseError if response.code.eql?(0)
+      raise CoinRPC::UnsuccessfulError unless response.success?
 
-      # this won"t work without Oj.mimic_JSON
-      result = Oj.strict_load(response, :decimal_class => BigDecimal)
+      # this won't work without Oj.mimic_JSON
+      result = Oj.strict_load(response.body, :decimal_class => BigDecimal)
       
       raise result["error"]["message"] if result.is_a?(Hash) and !result["error"].nil?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coinrpc
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Atif Nazir
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-02 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,25 +97,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: http
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.4'
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '2.0'
 description: This Ruby Gem is a fast RPC client for Bitcoin Core style software, including
   Dogecoin, Litecoin, and other similar software that implements Bitcoin Core RPC
   interfaces.