async-http 0.66.3 → 0.67.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6333433caa77214ab225abff1e948dd2b48dc3230d2b0fc2bdb14e239152f7d5
-  data.tar.gz: 89bc214d31e3270eb507913b3214b7aed79a98972aae22a28bfd77b22e1a3353
+  metadata.gz: 86fa32fbabfbf7e98484c197db5062ecbdd5fc7f2e360fbdb778781ab64c2d18
+  data.tar.gz: 7212090a7708522c11dfa457e85714eb698493fc3382372f48b22cde748f1350
 SHA512:
-  metadata.gz: f20b9ac9ce576e06cb634fd5a72874d6fe471859bbf9e3d6b4e0bd90497d6d0a6e892511b6cfe1c4736ef292b408d833ed3bb3f7ad6b331e16db2ffaa696aae3
-  data.tar.gz: 2809e2f25f6430dce4271ac3a3891197efca709fccbe4506fb3b5a089330b5479ac2d010289b33e1270673b1c8aff427ef369c7c64eb2c5c0c8b7bd8a5f491a0
+  metadata.gz: 9aa817a134d29db249a8c503ac9fc69ffb8ed500e1518249f09f1fb4fe9d123e3682ec032d7e87368007ebcce56cf42861bd56be2e418d23d86565672d7a5017
+  data.tar.gz: 71e89c429dbdc4731c6e4335d14a235946fd1fecbbdc2deeed0ec0ef332f7952a5d175de63009a91b4cc35544b3ee8b3e915c6586df5fbea9a78253a4c5f5e19

data/lib/async/http/endpoint.rb

@@ -8,7 +8,7 @@ require 'io/endpoint'
 require 'io/endpoint/host_endpoint'
 require 'io/endpoint/ssl_endpoint'
 
-require_relative 'protocol/http1'
+require_relative 'protocol/http'
 require_relative 'protocol/https'
 
 module Async
@@ -84,7 +84,7 @@ module Async
 					if secure?
 						Protocol::HTTPS
 					else
-						Protocol::HTTP1
+						Protocol::HTTP
 					end
 				end
 			end

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

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Thomas Morgan.
+
+require_relative 'http1'
+require_relative 'http2'
+
+module Async
+	module HTTP
+		module Protocol
+			# HTTP is an http:// server that auto-selects HTTP/1.1 or HTTP/2 by detecting the HTTP/2
+			# connection preface.
+			module HTTP
+				HTTP2_PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
+				HTTP2_PREFACE_SIZE = HTTP2_PREFACE.bytesize
+				
+				def self.protocol_for(stream)
+					# Detect HTTP/2 connection preface
+					# https://www.rfc-editor.org/rfc/rfc9113.html#section-3.4
+					preface = stream.peek do |read_buffer|
+						if read_buffer.bytesize >= HTTP2_PREFACE_SIZE
+							break read_buffer[0, HTTP2_PREFACE_SIZE]
+						elsif read_buffer.bytesize > 0
+							# If partial read_buffer already doesn't match, no need to wait for more bytes.
+							break read_buffer unless HTTP2_PREFACE[read_buffer]
+						end
+					end
+					
+					if preface == HTTP2_PREFACE
+						HTTP2
+					else
+						HTTP1
+					end
+				end
+				
+				# Only inbound connections can detect HTTP1 vs HTTP2 for http://.
+				# Outbound connections default to HTTP1.
+				def self.client(peer, **options)
+					HTTP1.client(peer, **options)
+				end
+				
+				def self.server(peer, **options)
+					stream = ::IO::Stream(peer)
+					
+					return protocol_for(stream).server(stream, **options)
+				end
+				
+				def self.names
+					["h2", "http/1.1", "http/1.0"]
+				end
+			end
+		end
+	end
+end

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

@@ -2,11 +2,12 @@
 
 # Released under the MIT License.
 # Copyright, 2017-2024, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require_relative 'http1/client'
 require_relative 'http1/server'
 
-require 'io/stream/buffered'
+require 'io/stream'
 
 module Async
 	module HTTP
@@ -23,13 +24,13 @@ module Async
 				end
 				
 				def self.client(peer)
-					stream = ::IO::Stream::Buffered.wrap(peer)
+					stream = ::IO::Stream(peer)
 					
 					return HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(peer)
-					stream = ::IO::Stream::Buffered.wrap(peer)
+					stream = ::IO::Stream(peer)
 					
 					return HTTP1::Server.new(stream, VERSION)
 				end

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

@@ -2,6 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2017-2024, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require_relative 'http1'
 
@@ -20,13 +21,13 @@ module Async
 				end
 				
 				def self.client(peer)
-					stream = ::IO::Stream::Buffered.wrap(peer)
+					stream = ::IO::Stream(peer)
 					
 					return HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(peer)
-					stream = ::IO::Stream::Buffered.wrap(peer)
+					stream = ::IO::Stream(peer)
 					
 					return HTTP1::Server.new(stream, VERSION)
 				end

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

@@ -3,6 +3,7 @@
 # Released under the MIT License.
 # Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2018, by Janko Marohnić.
+# Copyright, 2023, by Thomas Morgan.
 
 require_relative 'http1'
 
@@ -21,13 +22,13 @@ module Async
 				end
 				
 				def self.client(peer)
-					stream = ::IO::Stream::Buffered.wrap(peer)
+					stream = ::IO::Stream(peer)
 					
 					return HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(peer)
-					stream = ::IO::Stream::Buffered.wrap(peer)
+					stream = ::IO::Stream(peer)
 					
 					return HTTP1::Server.new(stream, VERSION)
 				end

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

@@ -2,11 +2,12 @@
 
 # Released under the MIT License.
 # Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2023, by Thomas Morgan.
 
 require_relative 'http2/client'
 require_relative 'http2/server'
 
-require 'io/stream/buffered'
+require 'io/stream'
 
 module Async
 	module HTTP
@@ -37,7 +38,7 @@ module Async
 				}
 				
 				def self.client(peer, settings = CLIENT_SETTINGS)
-					stream = ::IO::Stream::Buffered.wrap(peer)
+					stream = ::IO::Stream(peer)
 					client = Client.new(stream)
 					
 					client.send_connection_preface(settings)
@@ -47,7 +48,7 @@ module Async
 				end
 				
 				def self.server(peer, settings = SERVER_SETTINGS)
-					stream = ::IO::Stream::Buffered.wrap(peer)
+					stream = ::IO::Stream(peer)
 					server = Server.new(stream)
 					
 					server.read_connection_preface(settings)

data/lib/async/http/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.66.3"
+		VERSION = "0.67.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.66.3
+  version: 0.67.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -57,7 +57,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-05-10 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -155,14 +155,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: traces
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +197,7 @@ files:
 - lib/async/http/internet.rb
 - lib/async/http/internet/instance.rb
 - lib/async/http/protocol.rb
+- lib/async/http/protocol/http.rb
 - lib/async/http/protocol/http1.rb
 - lib/async/http/protocol/http1/client.rb
 - lib/async/http/protocol/http1/connection.rb
@@ -246,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A HTTP client and server library.