ws_client 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9832be21bf9d0c9e3ad56f8316e9fad17f355854
-  data.tar.gz: 9dd2d13ee3d1d3317669c2ca95fe747f4786deaa
+  metadata.gz: ab35da491f4c5d26b8afd50f14e0f195c44db4a2
+  data.tar.gz: db726294b252fd3494b1c80c91b92f5e1c231032
 SHA512:
-  metadata.gz: c490feb80923e1331596ab66fbcc602baa5a98be2146706c74b3fd77c8f9892ae44c24aeef19280f7150ec4b487113ceca0c92972dd2f203a1a4f34ef7e8a250
-  data.tar.gz: fe962b0b415adfe7e6dc366079ea42ebb2944be10854d750e3299d4bcb96d5bfd54b99df0cd7cfe1f6fbed17f8bd0c88ddcd9d2453bfe797d6ac41182db5bc9c
+  metadata.gz: 9c0d8d40e04d5f255c31b7417efbe4af44126315fabe84ba3abf9414254d26d0f5710e803cdfed148b26cda6cb009535a33c3e232b15ae004f4065ac23169ffb
+  data.tar.gz: 64f09b2ec2e11af8744950987dee3596516f0fe1b90c9317c698b5331422f040b30f0cafdecaf9f66db1aa92a4e925745e3c7e3738ea6de941ee78348b0823b2

data/lib/ws_client/version.rb

@@ -1,3 +1,3 @@
 module WsClient
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/ws_client.rb

@@ -58,6 +58,11 @@ module WsClient
       @closed = false
 
       handshake
+    rescue OpenSSL::SSL::SSLError, EOFError
+      # Re-use the socket cleanup logic if we have a connect failure.
+      @pipe_broken = true
+      close
+      raise
     end
 
     def reconnect
@@ -172,21 +177,27 @@ module WsClient
 
     def write_data(data, opt)
       frame = ::WebSocket::Frame::Outgoing::Client.new(:data => data, :type => opt[:type], :version => @handshake.version)
+      frame_str = frame.to_s
 
-      begin
-        @socket.write_nonblock(frame.to_s)
-      rescue IO::WaitReadable
-        IO.select([@socket]) # OpenSSL needs to read internally
-        retry
-      rescue IO::WaitWritable, Errno::EINTR
-        IO.select(nil, [@socket])
-        retry
-      rescue Errno::EPIPE => e
-        @pipe_broken = true
-        close
-      rescue => e
-        close
-        emit :error, e
+      loop do
+        break if frame_str.empty? || @closed
+
+        begin
+          num_bytes_written = @socket.write_nonblock(frame_str)
+          frame_str = frame_str[num_bytes_written..-1]
+        rescue IO::WaitReadable
+          IO.select([@socket]) # OpenSSL needs to read internally
+          retry
+        rescue IO::WaitWritable, Errno::EINTR
+          IO.select(nil, [@socket])
+          retry
+        rescue Errno::EPIPE => e
+          @pipe_broken = true
+          close
+        rescue => e
+          close
+          emit :error, e
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ws_client
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brandon Dewitt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-26 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler