async-http 0.56.4 → 0.57.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: caff6f0e39afa2ec8e8eaff86fc960121968f136fd23bee8e4c4344e1da55c36
-  data.tar.gz: 8428ae61665e4bc9275cf1a127006c9c975cc184267a1ac0a35b9b7df80d608f
+  metadata.gz: 454a678139fa72fafb6fc06cc34af7f21b44bba2a7ebddf7bfc823c01c5b968a
+  data.tar.gz: d91f30582707db6bd9a717d449c7d8295f8110b315defec4477b892e28678c22
 SHA512:
-  metadata.gz: 761f315b4fc933cb92d80eb9000e2f5dd2c796bc9e119265ee452f27f0edabc071766e4d48e35dd1866661d315166b7e32fb509348ec5c9cb43c38c5d1b4586f
-  data.tar.gz: 0b229bf87de21d7cc05de022283901f75114bf37acc240e7992430c5e47602ab04f8b9aa76884b30733f55a1b52b0d3ae51b9dc0e25ea1a653dfda680e77a1ce
+  metadata.gz: 0517cac618b852dca972400c943b7fc78ee7693ad1555eeb2699d5fc45a6fee0d4ceeb45121168955da3bdd980ebee788f21c51d42e3de5fba03a8896e3fb3fc
+  data.tar.gz: 321e705b70ab0efb1d36cc8614a6193b593c930badd96f239734685594da3456ee505e9dcc9c7fe28fc4ace349c25e4cff3774b5753d1c692769b21466d80de4

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

@@ -21,7 +21,9 @@
 # THE SOFTWARE.
 
 require 'protocol/http/body/readable'
-require_relative 'stream'
+require 'protocol/http/body/stream'
+
+require_relative 'writable'
 
 module Async
 	module HTTP
@@ -42,6 +44,7 @@ module Async
 					
 					@task = nil
 					@stream = nil
+					@output = nil
 				end
 				
 				# We prefer streaming directly as it's the lowest overhead.
@@ -57,23 +60,18 @@ module Async
 				
 				# Has the producer called #finish and has the reader consumed the nil token?
 				def empty?
-					if @stream
-						@stream.empty?
-					else
-						false
-					end
+					@output&.empty?
 				end
 				
 				def ready?
-					if @stream
-						@stream.output.ready?
-					end
+					@output&.ready?
 				end
 				
 				# Read the next available chunk.
 				def read
-					unless @task
-						@stream = Stream.new(@input)
+					unless @output
+						@output = Writable.new
+						@stream = ::Protocol::HTTP::Body::Stream.new(@input, @output)
 						
 						@task = Task.current.async do |task|
 							task.annotate "Streaming hijacked body."
@@ -82,7 +80,7 @@ module Async
 						end
 					end
 					
-					return @stream.output.read
+					return @output.read
 				end
 				
 				def inspect

data/lib/async/http/client.rb

@@ -28,6 +28,8 @@ require 'async/pool/controller'
 require 'protocol/http/body/completable'
 require 'protocol/http/methods'
 
+require 'traces/provider'
+
 require_relative 'protocol'
 
 module Async
@@ -136,6 +138,46 @@ module Async
 					@pool.release(connection) if connection
 				end
 			end
+
+			def inspect
+				"#<#{self.class} authority=#{@authority.inspect}>"
+			end
+
+			Traces::Provider(self) do
+				def call(request)
+					attributes = {
+						'http.method': request.method,
+						'http.authority': request.authority || self.authority,
+						'http.scheme': request.scheme || self.scheme,
+						'http.path': request.path,
+					}
+					
+					if protocol = request.protocol
+						attributes['http.protocol'] = protocol
+					end
+					
+					if length = request.body&.length
+						attributes['http.request.length'] = length
+					end
+					
+					trace('async.http.client.call', attributes: attributes) do |span|
+						if context = trace_context(span)
+							request.headers['traceparent'] = context.to_s
+							# request.headers['tracestate'] = context.state
+						end
+						
+						super.tap do |response|
+							if status = response&.status
+								span['http.status_code'] = status
+							end
+							
+							if length = response.body&.length
+								span['http.response.length'] = length
+							end
+						end
+					end
+				end
+			end
 			
 			protected
 			

data/lib/async/http/endpoint.rb

@@ -37,13 +37,13 @@ module Async
 				return self.new(url, endpoint, **options)
 			end
 			
