async-http 0.76.0 → 0.78.0

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

@@ -4,10 +4,10 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2024, by Thomas Morgan.
 
-require_relative 'http1/client'
-require_relative 'http1/server'
+require_relative "http1/client"
+require_relative "http1/server"
 
-require 'io/stream'
+require "io/stream"
 
 module Async
 	module HTTP

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

@@ -4,7 +4,7 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2024, by Thomas Morgan.
 
-require_relative 'http1'
+require_relative "http1"
 
 module Async
 	module HTTP

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

@@ -5,7 +5,7 @@
 # Copyright, 2018, by Janko Marohnić.
 # Copyright, 2024, by Thomas Morgan.
 
-require_relative 'http1'
+require_relative "http1"
 
 module Async
 	module HTTP

data/lib/async/http/protocol/http2/client.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
-require_relative 'connection'
-require_relative 'response'
+require_relative "connection"
+require_relative "response"
 
-require 'protocol/http2/client'
+require "protocol/http2/client"
 
 module Async
 	module HTTP

data/lib/async/http/protocol/http2/connection.rb

@@ -4,25 +4,25 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2020, by Bruno Sutic.
 
-require_relative 'stream'
+require_relative "stream"
 
-require 'async/semaphore'
+require "async/semaphore"
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP2
-				HTTPS = 'https'.freeze
-				SCHEME = ':scheme'.freeze
-				METHOD = ':method'.freeze
-				PATH = ':path'.freeze
-				AUTHORITY = ':authority'.freeze
-				STATUS = ':status'.freeze
-				PROTOCOL = ':protocol'.freeze
+				HTTPS = "https".freeze
+				SCHEME = ":scheme".freeze
+				METHOD = ":method".freeze
+				PATH = ":path".freeze
+				AUTHORITY = ":authority".freeze
+				STATUS = ":status".freeze
+				PROTOCOL = ":protocol".freeze
 				
-				CONTENT_LENGTH = 'content-length'.freeze
-				CONNECTION = 'connection'.freeze
-				TRAILER = 'trailer'.freeze
+				CONTENT_LENGTH = "content-length".freeze
+				CONNECTION = "connection".freeze
+				TRAILER = "trailer".freeze
 				
 				module Connection
 					def initialize(*)

data/lib/async/http/protocol/http2/input.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
-require 'protocol/http/body/writable'
+require "protocol/http/body/writable"
 
 module Async
 	module HTTP

data/lib/async/http/protocol/http2/output.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2020-2023, by Samuel Williams.
+# Copyright, 2020-2024, by Samuel Williams.
 
-require 'protocol/http/body/stream'
+require "protocol/http/body/stream"
 
 module Async
 	module HTTP

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

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative '../request'
-require_relative 'stream'
+require_relative "../request"
+require_relative "stream"
 
 module Async
 	module HTTP
@@ -53,7 +53,7 @@ module Async
 									@length = Integer(value)
 								elsif key == CONNECTION
 									raise ::Protocol::HTTP2::HeaderError, "Connection header is not allowed!"
-								elsif key.start_with? ':'
+								elsif key.start_with? ":"
 									raise ::Protocol::HTTP2::HeaderError, "Invalid pseudo-header #{key}!"
 								elsif key =~ /[A-Z]/
 									raise ::Protocol::HTTP2::HeaderError, "Invalid characters in header #{key}!"
@@ -107,7 +107,7 @@ module Async
 					end
 					
 					NO_RESPONSE = [
-						[STATUS, '500'],
+						[STATUS, "500"],
 					]
 					
 					def send_response(response)

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

@@ -3,8 +3,8 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative '../response'
-require_relative 'stream'
+require_relative "../response"
+require_relative "stream"
 
 module Async
 	module HTTP
@@ -41,7 +41,7 @@ module Async
 							# While in theory, the response pseudo-headers may be extended in the future, currently they only response pseudo-header is :status, so we can assume it is always the first header.
 							status_header = headers.shift
 							
-							if status_header.first != ':status'
+							if status_header.first != ":status"
 								raise ProtocolError, "Invalid response headers: #{headers.inspect}"
 							end
 							
@@ -137,6 +137,16 @@ module Async
 					attr :stream
 					attr :request
 					
+					def pool=(pool)
+						# If we are already closed, the stream can be released now:
+						if @stream.closed?
+							pool.release(@stream.connection)
+						else
+							# Otherwise, we will release the stream when it is closed:
+							@stream.pool = pool
+						end
+					end
+					
 					def connection
 						@stream.connection
 					end
