protocol-http2 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07e136ae45032565eec301ae8ed9ad6e3fef788325a55f2320e61d5d4c421251
-  data.tar.gz: 553f5a65749ccfe5ddb96a70aa71d1682a2894c91056b4c29f19368dc8cdef10
+  metadata.gz: 802763909c7326fe42e70a217a13a31828760c673868b3b7fbcd2e99174e0423
+  data.tar.gz: 314093df7a84ae72929af8a1ae25d1b6f8363c1b94ee132196ad6e076b03e0f5
 SHA512:
-  metadata.gz: accd7dd026ccba821544eb29c3c2d72c5a3894977cf564b48b8cc96de1b6fb041e3a8876f056844f9bcf4a0b8790581674402eab6be63ee7992203bfe1b544b9
-  data.tar.gz: '028d74d81f74dcd289330c2cb2f72793c55f9f887c2bf7e5f73c2eb7c7c5ff8371b654725f2a18c5849a2f441c286f91fabe90b949bddbf79e6b05292128172a'
+  metadata.gz: '09d0303e8166c468719bad98aa6d4d2f61d412317ef05f8c55d72a5814f7980b36a5d9f61ee85d7a003eada87d864bac81ad28d1a244e2ed95d431c20225c09a'
+  data.tar.gz: 046fe8e2b1d1f3a85013ebf188975d004a229491fc7ea93c9a46f18c68fb53be1d7876564f42663d292e88bd204d1aa81820724e732bb784b106e526a0b060d1

data/lib/protocol/http2/stream.rb

@@ -182,7 +182,7 @@ module Protocol
 				stream.add_child(self)
 			end
 			
-			def update_priority priority
+			def process_priority priority
 				dependent_id = priority.stream_dependency
 				
 				if dependent_id == @id
@@ -250,7 +250,7 @@ module Protocol
 					if frame.end_stream?
 						@state = :half_closed_local
 					else
-						@state = :open
+						open!
 					end
 				elsif @state == :reserved_local
 					frame = write_headers(*args)
@@ -308,6 +308,12 @@ module Protocol
 				end
 			end
 			
+			def open!
+				@state = :open
+				
+				return self
+			end
+			
 			# Transition the stream into the closed state.
 			# @param error_code [Integer] the error code if the stream was closed due to a stream reset.
 			def close!(error_code = nil)
@@ -318,6 +324,8 @@ module Protocol
 				end
 				
 				self.close(error)
+				
+				return self
 			end
 			
 			def send_reset_stream(error_code = 0)
@@ -333,23 +341,27 @@ module Protocol
 				end
 			end
 			
-			private def process_headers(frame)
+			protected def process_headers(frame)
 				# Receiving request headers:
 				priority, data = frame.unpack
 				
 				if priority
-					self.update_priority(priority)
+					self.process_priority(priority)
 				end
 				
 				@connection.decode_headers(data)
 			end
 			
+			protected def ignore_headers(frame)
+				# Async.logger.warn(self) {"Received headers in state: #{@state}!"}
+			end
+			
 			def receive_headers(frame)
 				if @state == :idle
 					if frame.end_stream?
 						@state = :half_closed_remote
 					else
-						@state = :open
+						open!
 					end
 					
 					return process_headers(frame)
@@ -369,8 +381,9 @@ module Protocol
 					end
 					
 					return process_headers(frame)
+				elsif self.closed?
+					ignore_headers(frame)
 				else
-					Async.logger.warn(self) {"Received headers in state: #{@state}!"}
 					self.send_reset_stream(Error::STREAM_CLOSED)
 				end
 			end
@@ -380,6 +393,10 @@ module Protocol
 				frame.unpack
 			end
 			
+			def ignore_data(frame)
+				# Async.logger.warn(self) {"Received headers in state: #{@state}!"}
+			end
+			
 			# DATA frames are subject to flow control and can only be sent when a stream is in the "open" or "half-closed (remote)" state.  The entire DATA frame payload is included in flow control, including the Pad Length and Padding fields if present.  If a DATA frame is received whose stream is not in "open" or "half-closed (local)" state, the recipient MUST respond with a stream error of type STREAM_CLOSED.
 			def receive_data(frame)
 				if @state == :open
@@ -398,9 +415,10 @@ module Protocol
 					if frame.end_stream?
 						close!
 					end
+				elsif self.closed?
+					ignore_data(frame)
 				else
 					# If a DATA frame is received whose stream is not in "open" or "half-closed (local)" state, the recipient MUST respond with a stream error (Section 5.4.2) of type STREAM_CLOSED.
-					Async.logger.warn(self) {"Received data in state: #{@state}!"}
 					self.send_reset_stream(Error::STREAM_CLOSED)
 				end
 			end
@@ -408,7 +426,7 @@ module Protocol
 			# Change the priority of the stream both locally and remotely.
 			def priority= priority
 				send_priority(priority)
-				update_priority(priority)
+				process_priority(priority)
 			end
 			
 			# The current local priority of the stream.
@@ -421,23 +439,25 @@ module Protocol
 			end
 			
 			def receive_priority(frame)
-				self.update_priority(frame.unpack)
+				self.process_priority(frame.unpack)
+			end
+			
+			def ignore_reset_stream(frame)
+				# Async.logger.warn(self) {"Received reset stream (#{error_code}) in state: #{@state}!"}
 			end
 			
 			def receive_reset_stream(frame)
-				error_code = frame.unpack
-				
-				if @state != :idle
-					if self.closed?
-						Async.logger.warn(self) {"Received reset stream (#{error_code}) in state: #{@state}!"}
-					else
-						close!(error_code)
-					end
+				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
+					
+					close!(error_code)
 					
 					return error_code
-				else
-					# 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 (#{error_code}) in state: #{@state}!"
 				end
 			end
 			

data/lib/protocol/http2/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module HTTP2
-		VERSION = "0.8.1"
+		VERSION = "0.8.2"
 	end
 end

metadata

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