-			# Construct an endpoint with a specified scheme, hostname, and options.
-			def self.for(scheme, hostname, **options)
+			# Construct an endpoint with a specified scheme, hostname, optional path, and options.
+			def self.for(scheme, hostname, path = "/", **options)
 				# TODO: Consider using URI.for once it becomes available:
 				uri_klass = URI.scheme_list[scheme.upcase] || URI::HTTP
 				
 				self.new(
-					uri_klass.new(scheme, nil, hostname, nil, nil, nil, nil, nil, nil),
+					uri_klass.new(scheme, nil, hostname, nil, nil, path, nil, nil, nil).normalize,
 					**options
 				)
 			end
@@ -241,4 +241,4 @@ module Async
 			end
 		end
 	end
-end
+end

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

@@ -34,6 +34,7 @@ module Async
 						
 						Console.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 						
+						# Mark the start of the trailers:
 						trailer = request.headers.trailer!
 						
 						# We carefully interpret https://tools.ietf.org/html/rfc7230#section-6.3.1 to implement this correctly.

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

@@ -20,7 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative '../../body/stream'
+require 'protocol/http/body/stream'
 
 module Async
 	module HTTP
@@ -88,7 +88,7 @@ module Async
 						
 						input = @stream.wait_for_input
 						
-						@body.call(Body::Stream.new(input, self))
+						@body.call(::Protocol::HTTP::Body::Stream.new(input, self))
 					rescue Async::Stop
 						# Ignore.
 					end

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

@@ -34,7 +34,6 @@ module Async
 						super
 						
 						@headers = nil
-						@trailer = nil
 						
 						# Input buffer, reading request body, or response body (receive_data):
 						@length = nil
@@ -62,11 +61,7 @@ module Async
 					
 					def receive_trailing_headers(headers, end_stream)
 						headers.each do |key, value|
-							if @trailer.include?(key)
-								add_header(key, value)
-							else
-								raise ::Protocol::HTTP2::HeaderError, "Cannot add trailer #{key} as it was not specified as a trailer!"
-							end
+							add_header(key, value)
 						end
 					end
 					
@@ -74,9 +69,7 @@ module Async
 						if @headers.nil?
 							@headers = ::Protocol::HTTP::Headers.new
 							self.receive_initial_headers(super, frame.end_stream?)
-							
-							@trailer = @headers[TRAILER]
-						elsif @trailer and frame.end_stream?
+						elsif frame.end_stream?
 							self.receive_trailing_headers(super, frame.end_stream?)
 						else
 							raise ::Protocol::HTTP2::HeaderError, "Unable to process headers!"
@@ -152,7 +145,7 @@ module Async
 							send_reset_stream(::Protocol::HTTP2::Error::INTERNAL_ERROR)
 						else
 							# Write trailer?
-							if trailer
+							if trailer&.any?
 								send_headers(nil, trailer, ::Protocol::HTTP2::END_STREAM)
 							else
 								send_data(nil, ::Protocol::HTTP2::END_STREAM)

data/lib/async/http/relative_location.rb

@@ -28,11 +28,11 @@ module Async
 	module HTTP
 		class TooManyRedirects < StandardError
 		end
-
+		
 		# A client wrapper which transparently handles both relative and absolute redirects to a given maximum number of hops.
 		class RelativeLocation < ::Protocol::HTTP::Middleware
 			DEFAULT_METHOD = GET
-
+			
 			# maximum_hops is the max number of redirects. Set to 0 to allow 1 request with no redirects.
 			def initialize(app, maximum_hops = 3)
 				super(app)
@@ -51,7 +51,7 @@ module Async
 				
 				while hops <= @maximum_hops
 					response = super(request)
-
+					
 					if response.redirection?
 						hops += 1
 						response.finish

data/lib/async/http/server.rb

@@ -23,9 +23,12 @@
 require 'async/io/endpoint'
 require 'async/io/stream'
 
-require_relative 'protocol'
 require 'protocol/http/middleware'
 
+require 'traces/provider'
+
+require_relative 'protocol'
+
 module Async
 	module HTTP
 		class Server < ::Protocol::HTTP::Middleware
@@ -70,6 +73,42 @@ module Async
 			def run
 				@endpoint.accept(&self.method(:accept))
 			end
+			
+			Traces::Provider(self) do
+				def call(request)
+					if trace_parent = request.headers['traceparent']
+						self.trace_context = Traces::Context.parse(trace_parent.join, request.headers['tracestate'], remote: true)
+					end
+					
+					attributes = {
+						'http.method': request.method,
+						'http.authority': request.authority,
+						'http.scheme': request.scheme,
+						'http.path': request.path,
+						'http.user_agent': request.headers['user-agent'],
+					}
+					
+					if length = request.body&.length
+						attributes['http.request.length'] = length
+					end
+					
+					if protocol = request.protocol
+						attributes['http.protocol'] = protocol
+					end
+					
+					trace('async.http.server.call', attributes: attributes) do |span|
+						super.tap do |response|
+							if status = response&.status
+								span['http.status_code'] = status
+							end
+							
+							if length = response&.body&.length
+								span['http.response.length'] = length
+							end
+						end
+					end
+				end
+			end
 		end
 	end
 end

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.56.4"
+		VERSION = "0.57.0"
 	end
 end

