async-http 0.77.0 → 0.78.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a6e20407a7969b8eebeaf3f3a2dac09bdb3fe48130454ae49f46251a03b5c98
-  data.tar.gz: a827ae19dc5c7f60ed338357091f556d1e48b183fe8ab0c119d75547fce4a6cd
+  metadata.gz: 76e78af8d20808d557b1c13c850af0a268de5535726ba07708b2012eb8752029
+  data.tar.gz: 53bdf9b950394a03ca8c1fd47befe51e8ba51a5cce82aa47c01111df7efd21b4
 SHA512:
-  metadata.gz: 116770838b19e96fdc9ed4e1db8af834f0ed8676542d1090ed88c90d02ac0b978bd94378b41edc151108d86e61c39d2fbb9680d217790e1b1cb3f2ceed2aa64e
-  data.tar.gz: 2b05b93835b83052a89127f12db03fdcd79007b6b0f396134d9818352e48ffaf012057c0b818a56633f3e8b510e7861438e8016d2519bd4d0dec425dfd1113f7
+  metadata.gz: 43c49b50bb88955088b74926e3fe33310f38f4b09d9b9ecdc538a9835c9be5b8be0e172e09794324a53db99e09b0102ae96fc179af13578a758f42644d6f4011
+  data.tar.gz: fa1a0d97f326bdd72010f07cfe21004b0da8f75fe4556778bd3b918f42e2e85f22bc41cd07e2a64b4395540e531a879480e634a8fe401ee0d0d7c146af8b61d7

data/lib/async/http/client.rb

@@ -14,7 +14,6 @@ require "protocol/http/methods"
 require "traces/provider"
 
 require_relative "protocol"
-require_relative "body/finishable"
 
 module Async
 	module HTTP

data/lib/async/http/protocol/http1/finishable.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
+require "protocol/http/body/wrapper"
+require "async/variable"
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP1
+				# Keeps track of whether a body is being read, and if so, waits for it to be closed.
+				class Finishable < ::Protocol::HTTP::Body::Wrapper
+					def initialize(body)
+						super(body)
+						
+						@closed = Async::Variable.new
+						@error = nil
+						
+						@reading = false
+					end
+					
+					def reading?
+						@reading
+					end
+					
+					def read
+						@reading = true
+						
+						super
+					end
+					
+					def close(error = nil)
+						unless @closed.resolved?
+							@error = error
+							@closed.value = true
+						end
+						
+						super
+					end
+					
+					def wait
+						if @reading
+							@closed.wait
+						else
+							self.discard
+						end
+					end
+					
+					def inspect
+						"#<#{self.class} closed=#{@closed} error=#{@error}> | #{super}"
+					end
+				end
+			end
+		end
+	end
+end

data/lib/async/http/protocol/http1/server.rb

@@ -7,7 +7,7 @@
 # Copyright, 2024, by Anton Zhuravsky.
 
 require_relative "connection"
-require_relative "../../body/finishable"
+require_relative "finishable"
 
 require "console/event/failure"
 
@@ -16,6 +16,18 @@ module Async
 		module Protocol
 			module HTTP1
 				class Server < Connection
+					def initialize(...)
+						super
+						
+						@ready = Async::Notification.new
+					end
+					
+					def closed!
+						super
+						
+						@ready.signal
+					end
+					
 					def fail_request(status)
 						@persistent = false
 						write_response(@version, status, {})
@@ -26,6 +38,11 @@ module Async
 					end
 					
 					def next_request
+						# Wait for the connection to become idle before reading the next request:
+						unless idle?
+							@ready.wait
+						end
+						
 						# The default is true.
 						return unless @persistent
 						
@@ -49,7 +66,7 @@ module Async
 						
 						while request = next_request
 							if body = request.body
-								finishable = Body::Finishable.new(body)
+								finishable = Finishable.new(body)
 								request.body = finishable
 							end
 							
@@ -126,10 +143,8 @@ module Async
 									request&.finish
 								end
 								
+								# Discard or wait for the input body to be consumed:
 								finishable&.wait
-								
-								# This ensures we yield at least once every iteration of the loop and allow other fibers to execute.
-								task.yield
 							rescue => error
 								raise
 							ensure

data/lib/async/http/protocol/request.rb

@@ -41,6 +41,10 @@ module Async
 				def remote_address= value
 					@remote_address = value
 				end
+				
+				def inspect
+					"#<#{self.class}:0x#{self.object_id.to_s(16)} method=#{method} path=#{path} version=#{version}>"
+				end
 			end
 		end
 	end

data/lib/async/http/protocol/response.rb

@@ -33,6 +33,10 @@ module Async
 				def remote_address= value
 					@remote_address = value
 				end
+				
+				def inspect
+					"#<#{self.class}:0x#{self.object_id.to_s(16)} status=#{status}>"
+				end
 			end
 		end
 	end

data/lib/async/http/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.77.0"
+		VERSION = "0.78.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.77.0
+  version: 0.78.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -58,7 +58,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -182,7 +182,6 @@ files:
 - bake/async/http/h2spec.rb
 - lib/async/http.rb
 - lib/async/http/body.rb
-- lib/async/http/body/finishable.rb
 - lib/async/http/body/hijack.rb
 - lib/async/http/body/pipe.rb
 - lib/async/http/body/writable.rb
@@ -198,6 +197,7 @@ files:
 - lib/async/http/protocol/http1.rb
 - lib/async/http/protocol/http1/client.rb
 - lib/async/http/protocol/http1/connection.rb
+- lib/async/http/protocol/http1/finishable.rb
 - lib/async/http/protocol/http1/request.rb
 - lib/async/http/protocol/http1/response.rb
 - lib/async/http/protocol/http1/server.rb

data/lib/async/http/body/finishable.rb

@@ -1,56 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
-
-require "protocol/http/body/wrapper"
-require "async/variable"
-
-module Async
-	module HTTP
-		module Body
-			# Keeps track of whether a body is being read, and if so, waits for it to be closed.
-			class Finishable < ::Protocol::HTTP::Body::Wrapper
-				def initialize(body)
-					super(body)
-					
-					@closed = Async::Variable.new
-					@error = nil
-					
-					@reading = false
-				end
-				
-				def reading?
-					@reading
-				end
-				
-				def read
-					@reading = true
-					
-					super
-				end
-				
-				def close(error = nil)
-					unless @closed.resolved?
-						@error = error
-						@closed.value = true
-					end
-					
-					super
-				end
-				
-				def wait
-					if @reading
-						@closed.wait
-					else
-						self.discard
-					end
-				end
-				
-				def inspect
-					"#<#{self.class} closed=#{@closed} error=#{@error}> | #{super}"
-				end
-			end
-		end
-	end
-end