yolodice-client 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28beeaeb68b98fbd9f62194e22ca472c73194283
-  data.tar.gz: a59197fdaa0adda43544cc8053eb2a596c188d98
+  metadata.gz: 89b107ea48a90ef892fd4b9a3039da928cc57ad0
+  data.tar.gz: 0d25fee7964cbf8affb821ce40ff4e1f1025e603
 SHA512:
-  metadata.gz: 551030f12886d365a26cebcdcf9f703196b77f413afb82361ced5e5409b6362fb22f6981829ddd6a5a3324203807c658fa33ef2f833e5da50b2ead2c68629a15
-  data.tar.gz: d06b7f79620c175ac78c720aeecd62bd5f82062cfa1efe51b31807d589b854420bb84044b0c0122db5aa0b3f81405b13a0901cd940e199d083b6963487be898b
+  metadata.gz: 2384127fe8a12093d74cafbc806d0c68cbaba6fc051c4fbd5d669101e0791bdfec63153bd45f004435fc7088f6bb13af6960ae8cd2d3e7986b6e7c7b7b4b6b2f
+  data.tar.gz: 30207911b9426ece6d7d053cb4f02efc63ce0207a023649e70500678d436c740dc47912f0308df569377e31c01f4c4156aedab7f9e2bf2b8ef05560e34f2a038

data/README.md

@@ -97,10 +97,13 @@ There are two error classes:
 
 * `YolodiceClient::Error` that inherits from `StandardError` and is used for errors thrown by the client itself,
 * `YolodiceClient::RemoteError` that inherits from `StandardError` that is used to pass errors from the remote server,
+* `YolodiceClient::ConnectionCloserError` that inherits from `StandardError` that is thrown when connection is closed,
 * any errors from underlaying `TCPSocket` or `SSLSocket` are passed through.
 
 `RemoteError` has two extra attributes: `code` and `data` that are mapped to values in the error object returned from the server.
 
+If you want to handle connection issues within your app, you could rescue `YolodiceClient::ConnectionCloserError`, `TCPSocket` and `SSLSocket` errors and try `#connect` and `#authenticate` on error.
+
 ## Helper methods
 
 #### .satoshi_to_btc(v)

data/lib/yolodice_client.rb

@@ -52,6 +52,10 @@ class YolodiceClient
   # Connects to the host.
 
   def connect
+    if @connection && !@connection.closed?
+      raise Error, 'Connection already open'
+    end
+
     @connection = if @opts[:ssl]
                     log.debug "Connecting to #{@opts[:host]}:#{@opts[:port]} over SSL"
                     socket = TCPSocket.open @opts[:host], @opts[:port]
@@ -70,8 +74,16 @@ class YolodiceClient
       log.debug 'Listening thread started'
       loop do
         begin
+          if @connection.closed?
+            # keep the thread alive for a while
+            sleep 1
+          end
+
           msg = @connection.gets
-          next if msg == nil
+          if msg == nil
+            # Connection is closed upstream.
+            close
+          end
           log.debug{ "<<< #{msg}" }
           message = JSON.parse msg
           if message['id'] && (message.has_key?('result') || message.has_key?('error'))
@@ -110,7 +122,7 @@ class YolodiceClient
       loop do
         begin
           sleep 30
-          call :ping
+          call :ping unless @connection.closed?
         rescue StandardError => e
           log.error e
         end
@@ -127,8 +139,23 @@ class YolodiceClient
     log.debug "Closing connection"
     # Stop threads
     @connection.close
-    @listening_thread.exit
-    @pinging_thread.exit
+    # Send error to all pending requests
+    message = { 'client_error' => 'Connection closed' }
+    while(callback = @thread_semaphore.synchronize{ @current_requests.shift }) do
+      callback = callback[1]
+      if callback.is_a? Integer
+        # it's a thread
+        @receive_queues[callback] << message
+      elsif callback.is_a? Proc
+        # A thread pool would be better.
+        Thread.new do
+          callback.call message
+        end
+      end
+    end
+    # Thread.stop
+    @pinging_thread.kill
+    @listening_thread.kill
     true
   end
 
@@ -162,7 +189,7 @@ class YolodiceClient
   # * <tt>&blk</tt> -- a callback (optional) to be called upon receiving a response for async calls. The callback will receive the response object.
 
   def call method, *arguments, &blk
-    raise Error, "Not connected" unless @connection && !@connection.closed?
+    raise ConnectionClosedError, "Not connected" unless @connection && !@connection.closed?
     params = if arguments.count == 0
                nil
              elsif arguments.is_a?(Array) && arguments[0].is_a?(Hash)
@@ -195,10 +222,17 @@ class YolodiceClient
         response['result']
       elsif response['error']
         raise RemoteError.new response['error']
+      elsif response['client_error'] && response['client_error'] == 'Connection closed'
+        raise ConnectionClosedError
       end
     end
   end
 
+
+  def check_connection
+    raise ConnectionClosedError if @connection.closed?
+  end
+
  
   ##
   # Overloading the <tt>method_missing</tt> gives a convenience way to call server-side methods. This method calls the <tt>call</tt> with the same set of arguments.
@@ -220,6 +254,11 @@ class YolodiceClient
 
   class Error < StandardError; end
 
+  ##
+  # Thrown whenever the connection is closed while it is not supposed to be.
+
+  class ConnectionClosedError < StandardError; end
+
 
   ##
   # Thrown when an error is received from the server. <tt>RemoteError</tt> has two extra attributes: <tt>code</tt> and <tt>data</tt> that correspond to the values returned in the error object in server response.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yolodice-client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - ethan_nx
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitcoin-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.10
+        version: 1.9.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.10
+        version: 1.9.18
 description: A simple JSON-RPC2 client dedicated for YOLOdice.com API.
 email: 
 executables: []