protocol-http2 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06d77286478b994ec73dfa49f0b6326b06fa29618477b50a771222e8eda19612
-  data.tar.gz: c20e0dcb47e7999ea0cb6f60328c0acb309881c0645b4963ce769548923959af
+  metadata.gz: 680080c7a69a5ed1afb2520f43a7e6335b0470cb972aa91cab6be7a3c2358240
+  data.tar.gz: f7b3bad2356b04793de349d2c299fb64e855f243120a186dd2dc01906052e08a
 SHA512:
-  metadata.gz: b9dfe13295aa56fb40269d57ae2b70d02ed69017253013f23cb7a6595827465425d330757e2bfe47f8a0f0fd5dceadfd4e9ed0f6dd245e9d6158be3346e3219e
-  data.tar.gz: d1f5af9a4d37c4c1a9b892db33e7979f710b4988da9f6a7e675805cc40bd22d67086c5cc1da8333521035707c274ba0f89520ddbf06c824531da672b5c4ce79f
+  metadata.gz: 042dd35ecdf9b6b81fa4dcdd3e788346cc0389eec765783c587bc7cebdf74a7204dfc31ef8e2bbe644e5a417ea29dae4fb4f4134aac6c37ef7bb374d0229d3a3
+  data.tar.gz: 45397ddea195960f4a1c253d5cac0028e17b2bfa3fbff6a9aa157f2244bbc5894d610346b98a4a0affe0921d0c627bc3d5db0c438c0a2bec792ea993365da870

data/lib/protocol/http2/client.rb

@@ -27,6 +27,14 @@ module Protocol
 				super(framer, 1)
 			end
 			
+			def local_stream_id?(id)
+				id.odd?
+			end
+			
+			def remote_stream_id?(id)
+				id.even?
+			end
+			
 			def valid_remote_stream_id?(stream_id)
 				stream_id.even?
 			end

data/lib/protocol/http2/connection.rb

@@ -41,6 +41,7 @@ module Protocol
 				@dependencies = {0 => @dependency}
 				
 				@framer = framer
+				# The next stream id to use:
 				@local_stream_id = local_stream_id
 				@remote_stream_id = 0
 				
@@ -420,9 +421,42 @@ module Protocol
 				raise ProtocolError, "Unable to receive push promise!"
 			end
 			
+			def client_stream_id?(id)
+				id.odd?
+			end
+			
+			def server_stream_id?(id)
+				id.even?
+			end
+			
+			def closed_stream_id?(id)
+				if id.zero?
+					# The connection "stream id" can never be closed:
+					false
+				elsif id.even?
+					# Server-initiated streams are even.
+					if @local_stream_id.even?
+						id < @local_stream_id
+					else
+						id < @remote_stream_id
+					end
+				elsif id.odd?
+					# Client-initiated streams are odd.
+					if @local_stream_id.odd?
+						id < @local_stream_id
+					else
+						id < @remote_stream_id
+					end
+				end
+			end
+			
 			def receive_reset_stream(frame)
-				if stream = @streams[frame.stream_id]
+				if frame.connection?
+					raise ProtocolError, "Cannot reset connection!"
+				elsif stream = @streams[frame.stream_id]
 					stream.receive_reset_stream(frame)
+				elsif closed_stream_id?(frame.stream_id)
+					# Ignore.
 				else
 					raise StreamClosed, "Cannot reset stream #{frame.stream_id}"
 				end
@@ -439,8 +473,10 @@ module Protocol
 					rescue ProtocolError => error
 						stream.send_reset_stream(error.code)
 					end
-				elsif frame.stream_id > @remote_stream_id
-					# Receiving any frame other than HEADERS or PRIORITY on a stream in this state MUST be treated as a connection error of type PROTOCOL_ERROR.
+				elsif closed_stream_id?(frame.stream_id)
+					# Ignore.
+				else
+					# Receiving any frame other than HEADERS or PRIORITY on a stream in this state (idle) MUST be treated as a connection error of type PROTOCOL_ERROR.
 					raise ProtocolError, "Cannot update window of idle stream #{frame.stream_id}"
 				end
 			end

data/lib/protocol/http2/flow_control.rb

@@ -84,7 +84,7 @@ module Protocol
 			def receive_window_update(frame)
 				amount = frame.unpack
 				
-				# puts "expanding remote_window=#{@remote_window} by #{amount}"
+				# Async.logger.info(self) {"expanding remote_window=#{@remote_window} by #{amount}"}
 				
 				if amount != 0
 					@remote_window.expand(amount)

data/lib/protocol/http2/framer.rb

@@ -103,7 +103,7 @@ module Protocol
 				# Async.logger.debug(self, name: "write") {frame.inspect}
 				
 				frame.write(@stream)
-
+				
 				# Don't call @stream.flush here because it can cause significant contention if there is a semaphore around this method.
 				# @stream.flush
 				

data/lib/protocol/http2/server.rb

@@ -27,6 +27,14 @@ module Protocol
 				super(framer, 2)
 			end
 			
+			def local_stream_id?(id)
+				id.even?
+			end
+			
+			def remote_stream_id?(id)
+				id.odd?
+			end
+			
 			def valid_remote_stream_id?(stream_id)
 				stream_id.odd?
 			end

data/lib/protocol/http2/stream.rb

@@ -130,7 +130,6 @@ module Protocol
 			
 			# The stream is being closed because the connection is being closed.
 			def close(error = nil)
-				@connection.delete(@id)
 			end
 			
 			def maximum_frame_size
@@ -247,6 +246,7 @@ module Protocol
 			# @param error_code [Integer] the error code if the stream was closed due to a stream reset.
 			def close!(error_code = nil)
 				@state = :closed
+				@connection.delete(@id)
 				
 				if error_code
 					error = StreamError.new("Stream closed!", error_code)
@@ -352,16 +352,10 @@ module Protocol
 				end
 			end
 			
-			def ignore_reset_stream(frame)
-				# Async.logger.warn(self) {"Received reset stream (#{error_code}) in state: #{@state}!"}
-			end
-			
 			def receive_reset_stream(frame)
 				if @state == :idle
 					# If a RST_STREAM frame identifying an idle stream is received, the recipient MUST treat this as a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
 					raise ProtocolError, "Cannot receive reset stream in state: #{@state}!"
-				elsif self.closed?
-					ignore_reset_stream(frame)
 				else
 					error_code = frame.unpack
 					

data/lib/protocol/http2/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module HTTP2
-		VERSION = "0.11.1"
+		VERSION = "0.11.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http2
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-hpack
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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.