protocol-http2 0.11.6 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d8810aec1217f41c16dc254d8a38839766d0a6717ef1d8483b2c21eaa367139
-  data.tar.gz: 88cb94b5292c4fa1f430de2ee625a11650cd5564bc11a8e2df47eda25f8ce685
+  metadata.gz: 99c1f6c39bfa00e6f872c275ce33513a8a5668abd84f790cf3125af3b1d6c5fd
+  data.tar.gz: 5e28c4e9f222db72ef413c88dc0205351688557510e81c408051c147da5e4cea
 SHA512:
-  metadata.gz: 7119f9553cb2289f9dda868dc50f2624fd1d1205a81293e3fa1ec159424f3566adf7c51eb597ae47a3e421fa0510278071284cc951b87930b496b861321160d6
-  data.tar.gz: 3a270e16a604ab0fd9b251443472a9ff952a7db25065bd7c29d35fa00cf48bfe8d8c163d35f27d75366ebea50acac3f91cb296feb869c678dce5597cfcf97204
+  metadata.gz: 55a6923f22ad89c5c831cafc45bec918424ea368326f1e584fece860cb9e7c8e001c331b39ce5673db7b28cb2cd8df9b4c3994367b27846e63b3d0013d60c147
+  data.tar.gz: a0b0a7e36751c4da1472c3a8f26a90c9a55af83a5449a563b20bd5f78b734df659fdecd6f70222a006338e011b7e6e117fa68150deaab0c274e7fef411da2a00

data/.travis.yml

@@ -2,14 +2,16 @@ language: ruby
 dist: xenial
 cache: bundler
 
+script: bundle exec rspec
+
 matrix:
   include:
-    - rvm: 2.4
     - rvm: 2.5
     - rvm: 2.6
     - rvm: 2.7
     - rvm: 2.6
       env: COVERAGE=PartialSummary,Coveralls
+    - rvm: 2.7
     - rvm: truffleruby
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"

data/lib/protocol/http2/connection.rb

@@ -55,8 +55,8 @@ module Protocol
 				@decoder = HPACK::Context.new
 				@encoder = HPACK::Context.new
 				
-				@local_window = Window.new(@local_settings.initial_window_size)
-				@remote_window = Window.new(@remote_settings.initial_window_size)
+				@local_window = LocalWindow.new
+				@remote_window = Window.new
 			end
 			
 			def id
@@ -183,13 +183,6 @@ module Protocol
 				frame.pack(changes)
 				
 				write_frame(frame)
-				
-				# If the initial window size is set to something bigger than the default, we want to increase it.
-				difference = @local_settings.pending.initial_window_size - @local_window.capacity
-				
-				if difference > 0
-					send_window_update(difference)
-				end
 			end
 			
 			# Transition the connection into the closed state.
@@ -235,6 +228,8 @@ module Protocol
 				@streams.each_value do |stream|
 					stream.local_window.capacity = capacity
 				end
+				
+				@local_window.desired = capacity
 			end
 			
 			def update_remote_settings(changes)

data/lib/protocol/http2/flow_controlled.rb

@@ -60,13 +60,14 @@ module Protocol
 			end
 			
 			def consume_local_window(frame)
+				# For flow-control calculations, the 9-octet frame header is not counted.
 				amount = frame.length
 				@local_window.consume(amount)
 			end
 			
 			def request_window_update
 				if @local_window.limited?
-					self.send_window_update(@local_window.used)
+					self.send_window_update(@local_window.wanted)
 				end
 			end
 			

data/lib/protocol/http2/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module HTTP2
-		VERSION = "0.11.6"
+		VERSION = "0.12.0"
 	end
 end

data/lib/protocol/http2/window_update_frame.rb

@@ -33,10 +33,6 @@ module Protocol
 				@capacity = capacity
 			end
 			
-			def dup
-				return self.class.new(@capacity)
-			end
-			
 			# The window is completely full?
 			def full?
 				@available <= 0
@@ -73,6 +69,10 @@ module Protocol
 				end
 			end
 			
+			def wanted
+				@used
+			end
+			
 			def limited?
 				@available < (@capacity / 2)
 			end
@@ -82,6 +82,30 @@ module Protocol
 			end
 		end
 		
+		# This is a window which efficiently maintains a desired capacity.
+		class LocalWindow < Window
+			def initialize(capacity = 0xFFFF, desired: nil)
+				super(capacity)
+				
+				@desired = desired
+			end
+			
+			attr_accessor :desired
+			
+			def wanted
+				if @desired
+					# We must send an update which allows at least @desired bytes to be sent.
+					(@desired - @capacity) + @used
+				else
+					@used
+				end
+			end
+			
+			def limited?
+				@available < ((@desired || @capacity) / 2)
+			end
+		end
+		
 		# The WINDOW_UPDATE frame is used to implement flow control.
 		#
 		# +-+-------------------------------------------------------------+

data/protocol-http2.gemspec

@@ -18,13 +18,13 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 	
-	spec.required_ruby_version = '~> 2.4'
+	spec.required_ruby_version = '~> 2.5'
 	
 	spec.add_dependency "protocol-hpack", "~> 1.4"
 	spec.add_dependency "protocol-http", "~> 0.15"
 	
 	spec.add_development_dependency "covered"
+	spec.add_development_dependency "bake-bundler"
 	spec.add_development_dependency "bundler"
-	spec.add_development_dependency "rake", "~> 10.0"
 	spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http2
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.12.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-23 00:00:00.000000000 Z
+date: 2020-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-hpack
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: bake-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,19 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,14 +144,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A low level implementation of the HTTP/2 protocol.