protocol-http2 0.19.4 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b04111afb8bcb89c8866ccd13f1782ab2cd9ccf438210d5da17aecb384d2cf02
-  data.tar.gz: 7574a7a9595487e5ad574250e98a6662e5d2c588acffe8536b9d4f642cabfc4b
+  metadata.gz: 80a795de54c7f452a70b82f310c4f0aa3bda4bd15f034f548114a41bfc8d1649
+  data.tar.gz: 496e203587367c71ce4b0298ba96492d5ce4892842fdcbf57796031556ca3f1a
 SHA512:
-  metadata.gz: ec243f9398ad359deb1ca97341d6fca6c563158a40fa7e3617b39af599bb0ebce8c302ef7af3a378b944d1b8ada1689eff8f540e5c274a065fcd2c8420f531af
-  data.tar.gz: '08f92272a802133333232cac14b26568fdc5e95b4c0054caec717de403e0a5e22d41d3c2aa57ec08af40de11a75e4f2bb508d1b7b4c480513da81d352d58c072'
+  metadata.gz: e4b587ae75dc73dbd99ff3bc20cafe6c55cb329ab275bac187572730de5d5365f2f8c521d88b32bffb80363736cf0cdc62d579d2495872f13982b4f1cd1fdfa0
+  data.tar.gz: f2964d07b204b702ded73b1a3df961dad07c95989e78311732d4264184b59a6671f7bb81511e1d196c1dd9ccf18f81db1fd8064607c3156550191dc7cec8a5d2

data/lib/protocol/http2/connection.rb

@@ -62,7 +62,9 @@ module Protocol
 				@remote_settings.maximum_frame_size
 			end
 			
-			# The maximum number of concurrent streams that this connection can initiate:
+			# The maximum number of concurrent streams that this connection can initiate. This is a setting that can be changed by the remote peer.
+			#
+			# It is not the same as the number of streams that can be accepted by the connection. The number of streams that can be accepted is determined by the local settings, and the number of streams that can be initiated is determined by the remote settings.
 			def maximum_concurrent_streams
 				@remote_settings.maximum_concurrent_streams
 			end

data/lib/protocol/http2/dependency.rb

@@ -58,6 +58,10 @@ module Protocol
 				@weight <=> other.weight
 			end
 			
+			def == other
+				@id == other.id
+			end
+			
 			# The connection this stream belongs to.
 			attr :connection
 			
@@ -101,13 +105,30 @@ module Protocol
 				
 				dependency.parent = self
 				
-				self.clear_cache!
+				if @ordered_children
+					# Binary search for insertion point:
+					index = @ordered_children.bsearch_index do |child|
+						child.weight >= dependency.weight
+					end
+					
+					if index
+						@ordered_children.insert(index, dependency)
+					else
+						@ordered_children.push(dependency)
+					end
+					
+					@total_weight += dependency.weight
+				end
 			end
 			
 			def remove_child(dependency)
 				@children&.delete(dependency.id)
 				
-				self.clear_cache!
+				if @ordered_children
+					# Don't do a linear search here, it can be slow. Instead, the child's parent will be set to `nil`, and we check this in {#consume_window} using `delete_if`.
+					# @ordered_children.delete(dependency)
+					@total_weight -= dependency.weight
+				end
 			end
 			
 			# An exclusive flag allows for the insertion of a new level of dependencies.  The exclusive flag causes the stream to become the sole dependency of its parent stream, causing other dependencies to become dependent on the exclusive stream.
@@ -195,11 +216,17 @@ module Protocol
 				end
 				
 				# Otherwise, allow the dependent children to use up the available window:
-				self.ordered_children&.each do |child|
-					# Compute the proportional allocation:
-					allocated = (child.weight * size) / @total_weight
-					
-					child.consume_window(allocated) if allocated > 0
+				self.ordered_children&.delete_if do |child|
+					if child.parent
+						# Compute the proportional allocation:
+						allocated = (child.weight * size) / @total_weight
+						
+						child.consume_window(allocated) if allocated > 0
+						
+						false
+					else
+						true
+					end
 				end
 			end
 			

