protocol-http1 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0854252b3602c1271818e28024b62e1a4373521052b75ba0aa879a1f77a6e84e'
-  data.tar.gz: 2ad1603fc177c4b8493f304806a1f8baf4dc147b0f1707d463f534fb1e740a62
+  metadata.gz: ad917a8e0aa2f76df0ea21a56a914dc6575d1e22ee13a2b36a60f5a1ca37ed6e
+  data.tar.gz: 2d6adbe2df3cd0c712e381a46adbba85de481ece8ee77ada0cf9a8b0638fc35a
 SHA512:
-  metadata.gz: 213525d129854f2198cb1be6be3d99a74d7add2e4a8dc57ed72d3bd1854b29535256120dfcbd735f1823d91bb6bf27fee6571d93d8e85f0031a404be99b39e01
-  data.tar.gz: 32f7a63f81f830a77839fa154b69bfa5a8dc316d579cc48e10d2a786e92806960c36821b3f53da67c3b1e90ba29394264ae76c621d7608c62a0d56224dabec1f
+  metadata.gz: 5f9b082e5bf6756d18127ad03ba0a2b14568227f859c05d7391983ce2a1157241cf635dcb3bc865264dfb6fb639991650c30b5ad2a8bb56ba1177ee11bce8a05
+  data.tar.gz: a050ed9a0618856e61cfdc8d2e45a268ace98bb97ce6a76ba384480db55abc7fb7c71d113c967b1dfa9e53f5ce56c4469a7559f9eddb41a51c06b168a8b85b7b

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

@@ -181,12 +181,22 @@ module Protocol
 				@stream.flush
 				@stream = nil
 				
+				self.closed!
+				
 				return stream
 			end
 			
+			def close_read
+				@persistent = false
+				@stream&.close_read
+				self.receive_end_stream!
+			end
+			
 			# Close the connection and underlying stream.
 			def close
+				@persistent = false
 				@stream&.close
+				self.closed!
 			end
 			
 			def open!
@@ -264,10 +274,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 +360,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 +390,8 @@ module Protocol
 				end
 				
 				return @stream
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_tunnel_body(version, body = nil)
@@ -394,6 +412,8 @@ module Protocol
 				end
 				
 				return @stream
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_empty_body(body)
@@ -401,6 +421,8 @@ module Protocol
 				@stream.flush
 				
 				body&.close
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_fixed_length_body(body, length, head)
@@ -433,6 +455,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 +491,8 @@ module Protocol
 				end
 				
 				@stream.flush
+			ensure
+				self.send_end_stream!
 			end
 			
 			def write_body_and_close(body, head)
@@ -488,6 +514,8 @@ module Protocol
 				
 				@stream.flush
 				@stream.close_write
+			ensure
+				self.send_end_stream!
 			end
 			
 			def idle!
@@ -495,10 +523,6 @@ module Protocol
 			end
 			
 			def closed!
-				unless @state == :half_closed_local or @state == :half_closed_remote
-					raise ProtocolError, "Cannot close in #{@state}!" 
-				end
-				
 				if @persistent
 					self.idle!
 				else
@@ -506,16 +530,6 @@ module Protocol
 				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 +559,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.25.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.25.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-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-http