async-http 0.74.0 → 0.75.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a21c7008b5509bd6f8bdffd7dad87a7679bdc9f32584cc71fa2b468518cd57c
-  data.tar.gz: 2836fc0ef066dfeb60240dce08dd88c07201250b948cfb04617ab52e9d20371c
+  metadata.gz: 946e45fa80db4dc1a3416f91a6533d58e7e4c5b8e7db9a687b922e9161f84dcf
+  data.tar.gz: 7810dfb04b6c120e91660c4cabec884ef531bb4b4078c149558a6190314f88cb
 SHA512:
-  metadata.gz: c249984efd9030c199c6b1199dfb4ededdd25a7db33e5156c0ecec2a5d883d703bc976216da13c33426d4814514676f80296687293c53cb4ddc33f44ff4f38a3
-  data.tar.gz: f707e1908dc79b1e16f2be6546f1781003f4d88e21307fd5172d27198b61a08f87e350a43f784445a761cda89cb674669b552e77ef1e9de4cfaeb4095040ffa9
+  metadata.gz: 456325793d94251a8b8b117000361e512c23aad9ce03dd2df6c387a35405ac83a7cae1b0de270bf0264485ab98ff5fff3778d720845fe26753950bedd1066b38
+  data.tar.gz: de2cb3749808740c03bd0d0d6cfe5facb3282d26f8465ddeb734158389cfdd70b2bf5610a01bf1d4f0af44fdc1d6c15249f912942038778e9f38217e96ad9c84

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
 require_relative 'connection'
 
@@ -33,22 +33,16 @@ module Async
 							
 							if protocol = request.protocol
 								# This is a very tricky apect of handling HTTP/1 upgrade connections. In theory, this approach is a bit inefficient, because we spin up a task just to handle writing to the underlying stream when we could be writing to the stream directly. But we need to maintain some level of compatibility with HTTP/2. Additionally, we don't know if the upgrade request will be accepted, so starting to write the body at this point needs to be handled with care.
-								task.async do |subtask|
-									subtask.annotate("Upgrading request.")
-									
+								task.async(annotation: "Upgrading request...") do
 									# If this fails, this connection will be closed.
 									write_upgrade_body(protocol, body)
 								end
 							elsif request.connect?
-								task.async do |subtask|
-									subtask.annotate("Tunnelling body.")
-									
+								task.async(annotation: "Tunnneling request...") do
 									write_tunnel_body(@version, body)
 								end
 							else
-								task.async do |subtask|
-									subtask.annotate("Streaming body.")
-									
+								task.async(annotation: "Streaming request...") do
 									# Once we start writing the body, we can't recover if the request fails. That's because the body might be generated dynamically, streaming, etc.
 									write_body(@version, body, false, trailer)
 								end

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

@@ -59,33 +59,42 @@ module Async
 								if response
 									trailer = response.headers.trailer!
 									
-									write_response(@version, response.status, response.headers)
-									
 									# Some operations in this method are long running, that is, it's expected that `body.call(stream)` could literally run indefinitely. In order to facilitate garbage collection, we want to nullify as many local variables before calling the streaming body. This ensures that the garbage collection can clean up as much state as possible during the long running operation, so we don't retain objects that are no longer needed.
-
+									
 									if body and protocol = response.protocol
+										# We force a 101 response if the protocol is upgraded - HTTP/2 CONNECT will return 200 for success, but this won't be understood by HTTP/1 clients:
+										write_response(@version, 101, response.headers)
+										
 										stream = write_upgrade_body(protocol)
 										
 										# At this point, the request body is hijacked, so we don't want to call #finish below.
-										request = response = nil
-										
-										body.call(stream)
-									elsif request.connect? and response.success?
-										stream = write_tunnel_body(request.version)
-										
-										# Same as above:
-										request = response = nil
-										
-										body.call(stream)
-									else
-										head = request.head?
-										version = request.version
-										
-										# Same as above:
 										request = nil unless request.body
 										response = nil
 										
-										write_body(version, body, head, trailer)
+										# We must return here as no further request processing can be done:
+										return body.call(stream)
+									else
+										write_response(@version, response.status, response.headers)
+										
+										if request.connect? and response.success?
+											stream = write_tunnel_body(request.version)
+											
+											# Same as above:
+											request = nil unless request.body
+											response = nil
+											
+											# We must return here as no further request processing can be done:
+											return body.call(stream)
+										else
+											head = request.head?
+											version = request.version
+											
+											# Same as above:
+											request = nil unless request.body
+											response = nil
+											
+											write_body(version, body, head, trailer)
+										end
 									end
 									
 									# We are done with the body, you shouldn't need to call close on it:

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

@@ -66,14 +66,14 @@ module Async
 					end
 					
 					def close(error = nil)
-						super
-						
 						# Ensure the reader task is stopped.
 						if @reader
 							reader = @reader
 							@reader = nil
 							reader.stop
 						end
+						
+						super
 					end
 					
 					def read_in_background(parent: Task.current)
@@ -101,6 +101,8 @@ module Async
 							ensure
 								# Don't call #close twice.
 								if @reader
+									@reader = nil
+									
 									self.close(error)
 								end
 							end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
 require_relative '../request'
 require_relative 'stream'

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
 require_relative '../response'
 require_relative 'stream'
@@ -54,6 +54,11 @@ module Async
 							@response.status = status
 							@headers = ::Protocol::HTTP::Headers.new
 							
+							# If the protocol request was successful, ensure the response protocol matches:
+							if status == 200 and protocol = @response.request.protocol
+								@response.protocol = Array(protocol).first
+							end
+							
 							headers.each do |key, value|
 								# It's guaranteed that this should be the first header:
 								if key == CONTENT_LENGTH
@@ -118,7 +123,7 @@ module Async
 							
 							@exception = error
 							
-							notify!
+							self.notify!
 						end
 					end
 					

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 
 require 'protocol/http/request'
 require 'protocol/http/headers'

data/lib/async/http/version.rb

@@ -5,6 +5,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.74.0"
+		VERSION = "0.75.0"
 	end
 end

data/readme.md

@@ -16,6 +16,10 @@ 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.75.0
+
+  - Better handling of HTTP/1 \<-\> HTTP/2 proxying, specifically upgrade/CONNECT requests.
+
 ### v0.74.0
 
   - [`Async::HTTP::Internet` accepts keyword arguments](https://socketry.github.io/async-http/releases/index#async::http::internet-accepts-keyword-arguments)

data/releases.md

@@ -1,5 +1,9 @@
 # Releases
 
+## v0.75.0
+
+  - Better handling of HTTP/1 \<-\> HTTP/2 proxying, specifically upgrade/CONNECT requests.
+
 ## v0.74.0
 
 ### `Async::HTTP::Internet` accepts keyword arguments

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.74.0
+  version: 0.75.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -58,7 +58,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-08-31 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async