metadata

@@ -1,14 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.56.4
+  version: 0.57.0
 platform: ruby
 authors:
 - Samuel Williams
+- Brian Morearty
+- Bruno Sutic
+- Janko Marohnić
+- Adam Daniels
+- Cyril Roelandt
+- Denis Talakevich
+- Ian Ker-Seymer
+- Igor Sidorov
+- Marco Concetto Rudilosso
+- Olle Jonsson
+- Orgad Shaneh
+- Stefan Wrobel
+- TheAthlete
+- Trevor Turk
+- samshadwell
 autorequire:
 bindir: bin
-cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIE2DCCA0CgAwIBAgIBATANBgkqhkiG9w0BAQsFADBhMRgwFgYDVQQDDA9zYW11
+  ZWwud2lsbGlhbXMxHTAbBgoJkiaJk/IsZAEZFg1vcmlvbnRyYW5zZmVyMRIwEAYK
+  CZImiZPyLGQBGRYCY28xEjAQBgoJkiaJk/IsZAEZFgJuejAeFw0yMjA4MDYwNDUz
+  MjRaFw0zMjA4MDMwNDUzMjRaMGExGDAWBgNVBAMMD3NhbXVlbC53aWxsaWFtczEd
+  MBsGCgmSJomT8ixkARkWDW9yaW9udHJhbnNmZXIxEjAQBgoJkiaJk/IsZAEZFgJj
+  bzESMBAGCgmSJomT8ixkARkWAm56MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIB
+  igKCAYEAomvSopQXQ24+9DBB6I6jxRI2auu3VVb4nOjmmHq7XWM4u3HL+pni63X2
+  9qZdoq9xt7H+RPbwL28LDpDNflYQXoOhoVhQ37Pjn9YDjl8/4/9xa9+NUpl9XDIW
+  sGkaOY0eqsQm1pEWkHJr3zn/fxoKPZPfaJOglovdxf7dgsHz67Xgd/ka+Wo1YqoE
+  e5AUKRwUuvaUaumAKgPH+4E4oiLXI4T1Ff5Q7xxv6yXvHuYtlMHhYfgNn8iiW8WN
+  XibYXPNP7NtieSQqwR/xM6IRSoyXKuS+ZNGDPUUGk8RoiV/xvVN4LrVm9upSc0ss
+  RZ6qwOQmXCo/lLcDUxJAgG95cPw//sI00tZan75VgsGzSWAOdjQpFM0l4dxvKwHn
+  tUeT3ZsAgt0JnGqNm2Bkz81kG4A2hSyFZTFA8vZGhp+hz+8Q573tAR89y9YJBdYM
+  zp0FM4zwMNEUwgfRzv1tEVVUEXmoFCyhzonUUw4nE4CFu/sE3ffhjKcXcY//qiSW
+  xm4erY3XAgMBAAGjgZowgZcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0O
+  BBYEFO9t7XWuFf2SKLmuijgqR4sGDlRsMC4GA1UdEQQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MC4GA1UdEgQnMCWBI3NhbXVlbC53aWxs
+  aWFtc0BvcmlvbnRyYW5zZmVyLmNvLm56MA0GCSqGSIb3DQEBCwUAA4IBgQB5sxkE
+  cBsSYwK6fYpM+hA5B5yZY2+L0Z+27jF1pWGgbhPH8/FjjBLVn+VFok3CDpRqwXCl
+  xCO40JEkKdznNy2avOMra6PFiQyOE74kCtv7P+Fdc+FhgqI5lMon6tt9rNeXmnW/
+  c1NaMRdxy999hmRGzUSFjozcCwxpy/LwabxtdXwXgSay4mQ32EDjqR1TixS1+smp
+  8C/NCWgpIfzpHGJsjvmH2wAfKtTTqB9CVKLCWEnCHyCaRVuKkrKjqhYCdmMBqCws
+  JkxfQWC+jBVeG9ZtPhQgZpfhvh+6hMhraUYRQ6XGyvBqEUe+yo6DKIT3MtGE2+CP
+  eX9i9ZWBydWb8/rvmwmX2kkcBbX0hZS1rcR593hGc61JR6lvkGYQ2MYskBveyaxt
+  Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
+  voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
+  -----END CERTIFICATE-----
+date: 2022-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -28,28 +72,28 @@ dependencies:
   name: async-io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.28'
 - !ruby/object:Gem::Dependency
   name: async-pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