@@ -175,7 +185,7 @@ module Async
 								raise ::Protocol::HTTP2::HeaderError, "Request path already specified!" if request.path
 								
 								request.path = value
-							elsif key.start_with? ':'
+							elsif key.start_with? ":"
 								raise ::Protocol::HTTP2::HeaderError, "Invalid pseudo-header #{key}!"
 							else
 								request.headers[key] = value

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

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
 
-require_relative 'connection'
-require_relative 'request'
+require_relative "connection"
+require_relative "request"
 
-require 'protocol/http2/server'
+require "protocol/http2/server"
 
 module Async
 	module HTTP

data/lib/async/http/protocol/http2/stream.rb

@@ -5,10 +5,10 @@
 # Copyright, 2022, by Marco Concetto Rudilosso.
 # Copyright, 2023, by Thomas Morgan.
 
-require 'protocol/http2/stream'
+require "protocol/http2/stream"
 
-require_relative 'input'
-require_relative 'output'
+require_relative "input"
+require_relative "output"
 
 module Async
 	module HTTP
@@ -20,6 +20,8 @@ module Async
 						
 						@headers = nil
 						
+						@pool = nil
+						
 						# Input buffer, reading request body, or response body (receive_data):
 						@length = nil
 						@input = nil
@@ -30,12 +32,14 @@ module Async
 					
 					attr_accessor :headers
 					
+					attr_accessor :pool
+					
 					attr :input
 					
 					def add_header(key, value)
 						if key == CONNECTION
 							raise ::Protocol::HTTP2::HeaderError, "Connection header is not allowed!"
-						elsif key.start_with? ':'
+						elsif key.start_with? ":"
 							raise ::Protocol::HTTP2::HeaderError, "Invalid pseudo-header #{key}!"
 						elsif key =~ /[A-Z]/
 							raise ::Protocol::HTTP2::HeaderError, "Invalid upper-case characters in header #{key}!"
@@ -158,6 +162,10 @@ module Async
 							@output = nil
 						end
 						
+						if pool = @pool and @connection
+							pool.release(@connection)
+						end
+						
 						return self
 					end
 				end

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

@@ -4,10 +4,10 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2024, by Thomas Morgan.
 
-require_relative 'http2/client'
-require_relative 'http2/server'
+require_relative "http2/client"
+require_relative "http2/server"
 
-require 'io/stream'
+require "io/stream"
 
 module Async
 	module HTTP

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

@@ -4,10 +4,10 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2019, by Brian Morearty.
 
-require_relative 'http10'
-require_relative 'http11'
+require_relative "http10"
+require_relative "http11"
 
-require_relative 'http2'
+require_relative "http2"
 
 module Async
 	module HTTP

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

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2017-2024, by Samuel Williams.
 
-require 'protocol/http/request'
-require 'protocol/http/headers'
+require "protocol/http/request"
+require "protocol/http/headers"
 
-require_relative '../body/writable'
+require_relative "../body/writable"
 
 module Async
 	module HTTP
@@ -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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
-require 'protocol/http/response'
+require "protocol/http/response"
 
-require_relative '../body/writable'
+require_relative "../body/writable"
 
 module Async
 	module HTTP
@@ -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/protocol.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
-require_relative 'protocol/http1'
-require_relative 'protocol/https'
+require_relative "protocol/http1"
+require_relative "protocol/https"
 
 module Async
 	module HTTP

data/lib/async/http/proxy.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2019-2024, by Samuel Williams.
 
-require_relative 'client'
-require_relative 'endpoint'
+require_relative "client"
+require_relative "endpoint"
 
-require_relative 'body/pipe'
+require_relative "body/pipe"
 
 module Async
 	module HTTP
@@ -96,6 +96,7 @@ module Async
 					end
 				else
 					# This ensures we don't leave a response dangling:
+					input.close
 					response.close
 					
 					raise ConnectFailure, response

data/lib/async/http/reference.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
-require 'protocol/http/reference'
+require "protocol/http/reference"
 
 module Async
 	module HTTP

data/lib/async/http/relative_location.rb

@@ -4,7 +4,7 @@
 # Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2019-2020, by Brian Morearty.
 
-require_relative 'middleware/location_redirector'
+require_relative "middleware/location_redirector"
 
 warn "`Async::HTTP::RelativeLocation` is deprecated and will be removed in the next release. Please use `Async::HTTP::Middleware::LocationRedirector` instead.", uplevel: 1
 

data/lib/async/http/server.rb

@@ -4,12 +4,12 @@
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2019, by Brian Morearty.
 
