async-http 0.64.1 → 0.65.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 579710906e91192d6f91923c7f4d07e2cba0bf55894d8c2629220352cf0638b2
-  data.tar.gz: ba3841e0a78ec46be5c0deea52584b7944c86d490591871840992c741959fb94
+  metadata.gz: 1fed6dc55e6fb3c91f31237ca2356a198b1125d0fa49fc970b37fdab16ae0fde
+  data.tar.gz: fd0d5ab9f8587f0eb7ef4eadff2c38c9812c96f074135d025a7a15e52b1eb5ce
 SHA512:
-  metadata.gz: 27d016c44e59e5b40e843b46e80bb90b3a5a4f9de9e876c63600a951abf6787260c5e8e702a7ec559cf4d34f1b4cbaf26ed506e65cfc010b32f63f179662519f
-  data.tar.gz: 8f3ac574e9239cbd92742823ed1adb93a09189b0cdc70299d7162be9c44338c69691c8efdecabaeba7d1f8c697c6d11e1a7201824a758f262004d985fd1a658a
+  metadata.gz: 86b6e22259dbc347c7921b9a5ee1c01d642599b855e2f5a15d084acf750d05009008d2a0ca6ec4a817dff0b0431c76823fd42a2af8a06a6587246036142ebdf2
+  data.tar.gz: '0280a0a6750d1d661ee72bf60294942af80680f9d6b96635dc68377a5e672484008e8bace2ee28a5bfcd5c5dd8b458797d7194c1fa6a21e824d36e37e1ace86c'

data/bake/async/http/h2spec.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 def build
 	# Fetch the code:
@@ -24,9 +24,9 @@ def server
 	require 'async'
 	require 'async/container'
 	require 'async/http/server'
-	require 'async/io/host_endpoint'
+	require 'io/endpoint/host_endpoint'
 	
-	endpoint = Async::IO::Endpoint.tcp('127.0.0.1', 7272)
+	endpoint = IO::Endpoint.tcp('127.0.0.1', 7272)
 	
 	container = Async::Container.new
 	

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

@@ -1,12 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2020, by Bruno Sutic.
 
-require 'async/io/socket'
-require 'async/io/stream'
-
 require_relative 'writable'
 
 module Async
@@ -18,9 +15,9 @@ module Async
 					@input = input
 					@output = output
 					
-					head, tail = IO::Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
+					head, tail = ::Socket.pair(Socket::AF_UNIX, Socket::SOCK_STREAM)
 					
-					@head = IO::Stream.new(head)
+					@head = ::IO::Stream::Buffered.new(head)
 					@tail = tail
 					
 					@reader = nil

data/lib/async/http/client.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2022, by Ian Ker-Seymer.
 
-require 'async/io/endpoint'
-require 'async/io/stream'
+require 'io/endpoint'
 
 require 'async/pool/controller'
 
@@ -42,6 +41,20 @@ module Async
 				@authority = authority
 			end
 			
+			def as_json(...)
+				{
+					endpoint: @endpoint.to_s,
+					protocol: @protocol,
+					retries: @retries,
+					scheme: @scheme,
+					authority: @authority,
+				}
+			end
+			
+			def to_json(...)
+				as_json.to_json(...)
+			end
+			
 			attr :endpoint
 			attr :protocol
 			
@@ -93,7 +106,6 @@ module Async
 					
 					# This signals that the ensure block below should not try to release the connection, because it's bound into the response which will be returned:
 					connection = nil
-					
 					return response
 				rescue Protocol::RequestFailed
 					# This is a specific case where the entire request wasn't sent before a failure occurred. So, we can even resend non-idempotent requests.
@@ -119,7 +131,9 @@ module Async
 						raise
 					end
 				ensure
-					@pool.release(connection) if connection
+					if connection
+						@pool.release(connection)
+					end
 				end
 			end
 			

data/lib/async/http/endpoint.rb

@@ -1,13 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2021-2022, by Adam Daniels.
 
-require 'async/io/host_endpoint'
-require 'async/io/ssl_endpoint'
-require 'async/io/ssl_socket'
-require 'async/io/shared_endpoint'
+require 'io/endpoint'
+require 'io/endpoint/host_endpoint'
+require 'io/endpoint/ssl_endpoint'
 
 require_relative 'protocol/http1'
 require_relative 'protocol/https'
@@ -15,7 +14,7 @@ require_relative 'protocol/https'
 module Async
 	module HTTP
 		# Represents a way to connect to a remote HTTP server.
-		class Endpoint < Async::IO::Endpoint
+		class Endpoint < ::IO::Endpoint::Generic
 			def self.parse(string, endpoint = nil, **options)
 				url = URI.parse(string).normalize
 				
@@ -164,7 +163,7 @@ module Async
 				
 				if secure?
 					# Wrap it in SSL:
-					return Async::IO::SSLEndpoint.new(endpoint,
+					return ::IO::Endpoint::SSLEndpoint.new(endpoint,
 						ssl_context: self.ssl_context,
 						hostname: @url.hostname,
 						timeout: self.timeout,
@@ -226,7 +225,7 @@ module Async
 			end
 			
 			def tcp_endpoint
-				Async::IO::Endpoint.tcp(self.hostname, port, **tcp_options)
+				::IO::Endpoint.tcp(self.hostname, port, **tcp_options)
 			end
 		end
 	end

data/lib/async/http/protocol/http1/connection.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 'protocol/http1'
 
@@ -20,6 +20,18 @@ module Async
 						@version = version
 					end
 					
+					def to_s
+						"\#<#{self.class} negotiated #{@version}, currently #{@ready ? 'ready' : 'in-use'}>"
+					end
+					
+					def as_json(...)
+						to_s
+					end
+					
+					def to_json(...)
+						as_json.to_json(...)
+					end
+					
 					attr :version
 					
 					def http1?
@@ -50,7 +62,7 @@ module Async
 					
 					# Can we use this connection to make requests?
 					def viable?
-						@ready && @stream&.connected?
+						@ready && @stream&.readable?
 					end
 					
 					def reusable?

data/lib/async/http/protocol/http1/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'
 
@@ -15,7 +15,7 @@ module Async
 							self.new(connection, *parts)
 						end
 					end
-
+					
 					UPGRADE = 'upgrade'
 					
 					def initialize(connection, authority, method, path, version, headers, body)

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

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

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

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2020, by Igor Sidorov.
 # Copyright, 2023, by Thomas Morgan.
+# Copyright, 2024, by Anton Zhuravsky.
 
 require_relative 'connection'
 
@@ -14,10 +15,10 @@ module Async
 				class Server < Connection
 					def fail_request(status)
 						@persistent = false
-						write_response(@version, status, {}, nil)
+						write_response(@version, status, {})
 						write_body(@version, nil)
 					rescue Errno::ECONNRESET, Errno::EPIPE
-						# Handle when connection is already closed
+						# Nothing we can do...
 					end
 					
 					def next_request
@@ -109,7 +110,6 @@ module Async
 							end
 						end
 					end
-					
 				end
 			end
 		end

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

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

data/lib/async/http/protocol/http10.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_relative 'http1'
 
@@ -20,13 +20,13 @@ module Async
 				end
 				
 				def self.client(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 					
 					return HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 					
 					return HTTP1::Server.new(stream, VERSION)
 				end

data/lib/async/http/protocol/http11.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.
 # Copyright, 2018, by Janko Marohnić.
 
 require_relative 'http1'
@@ -21,13 +21,13 @@ module Async
 				end
 				
 				def self.client(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 					
 					return HTTP1::Client.new(stream, VERSION)
 				end
 				
 				def self.server(peer)
-					stream = IO::Stream.new(peer, sync: true)
+					stream = ::IO::Stream::Buffered.wrap(peer)
 					
 					return HTTP1::Server.new(stream, VERSION)
 				end

data/lib/async/http/protocol/http2/connection.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.
 # Copyright, 2020, by Bruno Sutic.
 
 require_relative 'stream'
@@ -35,8 +35,20 @@ module Async
 						@write_frame_guard = Async::Semaphore.new(1)
 					end
 					
+					def synchronize(&block)
+						@write_frame_guard.acquire(&block)
+					end
+					
 					def to_s
-						"\#<#{self.class} #{@streams.count} active streams>"
+						"\#<#{self.class} #{@count} requests, #{@streams.count} active streams>"
+					end
+					
+					def as_json(...)
+						to_s
+					end
+					
+					def to_json(...)
+						as_json.to_json(...)
 					end
 					
 					attr :stream
@@ -64,23 +76,6 @@ module Async
 						end
 					end
 					
-					def write_frame(frame)
-						# We don't want to write multiple frames at the same time.
-						@write_frame_guard.acquire do
-							super
-						end
-						
-						@stream.flush
-					end
-					
-					def write_frames(&block)
-						@write_frame_guard.acquire do
-							super
-						end
-						
-						@stream.flush
-					end
-					
 					def read_in_background(parent: Task.current)
 						raise RuntimeError, "Connection is closed!" if closed?
 						
@@ -95,19 +90,18 @@ module Async
 									self.consume_window
 									self.read_frame
 								end
-							rescue SocketError, IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE, Async::Wrapper::Cancelled
-								# Ignore.
-							rescue ::Protocol::HTTP2::GoawayError => error
+							rescue Async::Stop, ::IO::TimeoutError, ::Protocol::HTTP2::GoawayError => error
 								# Error is raised if a response is actively reading from the
 								# connection. The connection is silently closed if GOAWAY is
 								# received outside the request/response cycle.
-								if @reader
-									self.close(error)
-								end
+							rescue SocketError, IOError, EOFError, Errno::ECONNRESET, Errno::EPIPE => ignored_error
+								# Ignore.
+							rescue => error
+								# Every other error.
 							ensure
 								# Don't call #close twice.
 								if @reader
-									self.close($!)
+									self.close(error)
 								end
 							end
 						end
@@ -127,7 +121,7 @@ module Async
 					
 					# Can we use this connection to make requests?
 					def viable?
-						@stream.connected?
+						@stream&.readable?
 					end
 					
 					def reusable?

data/lib/async/http/protocol/http2/server.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'
 require_relative 'request'

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

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2022, by Marco Concetto Rudilosso.
+# Copyright, 2023, by Thomas Morgan.
 
 require 'protocol/http2/stream'
 

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

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2023, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 
 require_relative 'http2/client'
 require_relative 'http2/server'
 
+require 'io/stream/buffered'
+
 module Async
 	module HTTP
 		module Protocol
@@ -35,8 +37,7 @@ module Async
 				}
 				
 				def self.client(peer, settings = CLIENT_SETTINGS)
-					stream = IO::Stream.new(peer, sync: true)
-					
+					stream = ::IO::Stream::Buffered.wrap(peer)
 					client = Client.new(stream)
 					
 					client.send_connection_preface(settings)
@@ -46,8 +47,7 @@ module Async
 				end
 				
 				def self.server(peer, settings = SERVER_SETTINGS)
-					stream = IO::Stream.new(peer, sync: true)
-					
+					stream = ::IO::Stream::Buffered.wrap(peer)
 					server = Server.new(stream)
 					
 					server.read_connection_preface(settings)

data/lib/async/http/protocol/https.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.
 # Copyright, 2019, by Brian Morearty.
 
 require_relative 'http10'

data/lib/async/http/proxy.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative 'client'
 require_relative 'endpoint'
@@ -46,7 +46,7 @@ module Async
 			# @param host [String] the hostname or address to connect to.
 			# @param port [String] the port number to connect to.
 			# @param headers [Array] an optional list of headers to use when establishing the connection.
-			# @see Async::IO::Endpoint#tcp
+			# @see IO::Endpoint#tcp
 			def self.tcp(client, host, port, headers = nil)
 				self.new(client, "#{host}:#{port}", headers)
 			end

data/lib/async/http/server.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2017-2023, by Samuel Williams.
+# Copyright, 2017-2024, by Samuel Williams.
 # Copyright, 2019, by Brian Morearty.
 
-require 'async/io/endpoint'
-require 'async/io/stream'
+require 'io/endpoint'
 
 require 'protocol/http/middleware'
 
@@ -28,6 +27,18 @@ module Async
 				@scheme = scheme
 			end
 			
+			def as_json(...)
+				{
+					endpoint: @endpoint.to_s,
+					protocol: @protocol,
+					scheme: @scheme,
+				}
+			end
+			
+			def to_json(...)
+				as_json.to_json(...)
+			end
+			
 			attr :endpoint
 			attr :protocol
 			attr :scheme
@@ -53,7 +64,7 @@ module Async
 			ensure
 				connection&.close
 			end
-			
+			 
 			def run
 				@endpoint.accept(&self.method(:accept))
 			end

data/lib/async/http/version.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.
 
 module Async
 	module HTTP
-		VERSION = "0.64.1"
+		VERSION = "0.65.0"
 	end
 end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2017-2023, by Samuel Williams.  
+Copyright, 2017-2024, by Samuel Williams.  
 Copyright, 2018, by Viacheslav Koval.  
 Copyright, 2018, by Janko Marohnić.  
 Copyright, 2019, by Denis Talakevich.  
@@ -18,6 +18,9 @@ Copyright, 2022, by Ian Ker-Seymer.
 Copyright, 2022, by Marco Concetto Rudilosso.  
 Copyright, 2022, by Tim Meusel.  
 Copyright, 2023, by Thomas Morgan.  
+Copyright, 2023, by dependabot[bot].  
+Copyright, 2023, by Josh Huber.  
+Copyright, 2024, by Anton Zhuravsky.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -373,7 +373,7 @@ This project uses the [Developer Certificate of Origin](https://developercertifi
 
 ### Contributor Covenant
 
-This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
 
 ## See Also
 

metadata

@@ -1,19 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.64.1
+  version: 0.65.0
 platform: ruby
 authors:
 - Samuel Williams
 - Brian Morearty
 - Bruno Sutic
 - Janko Marohnić
-- Adam Daniels
 - Thomas Morgan
+- Adam Daniels
+- Anton Zhuravsky
 - Cyril Roelandt
 - Denis Talakevich
 - Ian Ker-Seymer
 - Igor Sidorov
+- Josh Huber
 - Marco Concetto Rudilosso
 - Olle Jonsson
 - Orgad Shaneh
@@ -22,6 +24,7 @@ authors:
 - Tim Meusel
 - Trevor Turk
 - Viacheslav Koval
+- dependabot[bot]
 autorequire:
 bindir: bin
 cert_chain:
@@ -54,7 +57,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -62,42 +65,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 2.10.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: 2.10.2
 - !ruby/object:Gem::Dependency
-  name: async-io
+  name: async-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.28'
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: async-pool
+  name: io-endpoint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: io-stream
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: protocol-http
   requirement: !ruby/object:Gem::Requirement
@@ -132,14 +149,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: traces
   requirement: !ruby/object:Gem::Requirement
@@ -205,7 +222,9 @@ files:
 homepage: https://github.com/socketry/async-http
 licenses:
 - MIT
-metadata: {}
+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:
@@ -214,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="