protocol-http2 0.9.7 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 585d6a3435b1d498dc310e46ca8f52fd8e1cd37471409b8c9da6cf2f467aaa69
-  data.tar.gz: d1d1d8cbf77af69ff83d112bafe79fbf786ad24552a03e8af96bfcfeedf9752a
+  metadata.gz: 65e32ccd867aeb59ecc2f549fd376faf912662e9dc13013fb96631e0f1a818e9
+  data.tar.gz: d5cea11e3665707f1e1e187c2d38661615d5731bbf37253c1ff020b581364c8d
 SHA512:
-  metadata.gz: bb7a4bc6c1eb7f0c26ce9fc570aa2cfe5879114c5bf305a6abb8cd20171a31d142c597ac33c28994c3740f4df84ba2a0f5efe7529c8bd1ae7272084fba3a4a44
-  data.tar.gz: effc253ab1ddf6b60f8a8cc152cdc73b6be3c07c7e09bd5a0dd0bcb81856fddbd5c35ca0ee88a8c7c8a280738789c81c700dac8ebfdc70be5159e0e98f0b292a
+  metadata.gz: d54116953f0ecab132997502fdc8a53f0df18865372773bf1edc5db393a922c60c49b7a46c0deaff3702a6bf57e244316396424081d15efa0350421fa8cd55c9
+  data.tar.gz: e45da44d211b8ff2b37c094fb5674e3fb508681a897931b1786db96413665bc6182140986c289f6a6dd0ab38225348f5ab6adb0a2c0c0bd403d95bfc7a5d3173

data/lib/protocol/http2/connection.rb

@@ -35,6 +35,8 @@ module Protocol
 				@streams = {}
 				@children = {}
 				
+				@active = 0
+				
 				@framer = framer
 				@local_stream_id = local_stream_id
 				@remote_stream_id = 0
@@ -97,9 +99,19 @@ module Protocol
 				@state == :closed
 			end
 			
+			# The stream has become active (i.e. not idle or closed).
+			def activate(stream)
+				@active += 1
+			end
+			
+			# The stream is no longer active (i.e. has become closed).
+			def deactivate(stream)
+				@active -= 1
+			end
+			
+			# The number of active streams.
 			def active_streams
-				# TODO inefficient
-				@streams.each_value.select(&:active?)
+				@active
 			end
 			
 			# Close the underlying framer and all streams.

data/lib/protocol/http2/flow_control.rb

@@ -103,6 +103,7 @@ module Protocol
 			end
 			
 			# Traverse active streams in order of priority and allow them to consume the available flow-control window.
+			# @todo This function can get slow when there are a lot of children [INEFFICIENT].
 			# @param amount [Integer] the amount of data to write. Defaults to the current window capacity.
 			def consume_window(size = self.available_size)
 				# Don't consume more than the available window size:

data/lib/protocol/http2/stream.rb

@@ -120,6 +120,10 @@ module Protocol
 				
 				@state = state
 				
+				if active?
+					connnection.active(self)
+				end
+				
 				# Stream priority:
 				@dependent_id = dependent_id
 				@weight = weight
@@ -309,7 +313,12 @@ module Protocol
 			end
 			
 			def open!
-				@state = :open
+				if @state == :idle
+					@state = :open
+					@connection.activate(self)
+				else
+					raise ProtocolError, "Cannot open stream in state: #{@state}"
+				end
 				
 				return self
 			end
@@ -319,6 +328,9 @@ module Protocol
 			def close!(error_code = nil)
 				@state = :closed
 				
+				@connection.deactivate(self)
+				self.parent&.remove_child(self)
+				
 				if error_code
 					error = StreamError.new("Stream closed!", error_code)
 				end
@@ -481,6 +493,7 @@ module Protocol
 			def reserved_local!
 				if @state == :idle
 					@state = :reserved_local
+					@connection.activate(self)
 				else
 					raise ProtocolError, "Cannot reserve stream in state: #{@state}"
 				end
@@ -489,6 +502,7 @@ module Protocol
 			def reserved_remote!
 				if @state == :idle
 					@state = :reserved_remote
+					@connection.activate(self)
 				else
 					raise ProtocolError, "Cannot reserve stream in state: #{@state}"
 				end

data/lib/protocol/http2/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module HTTP2
-		VERSION = "0.9.7"
+		VERSION = "0.10.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http2
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.10.0
 platform: ruby
 authors:
 - Samuel Williams