-require 'async'
-require 'io/endpoint'
-require 'protocol/http/middleware'
-require 'traces/provider'
+require "async"
+require "io/endpoint"
+require "protocol/http/middleware"
+require "traces/provider"
 
-require_relative 'protocol'
+require_relative "protocol"
 
 module Async
 	module HTTP
@@ -76,8 +76,8 @@ module Async
 			
 			Traces::Provider(self) do
 				def call(request)
-					if trace_parent = request.headers['traceparent']
-						Traces.trace_context = Traces::Context.parse(trace_parent.join, request.headers['tracestate'], remote: true)
+					if trace_parent = request.headers["traceparent"]
+						Traces.trace_context = Traces::Context.parse(trace_parent.join, request.headers["tracestate"], remote: true)
 					end
 					
 					attributes = {
@@ -86,25 +86,25 @@ module Async
 						'http.authority': request.authority,
 						'http.scheme': request.scheme,
 						'http.path': request.path,
-						'http.user_agent': request.headers['user-agent'],
+						'http.user_agent': request.headers["user-agent"],
 					}
 					
 					if length = request.body&.length
-						attributes['http.request.length'] = length
+						attributes["http.request.length"] = length
 					end
 					
 					if protocol = request.protocol
-						attributes['http.protocol'] = protocol
+						attributes["http.protocol"] = protocol
 					end
 					
-					Traces.trace('async.http.server.call', resource: "#{request.method} #{request.path}", attributes: attributes) do |span|
+					Traces.trace("async.http.server.call", resource: "#{request.method} #{request.path}", attributes: attributes) do |span|
 						super.tap do |response|
 							if status = response&.status
-								span['http.status_code'] = status
+								span["http.status_code"] = status
 							end
 							
 							if length = response&.body&.length
-								span['http.response.length'] = length
+								span["http.response.length"] = length
 							end
 						end
 					end

data/lib/async/http/statistics.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
-require 'protocol/http/body/wrapper'
+require "protocol/http/body/wrapper"
 
-require 'async/clock'
+require "async/clock"
 
 module Async
 	module HTTP
@@ -89,7 +89,7 @@ module Async
 						parts << "took #{format_duration(duration)} until first chunk"
 					end
 					
-					return parts.join('; ')
+					return parts.join("; ")
 				end
 				
 				def inspect

data/lib/async/http/version.rb

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

data/lib/async/http.rb

@@ -3,11 +3,11 @@
 # Released under the MIT License.
 # Copyright, 2017-2024, by Samuel Williams.
 
-require_relative 'http/version'
+require_relative "http/version"
 
-require_relative 'http/client'
-require_relative 'http/server'
+require_relative "http/client"
+require_relative "http/server"
 
-require_relative 'http/internet'
+require_relative "http/internet"
 
-require_relative 'http/endpoint'
+require_relative "http/endpoint"

data/readme.md

@@ -16,6 +16,17 @@ Please see the [project documentation](https://socketry.github.io/async-http/) f
 
 Please see the [project releases](https://socketry.github.io/async-http/releases/index) for all releases.
 
+### v0.77.0
+
+  - Improved HTTP/1 connection handling.
+  - The input stream is no longer closed when the output stream is closed.
+
+### v0.76.0
+
+  - `Async::HTTP::Body::Writable` is moved to `Protocol::HTTP::Body::Writable`.
+  - Remove `Async::HTTP::Body::Delayed` with no replacement.
+  - Remove `Async::HTTP::Body::Slowloris` with no replacement.
+
 ### v0.75.0
 
   - Better handling of HTTP/1 \<-\> HTTP/2 proxying, specifically upgrade/CONNECT requests.

data/releases.md

@@ -1,5 +1,16 @@
 # Releases
 
+## v0.77.0
+
+  - Improved HTTP/1 connection handling.
+  - The input stream is no longer closed when the output stream is closed.
+
+## v0.76.0
+
+  - `Async::HTTP::Body::Writable` is moved to `Protocol::HTTP::Body::Writable`.
+  - Remove `Async::HTTP::Body::Delayed` with no replacement.
+  - Remove `Async::HTTP::Body::Slowloris` with no replacement.
+
 ## v0.75.0
 
   - Better handling of HTTP/1 \<-\> HTTP/2 proxying, specifically upgrade/CONNECT requests.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.76.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-10 00:00:00.000000000 Z
+date: 2024-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -122,28 +122,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.37'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.34'
+        version: '0.37'
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '0.25'
 - !ruby/object:Gem::Dependency
   name: protocol-http2
   requirement: !ruby/object:Gem::Requirement
@@ -197,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