net-http2 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 618746ed38048396ce0529e2cfc7dc54ef55e7e7
-  data.tar.gz: 440e0f1c44862ee9b1ec7361a959dadad63d055e
+  metadata.gz: e3f05adbbbbe99f8eb15097186a59db80eb66042
+  data.tar.gz: e22193008420db5d3dffffab3a39ba73eff062df
 SHA512:
-  metadata.gz: c6cc66b09ca67e19fadadefcc23945ad84122573e66abb224447a8cc37298535f375db1a240fd3df91d880f67a42a1413398758ae8a64599d76a8e4681cf19f3
-  data.tar.gz: 229fb34136410233aa464c2612876ede3c184a0cfd27ab47bc944e9e699f9af48bbc0eb308002eaf3d95aa1e081dba2fdc93d5822f94eec7904613b555ae4b42
+  metadata.gz: 8ede872c9f2ed793b385354507dd0bc0dc4bb66fef127afa673eddb005e19125342faf94b977cd1994803b239b36425ebbe40bee044bdf1e82d1343d9051b21a
+  data.tar.gz: 2e4e48b32df8d4860590d155b15d4bfd363a8f10d27897ab2ff3643c7a93827ff10fd40b7bdfe2be0a9c3bd7ffb11df45981053e34140f894e0c9273294f6303

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.3.1

data/README.md

@@ -58,10 +58,8 @@ request.on(:close) { puts "request completed!" }
 # send
 client.call_async(request)
 
-# We need to wait for the callbacks to be triggered, so here's a quick and dirty fix for this example.
-# In real life, if you are using async requests you probably have a running loop that keeps
-# your program alive.
-sleep 5
+# Wait for all outgoing stream to be closed
+client.join
 
 # close the connection
 client.close
@@ -115,7 +113,6 @@ These behave similarly to HTTP/1 calls.
  response_3 = client.call(:post, '/path3', body: "the request body", timeout: 1)
  ```
 
-
 ##### Non-blocking calls
 The real benefit of HTTP/2 is being able to receive body and header streams. Instead of buffering the whole response, you might want to react immediately upon receiving those streams. This is what non-blocking calls are for.
 
@@ -127,26 +124,14 @@ The real benefit of HTTP/2 is being able to receive body and header streams. Ins
  request = client.prepare_request(:get, '/path', headers: { 'x-custom-header' => 'custom' })
  ```
 
- * **on(event, &block)**
-
- Allows to set a callback for the request. Available events are:
-
-  * `:headers`: triggered when headers are received (called once).
-  * `:body_chunk`: triggered when body chunks are received (may be called multiple times).
-  * `:close`: triggered when the request has been completed (called once).
-
- Even if NetHttp2 is thread-safe, the async callbacks will be executed in a different thread, so ensure that your code in the callbacks is thread-safe.
-
- ```ruby
- request.on(:headers) { |headers| p headers }
- request.on(:body_chunk) { |chunk| p chunk }
- request.on(:close) { puts "request completed!" }
- ```
-
  * **call_async(request)**
 
  Calls the server with the async request.
 
+ * **join**
+
+ Wait for all outstanding requests to be completed.
+
 
 ### `NetHttp2::Request`
 
@@ -172,6 +157,22 @@ The real benefit of HTTP/2 is being able to receive body and header streams. Ins
 
  The request's timeout.
 
+ * **on(event, &block)**
+
+ Allows to set a callback for the request. Available events are:
+
+  * `:headers`: triggered when headers are received (called once).
+  * `:body_chunk`: triggered when body chunks are received (may be called multiple times).
+  * `:close`: triggered when the request has been completed (called once).
+
+ Even if NetHttp2 is thread-safe, the async callbacks will be executed in a different thread, so ensure that your code in the callbacks is thread-safe.
+
+ ```ruby
+ request.on(:headers) { |headers| p headers }
+ request.on(:body_chunk) { |chunk| p chunk }
+ request.on(:close) { puts "request completed!" }
+ ```
+
 
 ### `NetHttp2::Response`
 

data/lib/net-http2/client.rb

@@ -44,6 +44,20 @@ module NetHttp2
       init_vars
     end
 
+    def join
+      while !@streams.empty? do
+        sleep 0.05
+      end
+    end
+
+    def add_stream_to_monitor(stream)
+      @streams[stream.id] = true
+    end
+
+    def mark_stream_as_closed(stream)
+      @streams.delete(stream.id)
+    end
+
     private
 
     def init_vars
@@ -52,10 +66,11 @@ module NetHttp2
       @socket_thread   = nil
       @first_data_sent = false
       @mutex           = Mutex.new
+      @streams         = {}
     end
 
     def new_stream
-      NetHttp2::Stream.new(uri: @uri, h2_stream: h2.new_stream)
+      NetHttp2::Stream.new(client: self, h2_stream: h2.new_stream)
     end
 
     def ensure_open
@@ -69,14 +84,15 @@ module NetHttp2
 
           begin
             socket_loop
-          rescue EOFError
+          rescue Exception => e
             # socket closed
+            Thread.main.raise e
           ensure
             @socket.close unless @socket.closed?
             @socket        = nil
             @socket_thread = nil
           end
-        end.tap { |t| t.abort_on_exception = true }
+        end
       end
     end
 

data/lib/net-http2/stream.rb

@@ -3,6 +3,7 @@ module NetHttp2
   class Stream
 
     def initialize(options={})
+      @client    = options[:client]
       @h2_stream = options[:h2_stream]
       @headers   = {}
       @data      = ''
@@ -12,12 +13,15 @@ module NetHttp2
       @mutex     = Mutex.new
       @cv        = ConditionVariable.new
 
-
       listen_for_headers
       listen_for_data
       listen_for_close
     end
 
+    def id
+      @h2_stream.id
+    end
+
     def call_with(request)
       @request = request
       send_request_data
@@ -27,6 +31,8 @@ module NetHttp2
     def async_call_with(request)
       @request = request
       @async   = true
+      @client.add_stream_to_monitor(self)
+
       send_request_data
     end
 
@@ -68,6 +74,7 @@ module NetHttp2
 
         if async?
           @request.emit(:close, data)
+          @client.mark_stream_as_closed(self)
         else
           @mutex.synchronize { @cv.signal }
         end

data/lib/net-http2/version.rb

@@ -1,3 +1,3 @@
 module NetHttp2
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-http2
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Roberto Ostinelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2