async-http 0.85.0 → 0.87.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2abd1ccb6ed6a0aa477ec0b66fa1cf7158080e2e782e2140d3fb5ba95c2ba723
-  data.tar.gz: a804dc5b23de9db8665958eb43f2ee93225fd8f6ebeedea18a384bd32117fee0
+  metadata.gz: 7fb9ca49f85d321261c3a3ee9cccf0459841fc09e5df5981289c6d4a6dc6a973
+  data.tar.gz: 2a8310e595b65f51001f0b871de5992476153cd0de3eb175d1060e7743ffe6d2
 SHA512:
-  metadata.gz: 3e2e0bb55527a84ca22e151e5de80c8cf8fad1a19cef7079c8bb596085201a5859048e2dc911d2f04b2c3e3b30c08db54390218881adeba4efb9a350f550b98c
-  data.tar.gz: ef021c1c8c9c2f63372d4aa709f5144e8285d227167ae7cb83c3b2f063f37886d3ae92b33ca744551f7081bf9adc07eba5a9fb174120e95b2c877f35c3ebeace
+  metadata.gz: 5b2c843acae23369e6fcffffea81ee443bac6caa2bb21acd80a72af00a831326700e0b0c6e57128f300b11bcbaf435f03e59a84c3de17c59b170241a0dce0cfb
+  data.tar.gz: b851a56d637736f82cc48b68c00ca4562daa9756548792d4f41c21771150e6b1bd1385eb429cfa43937936454d4719e3535f9273254dc81e26880ce30aa3eeb6

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2018-2025, by Samuel Williams.
 
 require_relative "connection"
 
@@ -39,7 +39,16 @@ module Async
 						
 						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.
 						begin
-							write_request(request.authority, request.method, request.path, @version, request.headers)
+							target = request.path
+							authority = request.authority
+							
+							# If we are using a CONNECT request, we need to use the authority as the target:
+							if request.connect?
+								target = authority
+								authority = nil
+							end
+							
+							write_request(authority, request.method, target, @version, request.headers)
 						rescue
 							# If we fail to fully write the request and body, we can retry this request.
 							raise RequestFailed

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2018-2025, by Samuel Williams.
 
 require_relative "../request"
 
@@ -10,21 +10,45 @@ module Async
 		module Protocol
 			module HTTP1
 				class Request < Protocol::Request
+					def self.valid_path?(target)
+						if target.start_with?("/")
+							return true
+						elsif target == "*"
+							return true
+						else
+							return false
+						end
+					end
+					
+					URI_PATTERN = %r{\A(?<scheme>[^:/]+)://(?<authority>[^/]+)(?<path>.*)\z}
+					
 					def self.read(connection)
-						if parts = connection.read_request
-							self.new(connection, *parts)
+						connection.read_request do |authority, method, target, version, headers, body|
+							if method == ::Protocol::HTTP::Methods::CONNECT
+								# We put the target into the authority field for CONNECT requests, as per HTTP/2 semantics.
+								self.new(connection, nil, target, method, nil, version, headers, body)
+							elsif valid_path?(target)
+								# This is a valid request.
+								self.new(connection, nil, authority, method, target, version, headers, body)
+							elsif match = target.match(URI_PATTERN)
+								# We map the incoming absolute URI target to the scheme, authority, and path fields of the request.
+								self.new(connection, match[:scheme], match[:authority], method, match[:path], version, headers, body)
+							else
+								# This is an invalid request.
+								raise ::Protocol::HTTP1::BadRequest.new("Invalid request target: #{target}")
+							end
 						end
 					end
 					
 					UPGRADE = "upgrade"
 					
-					def initialize(connection, authority, method, path, version, headers, body)
+					def initialize(connection, scheme, authority, method, path, version, headers, body)
 						@connection = connection
 						
 						# HTTP/1 requests with an upgrade header (which can contain zero or more values) are extracted into the protocol field of the request, and we expect a response to select one of those protocols with a status code of 101 Switching Protocols.
 						protocol = headers.delete("upgrade")
 						
-						super(nil, authority, method, path, version, headers, body, protocol, self.public_method(:write_interim_response))
+						super(scheme, authority, method, path, version, headers, body, protocol, self.public_method(:write_interim_response))
 					end
 					
 					def connection

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2018-2025, by Samuel Williams.
 
 require_relative "../request"
 require_relative "stream"
@@ -99,7 +99,7 @@ module Async
 					end
 					
 					def valid?
-						@scheme and @method and @path
+						@scheme and @method and (@path or @method == ::Protocol::HTTP::Methods::CONNECT)
 					end
 					
 					def hijack?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2018-2025, by Samuel Williams.
 
 require_relative "../response"
 require_relative "stream"
@@ -204,9 +204,12 @@ module Async
 						pseudo_headers = [
 							[SCHEME, request.scheme],
 							[METHOD, request.method],
-							[PATH, request.path],
 						]
 						
+						if path = request.path
+							pseudo_headers << [PATH, path]
+						end
+						
 						# To ensure that the HTTP/1.1 request line can be reproduced accurately, this pseudo-header field MUST be omitted when translating from an HTTP/1.1 request that has a request target in origin or asterisk form (see [RFC7230], Section 5.3). Clients that generate HTTP/2 requests directly SHOULD use the :authority pseudo-header field instead of the Host header field.
 						if authority = request.authority
 							pseudo_headers << [AUTHORITY, authority]

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

@@ -27,6 +27,7 @@ module Async
 					::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
 					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
 					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x800000,
+					::Protocol::HTTP2::Settings::NO_RFC7540_PRIORITIES => 1,
 				}
 				
 				SERVER_SETTINGS = {
@@ -35,6 +36,7 @@ module Async
 					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
 					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x800000,
 					::Protocol::HTTP2::Settings::ENABLE_CONNECT_PROTOCOL => 1,
+					::Protocol::HTTP2::Settings::NO_RFC7540_PRIORITIES => 1,
 				}
 				
 				def self.client(peer, settings = CLIENT_SETTINGS)

