net-http2 0.15.0 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d1bbb7eb0d7324fb63a671d0f8fbc2075b6a625
-  data.tar.gz: 9d4dd0e9e5131ac605292030235b9a68a8087b83
+SHA256:
+  metadata.gz: 47851ec1e94857e836b5e282289ee6295903bf37ad86ea6922d100eac62d002b
+  data.tar.gz: 7f2e870165baf00d5cd6cc5c5e42915a7f918f0567ce446c14aec0dd5f011a32
 SHA512:
-  metadata.gz: 1db0898b540554278ee5a3789bafae4aac29e9a8075fdfbd26c0aca57f360136b9c3c4c60f57b0ff412030ad87c2878b5890f4e9df255535a73ddf7535609ef4
-  data.tar.gz: 064cdc09d94dbd1e13623ae2a42b5cb5f695344f83ed60faadfab7aa1e9f7c721099e8fc8187133f9cbb36523f89142a1672c6071b8bf937b9ca342c954d4ada
+  metadata.gz: ace452983904e4c82024a59bb8222bc31eb44f8251402a21dee6f6e1395e57c18fd02ee6677e43415f9af5a15dafd510de3eebd54769926fa5ed42de79bc2978
+  data.tar.gz: f409ce5ec39eb3a565095cb4831cb04153153d308abeeea75fcac010f07fa48cf9100ee1e7cc925e68fa0d8b50d3c56c96fd030835a6aacf07d37c5d8e673344

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.7.1

data/.travis.yml

@@ -1,10 +1,13 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - 2.3.1
+  - 2.4
+  - 2.5
+  - 2.6
+  - 2.7
 
 branches:
   only:
     - master
+
+before_install:
+  - gem install bundler

data/README.md

@@ -59,7 +59,7 @@ request.on(:close) { puts "request completed!" }
 client.call_async(request)
 
 # Wait for all outgoing stream to be closed
-client.join
+client.join(timeout: 5)
 
 # close the connection
 client.close
@@ -103,7 +103,7 @@ Allows to set a callback for the client. The only available event is `:error`, w
 client.on(:error) { |exception| puts "Exception has been raised: #{exception}" }
 ```
 
-> It is RECOMMENDED to set the `:error` callback: if none is defined, the underlying socket thread may raise an error in the main thread at unexpected execution times. 
+> It is RECOMMENDED to set the `:error` callback: if none is defined, the underlying socket thread may raise an error in the main thread at unexpected execution times.
 
  * **uri** → **`URI`**
 
@@ -140,9 +140,9 @@ The real benefit of HTTP/2 is being able to receive body and header streams. Ins
 
  Calls the server with the async request.
 
- * **join**
+ * **join(timeout:)**
 
- Wait for all outstanding requests to be completed.
+ Wait for all outstanding requests to be completed, optionally with a timeout for this condition to be met. Raises NetHttp2::AsyncRequestTimeout if the timeout is reached.
 
 
 ### `NetHttp2::Request`

data/lib/net-http2.rb

@@ -6,8 +6,6 @@ require 'net-http2/socket'
 require 'net-http2/stream'
 require 'net-http2/version'
 
-require 'http2_patch'
-
 module NetHttp2
   raise "Cannot require NetHttp2, unsupported engine '#{RUBY_ENGINE}'" unless RUBY_ENGINE == "ruby"
 end

data/lib/net-http2/client.rb

@@ -8,6 +8,8 @@ module NetHttp2
   DRAFT               = 'h2'
   PROXY_SETTINGS_KEYS = [:proxy_addr, :proxy_port, :proxy_user, :proxy_pass]
 
+  AsyncRequestTimeout = Class.new(StandardError)
+
   class Client
 
     include Callbacks
@@ -54,12 +56,22 @@ module NetHttp2
       init_vars
     end
 
-    def join
+    def join(timeout: nil)
+      starting_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       while !@streams.empty? do
+        raise AsyncRequestTimeout if timeout && Process.clock_gettime(Process::CLOCK_MONOTONIC) - starting_time > timeout
         sleep 0.05
       end
     end
 
+    def remote_settings
+      h2.remote_settings
+    end
+
+    def stream_count
+      @streams.length
+    end
+
     private
 
     def init_vars
@@ -75,7 +87,7 @@ module NetHttp2
     end
 
     def new_stream
-      NetHttp2::Stream.new(h2_stream: h2.new_stream)
+      @mutex.synchronize { NetHttp2::Stream.new(h2_stream: h2.new_stream) }
     rescue StandardError => e
       close
       raise e

data/lib/net-http2/request.rb

@@ -39,7 +39,8 @@ module NetHttp2
 
       @headers.update(@headers) { |_k, v| v.to_s }
 
-      @headers
+      # see <https://github.com/ostinelli/apnotic/issues/68>
+      @headers.sort.to_h
     end
 
     def full_path

data/lib/net-http2/version.rb

@@ -1,3 +1,3 @@
 module NetHttp2
-  VERSION = '0.15.0'.freeze
+  VERSION = '0.18.3'.freeze
 end

data/net-http2.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "http-2", "0.8.2"
+  spec.add_dependency "http-2", "~> 0.10.1"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: net-http2
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.18.3
 platform: ruby
 authors:
 - Roberto Ostinelli
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2020-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - roberto@ostinelli.net
 executables: []
@@ -75,8 +75,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
+- ".tool-versions"
 - ".travis.yml"
 - Gemfile
 - LICENSE.md
@@ -84,7 +83,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/http2_patch.rb
 - lib/net-http2.rb
 - lib/net-http2/callbacks.rb
 - lib/net-http2/client.rb
@@ -98,7 +96,7 @@ homepage: http://github.com/ostinelli/net-http2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: NetHttp2 is an HTTP2 client for Ruby.
 test_files: []

data/.ruby-gemset

@@ -1 +0,0 @@
-net-http2

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.3.1

data/lib/http2_patch.rb

@@ -1,49 +0,0 @@
-require 'http/2/connection'
-
-# We are currently locked to using the Http2 library v0.8.2 since v0.8.3 still has some compatibility issues:
-# <https://github.com/igrigorik/http-2/issues/92>
-#
-# However, v0.8.2 had a memory leak that was reported in the following issues:
-# <https://github.com/igrigorik/http-2/issues/73>
-# <https://github.com/ostinelli/net-http2/issues/7>
-#
-# Hence, this is a temporary monkey-patch to the HTTP2 library in order to solve the mentioned leak
-# while waiting to fix the issues on v0.8.3.
-
-module HTTP2
-
-  class Connection
-
-    private
-
-    def activate_stream(id: nil, **args)
-      connection_error(msg: 'Stream ID already exists') if @streams.key?(id)
-
-      stream = Stream.new({ connection: self, id: id }.merge(args))
-
-      # Streams that are in the "open" state, or either of the "half closed"
-      # states count toward the maximum number of streams that an endpoint is
-      # permitted to open.
-      stream.once(:active) { @active_stream_count += 1 }
-
-      @streams_recently_closed ||= {}
-      stream.once(:close) do
-        @active_stream_count -= 1
-
-        @streams_recently_closed.delete_if do |closed_stream_id, v|
-          to_be_deleted = (Time.now - v) > 15
-          @streams.delete(closed_stream_id) if to_be_deleted
-          to_be_deleted
-        end
-
-        @streams_recently_closed[id] = Time.now
-      end
-
-      stream.on(:promise, &method(:promise)) if self.is_a? Server
-      stream.on(:frame, &method(:send))
-      stream.on(:window_update, &method(:window_update))
-
-      @streams[id] = stream
-    end
-  end
-end