async-http 0.50.6 → 0.50.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783c5bea153973dd5a5c01032f4f7b2ec8c838b48508d744bb89c7e77701af6b
-  data.tar.gz: 688ac155fd0851a35f90cad19235df4c23054d15be47868664aa8c2a26c418ea
+  metadata.gz: 7e2b32bb7262cafc68c516d881d6f3a551597248b06b627ae150111dcfa2b656
+  data.tar.gz: 63f025a564598ec263413f70b9f4a9561a52d1ebbde4d1b2e66c4c9a5a461b89
 SHA512:
-  metadata.gz: 6ff34b8f8ecf007c017e20ea09f5a48564027db9c3f11880d315037ea3d861a82c18651c10c73d9c635595dd575ca21564c1d4679da1cf1dc0c6c78d6875a55f
-  data.tar.gz: 57ddc6912f594e35243a008782d35d705bd66fbe8f6505b45f28c63268e707f6f9a53f4c009f75bbe75282f690db87a006a8eacc3c49e85086002a6e6e312a9c
+  metadata.gz: a2d4dad8cdbf23281345f4ab8e5d7d0b58f83f86513940aa108ba292b82defd2ab5bb23b8fd117618ecc0be1a7ecc1d74a81f65582be18362c5bd7d82072f26f
+  data.tar.gz: bef0076a4130b928e1ffd7f42abf15647d639b6ee125de1f71f50d50ae6ede8631f0e11b8c85b455916f3e5417113907de93a9d69e79ac281804d121480c587b

data/async-http.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async-io", "~> 1.27.0")
 	spec.add_dependency("async-pool", "~> 0.2")
 	
-	spec.add_dependency("protocol-http", "~> 0.14.1")
+	spec.add_dependency("protocol-http", "~> 0.15.1")
 	spec.add_dependency("protocol-http1", "~> 0.10.0")
 	spec.add_dependency("protocol-http2", "~> 0.11.0")
 	

data/bake/async/http/h2spec.rb

@@ -0,0 +1,44 @@
+
+def build
+	# Fetch the code:
+	system "go get github.com/spf13/cobra"
+	system "go get github.com/summerwind/h2spec"
+	
+	# This builds `h2spec` into the current directory
+	system "go build ~/go/src/github.com/summerwind/h2spec/cmd/h2spec/h2spec.go"
+end
+
+def test
+	server do
+		system("./h2spec", "-p", "7272")
+	end
+end
+
+private
+
+def server
+	require 'async'
+	require 'async/container'
+	require 'async/http/server'
+	require 'async/io/host_endpoint'
+	
+	endpoint = Async::IO::Endpoint.tcp('127.0.0.1', 7272)
+	
+	container = Async::Container.new
+	
+	Async.logger.info(self){"Starting server..."}
+	
+	container.run(count: 1) do
+		server = Async::HTTP::Server.for(endpoint, Async::HTTP::Protocol::HTTP2, "https") do |request|
+			Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
+		end
+		
+		Async do
+			server.run
+		end
+	end
+	
+	yield if block_given?
+ensure
+	container&.stop
+end

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

@@ -165,36 +165,31 @@ module Async
 					
 					def send_response(response)
 						if response.nil?
-							@stream.send_headers(nil, NO_RESPONSE, ::Protocol::HTTP2::END_STREAM)
-						elsif response.body? && !self.head?
-							pseudo_headers = [
-								[STATUS, response.status],
-							]
-							
-							if protocol = response.protocol
-								pseudo_headers << [PROTOCOL, protocol]
-							end
-							
-							if length = response.body.length
-								pseudo_headers << [CONTENT_LENGTH, length]
-							end
-							
-							headers = ::Protocol::HTTP::Headers::Merged.new(
-								pseudo_headers,
-								response.headers
-							)
-							
+							return @stream.send_headers(nil, NO_RESPONSE, ::Protocol::HTTP2::END_STREAM)
+						end
+						
+						protocol_headers = [
+							[STATUS, response.status],
+						]
+						
+						if protocol = response.protocol
+							protocol_headers << [PROTOCOL, protocol]
+						end
+						
+						if length = response.body&.length
+							protocol_headers << [CONTENT_LENGTH, length]
+						end
+						
+						headers = ::Protocol::HTTP::Headers::Merged.new(protocol_headers, response.headers)
+						
+						if body = response.body and !self.head?
 							@stream.send_headers(nil, headers)
-							@stream.send_body(response.body)
+							@stream.send_body(body)
 						else
-							headers = ::Protocol::HTTP::Headers::Merged.new([
-								[STATUS, response.status],
-							], response.headers)
+							# Ensure the response body is closed if we are ending the stream:
+							response.close
 							
 							@stream.send_headers(nil, headers, ::Protocol::HTTP2::END_STREAM)
-							
-							# If the response had a body but it was not sent, close it (e.g. HEAD request).
-							response.body&.close
 						end
 					end
 				end

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

@@ -75,13 +75,15 @@ module Async
 							
 							@response.headers = @headers
 							
-							unless @response.valid?
-								send_reset_stream(::Protocol::HTTP2::Error::PROTOCOL_ERROR)
-							else
-								# We only construct the input/body if data is coming.
-								unless end_stream
+							if @response.valid?
+								if !end_stream
+									# We only construct the input/body if data is coming.
 									@response.body = prepare_input(@length)
+								elsif @response.head?
+									@response.body = ::Protocol::HTTP::Body::Head.new(@length)
 								end
+							else
+								send_reset_stream(::Protocol::HTTP2::Error::PROTOCOL_ERROR)
 							end
 							
 							self.notify!
@@ -140,6 +142,10 @@ module Async
 						@stream.wait
 					end
 					