data/lib/async/http/proxy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2024, by Samuel Williams.
+# Copyright, 2019-2025, by Samuel Williams.
 
 require_relative "client"
 require_relative "endpoint"
@@ -82,7 +82,7 @@ module Async
 			def connect(&block)
 				input = Body::Writable.new
 				
-				response = @client.connect(@address.to_s, @headers, input)
+				response = @client.connect(authority: @address, headers: @headers, body: input)
 				
 				if response.success?
 					pipe = Body::Pipe.new(response.body, input)

data/lib/async/http/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.85.0"
+		VERSION = "0.87.0"
 	end
 end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2017-2024, by Samuel Williams.  
+Copyright, 2017-2025, by Samuel Williams.  
 Copyright, 2018, by Viacheslav Koval.  
 Copyright, 2018, by Janko Marohnić.  
 Copyright, 2019, by Denis Talakevich.  

data/readme.md

@@ -16,6 +16,14 @@ 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.87.0
+
+  - [Unify HTTP/1 and HTTP/2 `CONNECT` semantics](https://socketry.github.io/async-http/releases/index#unify-http/1-and-http/2-connect-semantics)
+
+### v0.86.0
+
+  - Add support for HTTP/2 `NO_RFC7540_PRIORITIES`. See <https://www.rfc-editor.org/rfc/rfc9218.html> for more details.
+
 ### v0.84.0
 
   - Minor consistency fixes to `Async::HTTP::Internet` singleton methods.

data/releases.md

@@ -1,5 +1,33 @@
 # Releases
 
+## v0.87.0
+
+### Unify HTTP/1 and HTTP/2 `CONNECT` semantics
+
+HTTP/1 has a request line "target" which takes different forms depending on the kind of request. For `CONNECT` requests, the target is the authority (host and port) of the target server, e.g.
+
+    CONNECT example.com:443 HTTP/1.1
+
+In HTTP/2, the `CONNECT` method uses the `:authority` pseudo-header to specify the target, e.g.
+
+``` http
+[HEADERS FRAME]
+:method: connect
+:authority: example.com:443
+```
+
+In HTTP/1, the `Request#path` attribute was previously used to store the target, and this was incorrectly mapped to the `:path` pseudo-header in HTTP/2. This has been corrected, and the `Request#authority` attribute is now used to store the target for both HTTP/1 and HTTP/2, and mapped accordingly. Thus, to make a `CONNECT` request, you should set the `Request#authority` attribute, e.g.
+
+``` ruby
+response = client.connect(authority: "example.com:443")
+```
+
+For HTTP/1, the authority is mapped back to the request line target, and for HTTP/2, it is mapped to the `:authority` pseudo-header.
+
+## v0.86.0
+
+  - Add support for HTTP/2 `NO_RFC7540_PRIORITIES`. See <https://www.rfc-editor.org/rfc/rfc9218.html> for more details.
+
 ## v0.84.0
 
   - Minor consistency fixes to `Async::HTTP::Internet` singleton methods.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.85.0
+  version: 0.87.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -26,7 +26,6 @@ authors:
 - Trevor Turk
 - Viacheslav Koval
 - dependabot[bot]
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -58,7 +57,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2025-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -117,77 +116,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: protocol-http
+  name: metrics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.43'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
-  name: protocol-http1
+  name: protocol-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: '0.49'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.1
+        version: '0.49'
 - !ruby/object:Gem::Dependency
-  name: protocol-http2
+  name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.30'
 - !ruby/object:Gem::Dependency
-  name: traces
+  name: protocol-http2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.22'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.22'
 - !ruby/object:Gem::Dependency
-  name: metrics
+  name: traces
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-description:
-email:
+        version: '0.10'
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -244,7 +241,6 @@ licenses:
 metadata:
   documentation_uri: https://socketry.github.io/async-http/
   source_code_uri: https://github.com/socketry/async-http.git
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -259,8 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A HTTP client and server library.
 test_files: []

metadata.gz.sig

@@ -1,2 +1,2 @@
-)��H]�-[�L��<��'$~�����G��rŰ~^�Dv@4�������V�Iƕ��-Bh�౩�O�G��VMK	k� ���ͤ{�Bw#ӂc~.�ى]�*[ʸ�F���sG�����@�Q��(��W��I���D�%E��.ڰq��1�S�n[������ ����*��s[��hz��d&��AE_��گI��������7���(4T@	�'6��� �j}/Lf{���A��E�|ռ�W
]z����r��7�~+�JL�|���զs��x����̳�E�q��r9�
-���,��������^�a�H6u]6t�v~�J�qL9��:��q�^@8�H�>�0��ӻ�Y�6�&�8�4aY�~�����4��+�
+��H��;�w1$O��i�\�q>�������ؕ���5����ʪe��5��P4ǭ;�JmVO��������bC����W��:��W..4ګb��UDw��Kx����&��VYt
+�1�{��g��\u�w��e����-q�Ɓƃ=B�<i)�Ԝ��0=-Y2Q��x]��s�o[^b��*��`ܼV���yM��-�7�bg{{[�{D	����z�_�	�K>0���Og��ץ��9x�)�n�Y]��ow��f	'yD��G3B��ba��TQ���t+`X��'ٔ��
�`��