protocol-http2 0.19.0 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa9a1478ba8829d9e4416cd5507ca611d5e502eb242b1d873d44d1d60a40850
-  data.tar.gz: 4c560c928f9027108f5cf6b4fd135ce2a7043815cf8c4e2077fd5d20865e26be
+  metadata.gz: fe5de9c523fbd986f47d3961f13d58e225f165f36ed322026d72ddbe95357c46
+  data.tar.gz: 04d1c6d47af4784c07b61d403efb040153b57b37d88c005f50cd0a6850d6e0f9
 SHA512:
-  metadata.gz: 95f413d65bbde12d848f7cbe342274d7e914aca16c1a60d2f3193b91e670ae0553233fe3ae1ef4699d87984c711311c7247daac0990bb44ab0f8d3aa44d4f604
-  data.tar.gz: 5abe10dc681f35b42a123e69b4fca512d8f0e43b5741d9ab4987c336efa508e6981f2370357fa384c22bbaed8ab5d7725257dc2816823b29926de2c2e7d68d6a
+  metadata.gz: 0d869c91b0736f7eaaa4a57708c9ee8e060813df94d536f94de08844e68b78f7f72a1f5ecd860f1d392c7a1a49ed6a7c573084cb462f795c63c5b58357a38bc8
+  data.tar.gz: 1b9f8c945a2a8befaf2c07040dcd269637d304461e37732f22f1f5cafcea2bc3637f3ee32141a8d53d1be74bcaefb50a33d471a2f136e42aec2673e55518bbbf

data/lib/protocol/http2/connection.rb

@@ -41,7 +41,7 @@ module Protocol
 				@decoder = HPACK::Context.new
 				@encoder = HPACK::Context.new
 				
-				@local_window = LocalWindow.new()
+				@local_window = LocalWindow.new
 				@remote_window = Window.new
 			end
 			
@@ -215,20 +215,20 @@ module Protocol
 			def write_frame(frame)
 				synchronize do
 					@framer.write_frame(frame)
+					
+					# I tried moving this outside the synchronize block but it caused a deadlock.
+					@framer.flush
 				end
-				
-				# The IO is already synchronized, and we don't want additional contention.
-				@framer.flush
 			end
 			
 			def write_frames
 				if @framer
 					synchronize do
 						yield @framer
+						
+						# See note above.
+						@framer.flush
 					end
-					
-					# See above note.
-					@framer.flush
 				else
 					raise EOFError, "Connection closed!"
 				end

data/lib/protocol/http2/flow_controlled.rb

@@ -70,15 +70,11 @@ module Protocol
 			def receive_window_update(frame)
 				amount = frame.unpack
 				
-				# Async.logger.info(self) {"expanding remote_window=#{@remote_window} by #{amount}"}
-				
 				if amount != 0
 					@remote_window.expand(amount)
 				else
 					raise ProtocolError, "Invalid window size increment: #{amount}!"
 				end
-				
-				# puts "expanded remote_window=#{@remote_window} by #{amount}"
 			end
 			
 			# The window has been expanded by the given amount.

data/lib/protocol/http2/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP2
-		VERSION = "0.19.0"
+		VERSION = "0.19.2"
 	end
 end

