jrpc 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8980207596bc025bf5c28fd37efc498d8f3bb6a
-  data.tar.gz: c29420bd1ae1698195b7dbe065f10410338852f1
+  metadata.gz: fb8407031cb5fb20510c28a5691cff0bc10d787e
+  data.tar.gz: acc04f635eca963b97e17dc64ef3b91cb2235151
 SHA512:
-  metadata.gz: f66a01cc18c2897929fed709bb8f1f1cd904a709de5313f7175a8f7263488598d3f24366bc2234c68c81d8a93fa6b1ac04744be85390bc93c8fba6967b2d9412
-  data.tar.gz: e7d3229d00028b99a75baf5c4d23136751987362dd841ccc5147523d9bad8de4dc121ad26c8213a30dc02a620df9518fef8241cabbaeacab3ef9f2ce8e092b06
+  metadata.gz: 4a60569920b9c4f2cd70b2c5f75106f9b34ffe1ac6bd56e35bd22cefa93c81a1f2920994c79557158ef127d9e1675f8f84c447df262a5ac728c002b386b36dcd
+  data.tar.gz: 4d79982ababcd0b15d888f25212751f8c0908b333fab3d8622c315dac260373735a842a710ac96fa957ef6763dff029008121ab9e8abe29a1d6c2486cfe2018a

data/lib/jrpc/transport/socket_base.rb

@@ -23,6 +23,12 @@ module JRPC
       class ConnectionFailedError < Error
       end
 
+      class WriteFailedError < Error
+      end
+
+      class ReadFailedError < Error
+      end
+
       attr_reader :options, :read_timeout, :write_timeout
 
       def self.connect(options)

data/lib/jrpc/transport/socket_tcp.rb

@@ -2,49 +2,59 @@ module JRPC
   module Transport
     class SocketTcp < SocketBase
 
-      attr_reader :socket
-
-      def initialize(options)
-        super
-        @socket = build_socket
-      end
-
       def read(length, timeout = @read_timeout)
         received = ''
         length_to_read = length
         while length_to_read > 0
-          io_read, = IO.select([@socket], [], [], timeout)
+          io_read, = IO.select([socket], [], [], timeout)
           raise ReadTimeoutError unless io_read
           chunk = io_read[0].read_nonblock(length_to_read)
           received += chunk
           length_to_read -= chunk.bytesize
         end
         received
+      rescue Errno::EPIPE => e
+        # EPIPE, in this case, means that the data connection was unexpectedly terminated.
+        clear_socket!
+        raise ReadFailedError, "#{e.class} #{e.message}"
       end
 
       def write(data, timeout = @write_timeout)
         length_written = 0
         data_to_write = data
         while data_to_write.bytesize > 0
-          _, io_write, = IO.select([], [@socket], [], timeout)
+          _, io_write, = IO.select([], [socket], [], timeout)
           raise WriteTimeoutError unless io_write
           chunk_length = io_write[0].write_nonblock(data_to_write)
           length_written += chunk_length
           data_to_write = data.byteslice(length_written, data.length)
         end
         length_written
+      rescue Errno::EPIPE => e
+        # EPIPE, in this case, means that the data connection was unexpectedly terminated.
+        clear_socket!
+        raise WriteFailedError, "#{e.class} #{e.message}"
       end
 
       def close
-        @socket.close
+        return if @socket.nil?
+        socket.close
       end
 
       def closed?
-        @socket.closed?
+        @socket.nil? || socket.closed?
+      end
+
+      def socket
+        @socket ||= build_socket
       end
 
       private
 
+      def clear_socket!
+        @socket = nil
+      end
+
       def set_timeout_to(socket, type, value)
         secs = Integer(value)
         u_secs = Integer((value - secs) * 1_000_000)
@@ -64,12 +74,11 @@ module JRPC
         host, port = @server.split(':')
         addr = Socket.getaddrinfo(host, nil)
         full_addr = Socket.pack_sockaddr_in(port, addr[0][3])
-        @socket.connect(full_addr)
+        socket.connect(full_addr)
       rescue Errno::EISCONN => _
         # already connected
-      rescue Errno::ETIMEDOUT => _
-        raise ConnectionTimeoutError
-      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ETIMEDOUT => e
+      rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH, Errno::ETIMEDOUT, Errno::EPIPE => e
+        clear_socket!
         raise ConnectionFailedError, "#{e.class} #{e.message}"
       end
 

data/lib/jrpc/version.rb

@@ -1,3 +1,3 @@
 module JRPC
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jrpc
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netstring