@@ -58,14 +102,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +138,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: traces
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +195,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: localhost
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,33 +209,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: localhost
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 description:
 email:
 executables: []
@@ -192,7 +250,6 @@ files:
 - lib/async/http/body/hijack.rb
 - lib/async/http/body/pipe.rb
 - lib/async/http/body/slowloris.rb
-- lib/async/http/body/stream.rb
 - lib/async/http/body/writable.rb
 - lib/async/http/client.rb
 - lib/async/http/endpoint.rb
@@ -244,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A HTTP client and server library.

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

@@ -1,172 +0,0 @@
-# frozen_string_literal: true
-#
-# Copyright, 2019, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-require_relative 'writable'
-
-module Async
-	module HTTP
-		module Body
-			# The input stream is an IO-like object which contains the raw HTTP POST data. When applicable, its external encoding must be “ASCII-8BIT” and it must be opened in binary mode, for Ruby 1.9 compatibility. The input stream must respond to gets, each, read and rewind.
-			class Stream
-				def initialize(input, output = Writable.new)
-					@input = input
-					@output = output
-					
-					raise ArgumentError, "Non-writable output!" unless output.respond_to?(:write)
-					
-					# Will hold remaining data in `#read`.
-					@buffer = nil
-					@closed = false
-				end
-				
-				attr :input
-				attr :output
-				
-				# rack.hijack_io must respond to:
-				# read, write, read_nonblock, write_nonblock, flush, close, close_read, close_write, closed?
-				
-				# read behaves like IO#read. Its signature is read([length, [buffer]]). If given, length must be a non-negative Integer (>= 0) or nil, and buffer must be a String and may not be nil. If length is given and not nil, then this method reads at most length bytes from the input stream. If length is not given or nil, then this method reads all data until EOF. When EOF is reached, this method returns nil if length is given and not nil, or “” if length is not given or is nil. If buffer is given, then the read data will be placed into buffer instead of a newly created String object.
-				# @param length [Integer] the amount of data to read
-				# @param buffer [String] the buffer which will receive the data
-				# @return a buffer containing the data
-				def read(size = nil, buffer = nil)
-					return '' if size == 0
-					
-					buffer ||= Async::IO::Buffer.new
-					if @buffer
-						buffer.replace(@buffer)
-						@buffer = nil
-					end
-					
-					if size
-						while buffer.bytesize < size and chunk = read_next
-							buffer << chunk
-						end
-						
-						@buffer = buffer.byteslice(size, buffer.bytesize)
-						buffer = buffer.byteslice(0, size)
-						
-						if buffer.empty?
-							return nil
-						else
-							return buffer
-						end
-					else
-						while chunk = read_next
-							buffer << chunk
-						end
-						
-						return buffer
-					end
-				end
-				
-				# Read at most `size` bytes from the stream. Will avoid reading from the underlying stream if possible.
-				def read_partial(size = nil)
-					if @buffer
-						buffer = @buffer
-						@buffer = nil
-					else
-						buffer = read_next
-					end
-					
-					if buffer and size
-						if buffer.bytesize > size
-							@buffer = buffer.byteslice(size, buffer.bytesize)
-							buffer = buffer.byteslice(0, size)
-						end
-					end
-					
-					return buffer
-				end
-				
-				def read_nonblock(length, buffer = nil)
-					@buffer ||= read_next
-					chunk = nil
-					
-					return nil if @buffer.nil?
-					
-					if @buffer.bytesize > length
-						chunk = @buffer.byteslice(0, length)
-						@buffer = @buffer.byteslice(length, @buffer.bytesize)
-					else
-						chunk = @buffer
-						@buffer = nil
-					end
-					
-					if buffer
-						buffer.replace(chunk)
-					else
-						buffer = chunk
-					end
-					
-					return buffer
-				end
-				
-				def write(buffer)
-					@output.write(buffer)
-				end
-				
-				alias write_nonblock write
-				
-				def flush
-				end
-				
-				def close_read
-					@input&.close
-				end
-				
-				def close_write
-					@output&.close
-				end
-				
-				# Close the input and output bodies.
-				def close(error = nil)
-					self.close_read
-					self.close_write
-				ensure
-					@closed = true
-				end
-				
-				# Whether the stream has been closed.
-				def closed?
-					@closed
-				end
-				
-				# Whether there are any output chunks remaining?
-				def empty?
-					@output.empty?
-				end
-				
-				private
-				
-				def read_next
-					if chunk = @input&.read
-						return chunk
-					else
-						@input = nil
-						return nil
-					end
-				end
-			end
-		end
-	end
-end