net-http2 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53d47a5179357c9eebc6e0c23e6eb0ba724d4ccc
-  data.tar.gz: d82ec20911a804eef2183564580fbde8d03483e0
+  metadata.gz: 2f412e44e24ba9a2bdb452b616a6e0102fe8be71
+  data.tar.gz: 1f0149a8b2aace96f40bb6da2f56983ada7d2e3f
 SHA512:
-  metadata.gz: 784a337baecb984bffb5b1594c40a46a4aab7bce5cc570d651953a49af0687658ccfeef4026cbbfa2e7b7bdf709e7990f8ffa13563de00fcde180ae9bbb6d7c0
-  data.tar.gz: 784009bbae1c958ad17fb0efbb227c7291f4ec59d270e8c5aea4fbe902e39a141ebacb15abf52dd7a9dc1ef14b0308b034669cf8466bc881f7ecc81f87256c63
+  metadata.gz: f8427579c27e5ece7b87659fbc263ce96b243308ae6ff571ef94071804efdc59e604a8c46eb95ffbee57161bfaf9d85eba9d1556cb33b20f68b829a18d26fdd2
+  data.tar.gz: 3b79aa2279ab86dcd05bec6495fbb3f8bf28a218efee9af89e45031288dcb7f7332c9e8a36ee15b215bd2e3df22b70061a5a4bb27b6be9fea5a98bd939210eed

data/README.md

@@ -76,7 +76,10 @@ client.close
  * **new(url, options={})** → **`NetHttp2::Client`**
 
  Returns a new client. `url` is a `string` such as `http://nghttp2.org`.
- The only current option is `:ssl_context`, in case the url has an https scheme and you want your SSL client to use a custom context.
+ The current options are:
+ 
+  * `:connect_timeout`, specifies the max connect timeout in seconds (defaults to 60).
+  * `:ssl_context`, in case the url has an https scheme and you want your SSL client to use a custom context.
 
  To create a new client:
  ```ruby

data/lib/net-http2.rb

@@ -1,6 +1,7 @@
 require 'net-http2/client'
 require 'net-http2/response'
 require 'net-http2/request'
+require 'net-http2/socket'
 require 'net-http2/stream'
 require 'net-http2/version'
 

data/lib/net-http2/client.rb

@@ -11,8 +11,9 @@ module NetHttp2
     attr_reader :uri
 
     def initialize(url, options={})
-      @uri         = URI.parse(url)
-      @ssl_context = add_npn_to_context(options[:ssl_context] || OpenSSL::SSL::SSLContext.new)
+      @uri             = URI.parse(url)
+      @connect_timeout = options[:connect_timeout] || 60
+      @ssl_context     = add_npn_to_context(options[:ssl_context] || OpenSSL::SSL::SSLContext.new)
 
       @is_ssl = (@uri.scheme == 'https')
 
@@ -99,24 +100,12 @@ module NetHttp2
     end
 
     def new_socket
-      tcp = TCPSocket.new(@uri.host, @uri.port)
-
-      if ssl?
-        socket            = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_context)
-        socket.sync_close = true
-        socket.hostname   = @uri.hostname
-
-        socket.connect
-
-        socket
-      else
-        tcp
-      end
+      NetHttp2::Socket.create(@uri, ssl: ssl?, ssl_context: @ssl_context, connect_timeout: @connect_timeout)
     end
 
     def ensure_sent_before_receiving
       while !@first_data_sent
-        sleep 0.1
+        sleep 0.01
       end
     end
 

data/lib/net-http2/socket.rb

@@ -0,0 +1,50 @@
+module NetHttp2
+
+  module Socket
+
+    def self.create(uri, options)
+      options[:ssl] ? ssl_socket(uri, options) : tcp_socket(uri, options)
+    end
+
+    def self.ssl_socket(uri, options)
+      tcp = tcp_socket(uri, options)
+
+      socket            = OpenSSL::SSL::SSLSocket.new(tcp, options[:ssl_context])
+      socket.sync_close = true
+      socket.hostname   = uri.hostname
+
+      socket.connect
+
+      socket
+    end
+
+    def self.tcp_socket(uri, options)
+      family   = ::Socket::AF_INET
+      address  = ::Socket.getaddrinfo(uri.host, nil, family).first[3]
+      sockaddr = ::Socket.pack_sockaddr_in(uri.port, address)
+
+      socket = ::Socket.new(family, ::Socket::SOCK_STREAM, 0)
+      socket.setsockopt(::Socket::IPPROTO_TCP, ::Socket::TCP_NODELAY, 1)
+
+      begin
+        socket.connect_nonblock(sockaddr)
+      rescue IO::WaitWritable
+        if IO.select(nil, [socket], nil, options[:connect_timeout])
+          begin
+            socket.connect_nonblock(sockaddr)
+          rescue Errno::EISCONN
+            # socket is connected
+          rescue
+            socket.close
+            raise
+          end
+        else
+          socket.close
+          raise Errno::ETIMEDOUT
+        end
+      end
+
+      socket
+    end
+  end
+end

data/lib/net-http2/stream.rb

@@ -7,8 +7,11 @@ module NetHttp2
       @headers   = {}
       @data      = ''
       @request   = nil
-      @completed = false
       @async     = false
+      @completed = false
+      @mutex     = Mutex.new
+      @cv        = ConditionVariable.new
+
 
       listen_for_headers
       listen_for_data
@@ -62,7 +65,12 @@ module NetHttp2
     def listen_for_close
       @h2_stream.on(:close) do |data|
         @completed = true
-        @request.emit(:close, data) if async?
+
+        if async?
+          @request.emit(:close, data)
+        else
+          @mutex.synchronize { @cv.signal }
+        end
       end
     end
 
@@ -85,11 +93,7 @@ module NetHttp2
     end
 
     def wait_for_completed
-      cutoff_time = Time.now + @request.timeout
-
-      while !@completed && Time.now < cutoff_time
-        sleep 0.1
-      end
+      @mutex.synchronize { @cv.wait(@mutex, @request.timeout) }
     end
   end
 end

data/lib/net-http2/version.rb

@@ -1,3 +1,3 @@
 module NetHttp2
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-http2
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Roberto Ostinelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-08 00:00:00.000000000 Z
+date: 2016-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -88,6 +88,7 @@ files:
 - lib/net-http2/client.rb
 - lib/net-http2/request.rb
 - lib/net-http2/response.rb
+- lib/net-http2/socket.rb
 - lib/net-http2/stream.rb
 - lib/net-http2/version.rb
 - net-http2.gemspec