+					def head?
+						@request&.head?
+					end
+					
 					def valid?
 						!!@status
 					end

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

@@ -34,6 +34,7 @@ module Async
 							super(length)
 							
 							@stream = stream
+							@remaining = length
 						end
 						
 						def read
@@ -42,6 +43,17 @@ module Async
 								@stream.request_window_update
 							end
 							
+							# We track the expected length and check we got what we were expecting.
+							if @remaining
+								if chunk
+									@remaining -= chunk.bytesize
+								elsif @remaining > 0
+									raise EOFError, "Expected #{self.length} bytes, #{@remaining} bytes short!"
+								elsif @remaining < 0
+									raise EOFError, "Expected #{self.length} bytes, #{@remaining} bytes over!"
+								end
+							end
+							
 							return chunk
 						end
 					end

data/lib/async/http/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.50.6"
+		VERSION = "0.50.7"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.50.6
+  version: 0.50.7
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.1
 - !ruby/object:Gem::Dependency
   name: protocol-http1
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,9 @@ files:
 - README.md
 - Rakefile
 - async-http.gemspec
+- bake.rb
 - bake/async/http.rb
+- bake/async/http/h2spec.rb
 - examples/compare/Gemfile
 - examples/compare/benchmark.rb
 - examples/fetch/Gemfile
@@ -274,8 +276,6 @@ files:
 - lib/async/http/server.rb
 - lib/async/http/statistics.rb
 - lib/async/http/version.rb
-- tasks/h2spec.rake
-- tasks/server.rake
 homepage: https://github.com/socketry/async-http
 licenses:
 - MIT

data/tasks/h2spec.rake

@@ -1,45 +0,0 @@
-
-namespace :h2spec do
-	task :build do
-		# Fetch the code:
-		sh "go get github.com/spf13/cobra"
-		sh "go get github.com/summerwind/h2spec"
-		
-		# This builds `h2spec` into the current directory
-		sh "go build ~/go/src/github.com/summerwind/h2spec/cmd/h2spec/h2spec.go"
-	end
-	
-	task :server do
-		require 'async/reactor'
-		require 'async/container'
-		require 'async/http/server'
-		require 'async/io/host_endpoint'
-		
-		endpoint = Async::IO::Endpoint.tcp('127.0.0.1', 7272)
-		
-		server = Async::HTTP::Server.for(endpoint, Async::HTTP::Protocol::HTTP2, "https") do |request|
-			Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
-		end
-		
-		@container = Async::Container.new
-		
-		Async.logger.info(self){"Starting server..."}
-		@container.run(count: 1) do
-			server.run
-		end
-	end
-	
-	task :test => :server do
-		begin
-			if test = ENV['TEST']
-				sh("./h2spec", test, "-p", "7272")
-			else
-				sh("./h2spec", "-p", "7272")
-			end
-		ensure
-			@container.stop(false)
-		end
-	end
-	
-	task :all => [:build, :test]
-end

data/tasks/server.rake

@@ -1,104 +0,0 @@
-
-task :http1 do
-	require 'async/http/protocol'
-	require 'async/http/endpoint'
-	require 'async/io/host_endpoint'
-
-	@protocol = Async::HTTP::Protocol::HTTP1
-end
-
-task :debug do
-	require 'async/logger'
-	
-	Async.logger.level = Logger::DEBUG
-end
-
-task :google do
-	require 'async'
-	require 'pry'
-	
-	Async do
-		endpoint = Async::HTTP::Endpoint.parse("https://www.google.com")
-		peer = endpoint.connect
-		stream = Async::IO::Stream.new(peer)
-		
-		framer = ::Protocol::HTTP2::Framer.new(stream)
-		client = ::Protocol::HTTP2::Client.new(framer)
-		
-		client.send_connection_preface
-		
-		stream = ::Protocol::HTTP2::Stream.new(client)
-		
-		client.read_frame
-		client.read_frame
-		
-		stream.send_headers(nil, [[':method', 'GET'], [':authority', 'www.google.com'], [':path', '/']], ::Protocol::HTTP2::END_STREAM)
-		
-		binding.pry
-	end
-end
-
-task :server do
-	require 'async/reactor'
-	require 'async/container/forked'
-	require 'async/http/server'
-	
-	server = Async::HTTP::Server.for(Async::IO::Endpoint.tcp('127.0.0.1', 9294, reuse_port: true), @protocol) do |request|
-		return Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
-	end
-	
-	container = Async::Container.new
-	
-	container.run(count: 1) do
-		#GC.disable
-		
-		server.run
-	end
-	
-	container.wait
-end
-
-task :benchmark do
-	sh 'wrk -t 8 -c 8 -d 2 http://127.0.0.1:9294'
-end
-
-task :client do
-	require 'async/reactor'
-	require 'async/http/client'
-	
-	client = Async::HTTP::Client.new(Async::IO::Endpoint.tcp('127.0.0.1', 9294, reuse_port: true), @protocol)
-	
-	Async::Reactor.run do
-		response = client.get("/")
-		
-		puts response.inspect
-		
-		client.close
-	end
-end
-
-task :wrk do
-	require 'async/reactor'
-	require 'async/http/server'
-	require 'async/container/forked'
-
-	server = Async::HTTP::Server.for(Async::IO::Endpoint.tcp('127.0.0.1', 9294, reuse_port: true), @protocol) do |request|
-		return Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
-	end
-
-	concurrency = 1
-	
-	container = Async::Container.new
-	
-	container.run(count: concurrency) do
-		server.run
-	end
-
-	url = "http://127.0.0.1:9294/"
-	
-	5.times do
-		system("wrk", "-c", concurrency.to_s, "-d", "10", "-t", concurrency.to_s, url)
-	end
-
-	container.stop(false)
-end