data/lib/protocol/http2/framer.rb

@@ -16,8 +16,6 @@ require_relative "goaway_frame"
 require_relative "window_update_frame"
 require_relative "continuation_frame"
 
-require "traces/provider"
-
 module Protocol
 	module HTTP2
 		# HTTP/2 frame type mapping as defined by the spec
@@ -109,50 +107,6 @@ module Protocol
 				
 				raise EOFError, "Could not read frame header!"
 			end
-			
-			Traces::Provider(self) do
-				def write_connection_preface
-					Traces.trace("protocol.http2.framer.write_connection_preface") do
-						super
-					end
-				end
-				
-				def read_connection_preface
-					Traces.trace("protocol.http2.framer.read_connection_preface") do
-						super
-					end
-				end
-				
-				def write_frame(frame)
-					attributes = {
-						"frame.length" => frame.length,
-						"frame.type" => frame.type,
-						"frame.flags" => frame.flags,
-						"frame.stream_id" => frame.stream_id,
-					}
-					
-					Traces.trace("protocol.http2.framer.write_frame", attributes: attributes) do
-						super
-					end
-				end
-				
-				def read_frame(maximum_frame_size = MAXIMUM_ALLOWED_FRAME_SIZE)
-					Traces.trace("protocol.http2.framer.read_frame") do |span|
-						super.tap do |frame|
-							span["frame.length"] = frame.length
-							span["frame.type"] = frame.type
-							span["frame.flags"] = frame.flags
-							span["frame.stream_id"] = frame.stream_id
-						end
-					end
-				end
-				
-				def flush
-					Traces.trace("protocol.http2.framer.flush") do
-						super
-					end
-				end
-			end
 		end
 	end
 end

data/lib/protocol/http2/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP2
-		VERSION = "0.19.4"
+		VERSION = "0.20.0"
 	end
 end

data/lib/traces/provider/protocol/http2/framer.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require "traces/provider"
+require_relative "../../../../protocol/http2/framer"
+
+Traces::Provider(Protocol::HTTP2::Framer) do
+	def write_connection_preface
+		Traces.trace("protocol.http2.framer.write_connection_preface") do
+			super
+		end
+	end
+	
+	def read_connection_preface
+		Traces.trace("protocol.http2.framer.read_connection_preface") do
+			super
+		end
+	end
+	
+	def write_frame(frame)
+		attributes = {
+			"frame.length" => frame.length,
+			"frame.class" => frame.class.name,
+			"frame.type" => frame.type,
+			"frame.flags" => frame.flags,
+			"frame.stream_id" => frame.stream_id,
+		}
+		
+		Traces.trace("protocol.http2.framer.write_frame", attributes: attributes) do
+			super
+		end
+	end
+	
+	def read_frame(...)
+		Traces.trace("protocol.http2.framer.read_frame") do |span|
+			super.tap do |frame|
+				span["frame.length"] = frame.length
+				span["frame.type"] = frame.type
+				span["frame.flags"] = frame.flags
+				span["frame.stream_id"] = frame.stream_id
+			end
+		end
+	end
+	
+	def flush
+		Traces.trace("protocol.http2.framer.flush") do
+			super
+		end
+	end
+end

data/lib/traces/provider/protocol/http2.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require_relative "http2/framer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http2
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.20.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,7 +40,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-11-03 00:00:00.000000000 Z
+date: 2024-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-hpack
@@ -70,20 +70,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: traces
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 executables: []
@@ -113,6 +99,8 @@ files:
 - lib/protocol/http2/version.rb
 - lib/protocol/http2/window.rb
 - lib/protocol/http2/window_update_frame.rb
+- lib/traces/provider/protocol/http2.rb
+- lib/traces/provider/protocol/http2/framer.rb
 - license.md
 - readme.md
 homepage: https://github.com/socketry/protocol-http2
@@ -136,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A low level implementation of the HTTP/2 protocol.