protocol-http1 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0854252b3602c1271818e28024b62e1a4373521052b75ba0aa879a1f77a6e84e'
-  data.tar.gz: 2ad1603fc177c4b8493f304806a1f8baf4dc147b0f1707d463f534fb1e740a62
+  metadata.gz: 868c9501fb3b9a49db11985bb2807cdbfe9ed6c5337c0e01fabd5f7f360874e0
+  data.tar.gz: 91a076094374bbdd0b42938e7d6dcaaf8cd24170d21da0043be63e4ebe719ffb
 SHA512:
-  metadata.gz: 213525d129854f2198cb1be6be3d99a74d7add2e4a8dc57ed72d3bd1854b29535256120dfcbd735f1823d91bb6bf27fee6571d93d8e85f0031a404be99b39e01
-  data.tar.gz: 32f7a63f81f830a77839fa154b69bfa5a8dc316d579cc48e10d2a786e92806960c36821b3f53da67c3b1e90ba29394264ae76c621d7608c62a0d56224dabec1f
+  metadata.gz: 14e0e59673d857dd2e37bcf8b9b1ef607d9490445c13bd515530aabd04dd75f93eca1055a3168384b0fe47f3197494b6be544e3e4f767d55456a4808e090e738
+  data.tar.gz: ea52162a1762c35cf7ea76630c51f589f52385baf5819b7a4010cec1a341e0ec153ffba1970bead118ebf7e309e63d400a2bc7e81195cd8c1d547c924c4c83d9

data/lib/protocol/http1/body/chunked.rb

@@ -22,23 +22,27 @@ module Protocol
 					@count = 0
 				end
 				
+				attr :count
+				
+				def length
+					# We only know the length once we've read everything. This is because the length is not known until the final chunk is read.
+					if @finished
+						@length
+					end
+				end
+				
 				def empty?
 					@connection.nil?
 				end
 				
-				def discard
+				def close(error = nil)
 					if connection = @connection
 						@connection = nil
 						
-						# We only close the connection if we haven't completed reading the entire body:
 						unless @finished
 							connection.close_read
 						end
 					end
-				end
-				
-				def close(error = nil)
-					self.discard
 					
 					super
 				end
@@ -82,7 +86,8 @@ module Protocol
 								return chunk
 							else
 								# The connection has been closed before we have read the requested length:
-								self.discard
+								@connection.close_read
+								@connection = nil
 							end
 						end
 						

data/lib/protocol/http1/body/fixed.rb

@@ -23,18 +23,14 @@ module Protocol
 					@connection.nil? or @remaining == 0
 				end
 				
-				def discard
+				def close(error = nil)
 					if connection = @connection
 						@connection = nil
 						
-						if @remaining != 0
+						unless @remaining == 0
 							connection.close_read
 						end
 					end
-				end
-				
-				def close(error = nil)
-					self.discard
 					
 					super
 				end

data/lib/protocol/http1/body/remainder.rb

@@ -39,8 +39,12 @@ module Protocol
 				def read
 					@connection&.readpartial(BLOCK_SIZE)
 				rescue EOFError
-					@connection.receive_end_stream!
-					@connection = nil
+					if connection = @connection
+						@connection = nil
+						connection.receive_end_stream!
+					end
+					
+					return nil
 				end
 				
 				def inspect

data/lib/protocol/http1/connection.rb

@@ -91,8 +91,8 @@ module Protocol
 			# │           ▼            └───┬────┘            ▼
 			# │      ┌──────────┐          │           ┌──────────┐
 			# │      │   half   │          │           │   half   │
-			# │      │  closed  │          │           │  closed  │
-			# │      │ (remote) │          │           │ (local)  │
+			# │      │  closed  │          │ send R /  │  closed  │
+			# │      │ (remote) │          │ recv R    │ (local)  │
 			# │      └────┬─────┘          │           └─────┬────┘
 			# │           │                │                 │
 			# │           │ send ES /      │       recv ES / │
@@ -104,7 +104,8 @@ module Protocol
 			#         persistent       └────────┘
 			# ```
 			#
-			# - `ES`: the body was fully received or sent (end of stream)
+			# - `ES`: the body was fully received or sent (end of stream).
+			# - `R`: the connection was closed unexpectedly (reset).
 			#
 			# State transition methods use a trailing "!".
 			attr_accessor :state
@@ -176,17 +177,33 @@ module Protocol
 			# @return [IO] the underlying non-blocking IO.
 			def hijack!
 				@persistent = false
-				stream = @stream
 				
-				@stream.flush
-				@stream = nil
-				
-				return stream
+				if stream = @stream
+					@stream = nil
+					stream.flush
+					
+					self.closed!
+					
+					return stream
+				end
+			end
+			
+			def close_read
+				@persistent = false
+				@stream&.close_read
+				self.receive_end_stream!
 			end
 			
 			# Close the connection and underlying stream.
