async-http 0.43.1 → 0.44.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 901472f2bea3d4389d6ac6adab0b2e78a86991e10da7a2e92a3fbae69f66e9a8
-  data.tar.gz: df036f736d8314edf42f784b159acfc2fd7c755294aae26130f23fcd5187a49b
+  metadata.gz: 2765c2877e0c9ee3f520b0a04a6c67f258abccee76500ebbd18028b279867cc9
+  data.tar.gz: '06969faca4325c0c2e1c41b503a6cd67900419eb7fcd84481eab24bb019eb1b0'
 SHA512:
-  metadata.gz: 379eb7bf5cb3ee6ee187989789869274e6f21fdf4fd5cfe60d0c492cec037898147675eac89b9974d7ecc99138664202628d330c66a00cddda4a3090b7285e2f
-  data.tar.gz: e1a8232a2f28032cc5ba057b0be010f4fc807e3e6f824dfa84507eb50272106d5d80d0f45b7e7f810ef4bac6c6d7d2be910280cc00f45487af42c8b1de194678
+  metadata.gz: df4f1e508e7f5f4ec112f24f092099189bbd767d3c0397d0544479ad2eb6fc8d94522443e8ef9a3cf01b6916763361742ff0d398a3a545395f5624399d28c6bd
+  data.tar.gz: 4291820ab6b83d9ab2a23359b689da70ec681f0e494f3832dfeb7bcdffb5a2406ad81c2bda0f9e472bd9e63fabd914e386190551de4be68340e779c8c7a4a09c

data/async-http.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency("protocol-http", "~> 0.8.0")
 	spec.add_dependency("protocol-http1", "~> 0.8.0")
-	spec.add_dependency("protocol-http2", "~> 0.3.0")
+	spec.add_dependency("protocol-http2", "~> 0.4.0")
 	
 	# spec.add_dependency("openssl")
 	
 	spec.add_development_dependency "async-rspec", "~> 1.10"
-	spec.add_development_dependency "async-container", "~> 0.5.0"
+	spec.add_development_dependency "async-container", "~> 0.14"
 	
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "bundler"

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

@@ -42,7 +42,9 @@ module Async
 						super
 						
 						@streams.each do |id, stream|
-							stream.stop_connection(error)
+							if stream.respond_to?(:stop_connection)
+								stream.stop_connection(error)
+							end
 						end
 					end
 					
@@ -52,7 +54,10 @@ module Async
 						
 						@count += 1
 						
-						response = Response.new(self, next_stream_id)
+						stream_id = next_stream_id
+						response = Response.new(self, stream_id)
+						@streams[stream_id] = response.stream
+						
 						response.send_request(request)
 						response.wait
 						

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

@@ -80,6 +80,8 @@ module Async
 								while !self.closed?
 									self.read_frame
 								end
+							rescue EOFError, Async::Wrapper::Cancelled
+								# Stream closed.
 							ensure
 								stop_connection($!)
 							end
@@ -110,14 +112,6 @@ module Async
 					def version
 						VERSION
 					end
-					
-					def close
-						Async.logger.debug(self) {"Closing connection"}
-						
-						@reader.stop if @reader
-						
-						super
-					end
 				end
 			end
 		end

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

@@ -30,6 +30,8 @@ module Async
 						super(nil, nil, nil, nil, VERSION, ::Protocol::HTTP::Headers.new)
 						
 						@input = nil
+						@length = nil
+						
 						@connection = connection
 						@stream = Stream.new(self, connection, stream_id)
 					end
@@ -46,12 +48,14 @@ module Async
 					
 					def create_promise_stream(headers, stream_id)
 						request = self.class.new(@connection, stream_id)
+						@connection.streams[stream_id] = request.stream
+						
 						request.receive_headers(self, headers, false)
 						
 						return request.stream
 					end
 					
-					def close!(state)
+					def close
 					end
 					
 					# @return [Stream] the promised stream, on which to send data.
@@ -95,18 +99,26 @@ module Async
 								return @stream.send_failure(400, "Request protocol already specified") if @protocol
 								
 								@protocol = value
+							elsif key == CONTENT_LENGTH
+								return @stream.send_failure(400, "Request protocol already content length") if @length
+								
+								@length = Integer(value)
 							else
 								@headers[key] = value
 							end
 						end
 						
-						# We only construct the input/body if data is coming.
-						unless end_stream
-							@body = @input = Body::Writable.new
+						unless @scheme and @method and @path
+							send_reset_stream(PROTOCOL_ERROR)
+						else
+							# We only construct the input/body if data is coming.
+							unless end_stream
+								@body = @input = Body::Writable.new(@length)
+							end
+							
+							# We are ready for processing:
+							@connection.requests.enqueue self
 						end
-						
-						# We are ready for processing:
-						@connection.requests.enqueue self
 					end
 					
 					def receive_data(stream, data, end_stream)

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

@@ -40,19 +40,22 @@ module Async
 						@promises = nil
 					end
 					
+					attr :stream
+					
 					def promises
 						@promises ||= Async::Queue.new
 					end
 					
 					def create_promise_stream(headers, stream_id)
 						promise = Promise.new(@connection, headers, stream_id)
+						@connection.streams[stream_id] = promise.stream
 						
 						self.promises.enqueue(promise)
 						
 						return promise.stream
 					end
 					
-					def close!(state)
+					def close
 						self.promises.enqueue(nil)
 					end
 					

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

@@ -46,6 +46,8 @@ module Async
 					def create_stream(stream_id)
 						request = Request.new(self, stream_id)
 						
+						@streams[stream_id] = request.stream
+						
 						return request.stream
 					end
 					

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

@@ -43,10 +43,10 @@ module Async
 						@delegate.create_promise_stream(headers, stream_id)
 					end
 					
-					def close!(state = :closed)
+					def close(state = :closed)
 						super
 						
-						@delegate.close!(state)
+						@delegate.close
 					end
 					
 					def send_body(body, task: Async::Task.current)

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.43.1"
+		VERSION = "0.44.0"
 	end
 end

data/tasks/server.rake

@@ -47,7 +47,9 @@ task :server do
 		return Protocol::HTTP::Response[200, {'content-type' => 'text/plain'}, ["Hello World"]]
 	end
 	
-	container = Async::Container::Forked.new(concurrency: 1) do
+	container = Async::Container.new
+	
+	container.run(count: 1) do
 		#GC.disable
 		
 		server.run
@@ -86,7 +88,9 @@ task :wrk do
 
 	concurrency = 1
 	
-	container = Async::Container::Forked.new(concurrency: concurrency) do
+	container = Async::Container.new
+	
+	container.run(count: concurrency) do
 		server.run
 	end
 
@@ -96,5 +100,5 @@ task :wrk do
 		system("wrk", "-c", concurrency.to_s, "-d", "10", "-t", concurrency.to_s, url)
 	end
 
-	container.stop
+	container.stop(false)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.43.1
+  version: 0.44.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: covered
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A HTTP client and server library.