data/lib/protocol/http2/window.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2024, by Samuel Williams.
+
+module Protocol
+	module HTTP2
+		class Window
+			# When an HTTP/2 connection is first established, new streams are created with an initial flow-control window size of 65,535 octets. The connection flow-control window is also 65,535 octets.
+			DEFAULT_CAPACITY = 0xFFFF
+			
+			# @param capacity [Integer] The initial window size, typically from the settings.
+			def initialize(capacity = DEFAULT_CAPACITY)
+				# This is the main field required:
+				@available = capacity
+				
+				# These two fields are primarily used for efficiently sending window updates:
+				@used = 0
+				@capacity = capacity
+			end
+			
+			# The window is completely full?
+			def full?
+				@available <= 0
+			end
+			
+			attr :used
+			attr :capacity
+			
+			# When the value of SETTINGS_INITIAL_WINDOW_SIZE changes, a receiver MUST adjust the size of all stream flow-control windows that it maintains by the difference between the new value and the old value.
+			def capacity= value
+				difference = value - @capacity
+				
+				# An endpoint MUST treat a change to SETTINGS_INITIAL_WINDOW_SIZE that causes any flow-control window to exceed the maximum size as a connection error of type FLOW_CONTROL_ERROR.
+				if (@available + difference) > MAXIMUM_ALLOWED_WINDOW_SIZE
+					raise FlowControlError, "Changing window size by #{difference} caused overflow: #{@available + difference} > #{MAXIMUM_ALLOWED_WINDOW_SIZE}!"
+				end
+				
+				@available += difference
+				@capacity = value
+			end
+			
+			def consume(amount)
+				@available -= amount
+				@used += amount
+			end
+			
+			attr :available
+			
+			def available?
+				@available > 0
+			end
+			
+			def expand(amount)
+				available = @available + amount
+				
+				if available > MAXIMUM_ALLOWED_WINDOW_SIZE
+					raise FlowControlError, "Expanding window by #{amount} caused overflow: #{available} > #{MAXIMUM_ALLOWED_WINDOW_SIZE}!"
+				end
+				
+				# puts "expand(#{amount}) @available=#{@available}"
+				@available += amount
+				@used -= amount
+			end
+			
+			def wanted
+				@used
+			end
+			
+			def limited?
+				@available < (@capacity / 2)
+			end
+			
+			def inspect
+				"\#<#{self.class} used=#{@used} available=#{@available} capacity=#{@capacity}>"
+			end
+		end
+		
+		# This is a window which efficiently maintains a desired capacity.
+		class LocalWindow < Window
+			def initialize(capacity = DEFAULT_CAPACITY, desired: nil)
+				super(capacity)
+				
+				# The desired capacity of the window, may be bigger than the initial capacity.
+				# If that is the case, we will likely send a window update to the remote end to increase the capacity.
+				@desired = desired
+			end
+			
+			# The desired capacity of the window.
+			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
+					super
+				end
+			end
+			
+			def limited?
+				if @desired
+					# Do not send window updates until we are less than half the desired capacity:
+					@available < (@desired / 2)
+				else
+					super
+				end
+			end
+			
+			def inspect
+				"\#<#{self.class} used=#{@used} available=#{@available} capacity=#{@capacity} desired=#{@desired}>"
+			end
+		end
+	end
+end

data/lib/protocol/http2/window_update_frame.rb

@@ -4,105 +4,10 @@
 # Copyright, 2019-2024, by Samuel Williams.
 
 require_relative "frame"
+require_relative "window"
 
 module Protocol
 	module HTTP2
-		class Window
-			# @param capacity [Integer] The initial window size, typically from the settings.
-			def initialize(capacity = 0xFFFF)
-				# This is the main field required:
-				@available = capacity
-				
-				# These two fields are primarily used for efficiently sending window updates:
-				@used = 0
-				@capacity = capacity
-			end
-			
-			# The window is completely full?
-			def full?
-				@available <= 0
-			end
-			
-			attr :used
-			attr :capacity
-			
-			# When the value of SETTINGS_INITIAL_WINDOW_SIZE changes, a receiver MUST adjust the size of all stream flow-control windows that it maintains by the difference between the new value and the old value.
-			def capacity= value
-				difference = value - @capacity
-				
-				# An endpoint MUST treat a change to SETTINGS_INITIAL_WINDOW_SIZE that causes any flow-control window to exceed the maximum size as a connection error of type FLOW_CONTROL_ERROR.
-				if (@available + difference) > MAXIMUM_ALLOWED_WINDOW_SIZE
-					raise FlowControlError, "Changing window size by #{difference} caused overflow: #{@available + difference} > #{MAXIMUM_ALLOWED_WINDOW_SIZE}!"
-				end
-				
-				@available += difference
-				@capacity = value
-			end
-			
-			def consume(amount)
-				@available -= amount
-				@used += amount
-			end
-			
-			attr :available
-			
-			def available?
-				@available > 0
-			end
-			
-			def expand(amount)
-				available = @available + amount
-				
-				if available > MAXIMUM_ALLOWED_WINDOW_SIZE
-					raise FlowControlError, "Expanding window by #{amount} caused overflow: #{available} > #{MAXIMUM_ALLOWED_WINDOW_SIZE}!"
-				end
-				
-				# puts "expand(#{amount}) @available=#{@available}"
-				@available += amount
-				@used -= amount
-			end
-			
-			def wanted
-				@used
-			end
-			
-			def limited?
-				@available < (@capacity / 2)
-			end
-			
-			def inspect
-				"\#<#{self.class} used=#{@used} available=#{@available} capacity=#{@capacity}>"
-			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?
-				if @desired
-					@available < @desired
-				else
-					super
-				end
-			end
-		end
-		
 		# The WINDOW_UPDATE frame is used to implement flow control.
 		#
 		# +-+-------------------------------------------------------------+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http2
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2024-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-hpack
@@ -97,6 +97,7 @@ files:
 - lib/protocol/http2/settings_frame.rb
 - lib/protocol/http2/stream.rb
 - lib/protocol/http2/version.rb
+- lib/protocol/http2/window.rb
 - lib/protocol/http2/window_update_frame.rb
 - license.md
 - readme.md