-			def close
-				@stream&.close
+			def close(error = nil)
+				@persistent = false
+				
+				if stream = @stream
+					@stream = nil
+					stream.close
+				end
+				
+				self.closed!(error)
 			end
 			
 			def open!
@@ -264,10 +281,6 @@ module Protocol
 				read_line? or raise EOFError
 			end
 			
-			def close_read
-				@stream.close_read
-			end
-			
 			def read_request_line
 				return unless line = read_line?
 				
@@ -354,6 +367,16 @@ module Protocol
 				return HTTP::Headers.new(fields)
 			end
 			
+			def send_end_stream!
+				if @state == :open
+					@state = :half_closed_local
+				elsif @state == :half_closed_remote
+					self.closed!
+				else
+					raise ProtocolError, "Cannot send end stream in #{@state}!"
+				end
+			end
+			
 			# @param protocol [String] the protocol to upgrade to.
 			def write_upgrade_body(protocol, body = nil)
 				# Once we upgrade the connection, it can no longer handle other requests:
@@ -374,6 +397,8 @@ module Protocol
 				end
 				
 				return @stream
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_tunnel_body(version, body = nil)
@@ -394,6 +419,8 @@ module Protocol
 				end
 				
 				return @stream
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_empty_body(body)
@@ -401,6 +428,8 @@ module Protocol
 				@stream.flush
 				
 				body&.close
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_fixed_length_body(body, length, head)
@@ -433,6 +462,8 @@ module Protocol
 				if chunk_length != length
 					raise ContentLengthError, "Wrote #{chunk_length} bytes, but content length was #{length} bytes!"
 				end
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_chunked_body(body, head, trailer = nil)
@@ -467,6 +498,8 @@ module Protocol
 				end
 				
 				@stream.flush
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_body_and_close(body, head)
@@ -488,34 +521,24 @@ module Protocol
 				
 				@stream.flush
 				@stream.close_write
+			ensure
+				self.send_end_stream!
 			end
 			
-			def idle!
-				@state = :idle
-			end
-			
-			def closed!
-				unless @state == :half_closed_local or @state == :half_closed_remote
-					raise ProtocolError, "Cannot close in #{@state}!" 
-				end
-				
-				if @persistent
-					self.idle!
+			# Transition to the closed state.
+			#
+			# If no error occurred, and the connection is persistent, this will immediately transition to the idle state.
+			#
+			# @parameter error [Exxception] the error that caused the connection to close.
+			def closed!(error = nil)
+				if @persistent and !error
+					# If there was no error, and the connection is persistent, we can reuse it:
+					@state = :idle
 				else
 					@state = :closed
 				end
 			end
 			
-			def send_end_stream!
-				if @state == :open
-					@state = :half_closed_local
-				elsif @state == :half_closed_remote
-					self.closed!
-				else
-					raise ProtocolError, "Cannot send end stream in #{@state}!"
-				end
-			end
-			
 			def write_body(version, body, head = false, trailer = nil)
 				# HTTP/1.0 cannot in any case handle trailers.
 				if version == HTTP10 # or te: trailers was not present (strictly speaking not required.)
@@ -545,8 +568,6 @@ module Protocol
 					write_connection_header(version)
 					write_body_and_close(body, head)
 				end
-			ensure
-				send_end_stream!
 			end
 			
 			def receive_end_stream!

data/lib/protocol/http1/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTP1
-		VERSION = "0.24.0"
+		VERSION = "0.26.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http1
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -42,7 +42,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-18 00:00:00.000000000 Z
+date: 2024-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http

metadata.gz.sig

@@ -1,2 +1,2 @@
-.���֗Zt��"��(×��Y�.GC#�
-�0�V}ǻ&j�Mę���W��]'¦�۩x�t�|�[�{�V+�ML��3�)�*����[�!��+��`M��^���u�~I�?��U��9v�k���ϗrZ�9�6}N�궮+v,��տP('.��K[T�L\��s̀(&�2h�Ӝ��*�n@�O���uuQ��x���})4ʧy�N���}d�����"A�.e�,��F
+�������5�?% z��%�F�HT�+�Fڼ��	���K�Iu/�A�
�*��s�c���Ǟ�������}����Y�6���!$�i�1Y�Z��E�&������g:)ʈ@����f�P�&WR���zA~��{X��l��~��-Q���z��vwws�)5�%0i�z6��s?�cu����&��jB����q�K2/@�`ǣL*�đ�LJ���gsq��Dlp��b���/r�����:�;h�5����e���%^��l����$t-7��Ќ���c�(��)h@@�S�1g�N\�
+!���Nk��L�)`",#v���j��z��<���+��;G�m9��W�*�P\�[�(¨$�����bTf���8q���K