async-http 0.46.2 → 0.46.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcfa84f957c4231842d3558f00cdf5cf75792d19950260d5868422e758f6b684
-  data.tar.gz: a412a95c99838202bfd1f6c941697716da093d24d2859177868950ae8a331482
+  metadata.gz: 1ba8a8a466d5347cf27a55b523dfa0b8faec5dbd88f0ddbd977c053333762bb9
+  data.tar.gz: 2675f68f80ee0ec638d5922de49710291208eb610f202b37595b5cc64a382465
 SHA512:
-  metadata.gz: 94bfd0b556a3e217b9c296c23fa07bf02e3cc60ea6e60f9006806be7b7b82fcf6ba2cc82ed4b1adbd5e14b0a35ddd32e0ce80253df58e340c8fada96af78d791
-  data.tar.gz: b19981853471653da1ea94bdb95e022770fdc829bc1172cae9d2409ae6cbae442b58dfd2f5347d27d91107e09a26936272fddbd03de6d3624d7458c460249868
+  metadata.gz: 627f99a4575491bf2141851f4873735ae4a4df76f50c54500e790df5a8f0b939b4e43c78088d148b43d2ea63be26f9941f6bdbe3be37175d0452ffdb4dcd40a4
+  data.tar.gz: 0be194518b6c9470037f0a1443fbd93669da82afb99392cd7e016c277f5c91f8cbecd3a24502b54f3d5f6b14a4bb13e1c16297a3087959e965d5b3621befcbed

data/async-http.gemspec

@@ -21,7 +21,7 @@ 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.8.0")
+	spec.add_dependency("protocol-http2", "~> 0.9.0")
 	
 	# spec.add_dependency("openssl")
 	

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

@@ -34,14 +34,14 @@ module Async
 				CLIENT_SETTINGS = {
 					::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
 					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
-					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
+					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0xF00000,
 				}
 				
 				SERVER_SETTINGS = {
 					# We choose a lower maximum concurrent streams to avoid overloading a single connection/thread.
-					::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 10,
+					::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 128,
 					::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
-					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0x7FFFFFFF,
+					::Protocol::HTTP2::Settings::INITIAL_WINDOW_SIZE => 0xF00000,
 					::Protocol::HTTP2::Settings::ENABLE_CONNECT_PROTOCOL => 1,
 				}
 				

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

@@ -123,26 +123,6 @@ module Async
 					def version
 						VERSION
 					end
-					
-					# def encode_headers(headers, buffer = String.new.b)
-					# 	super.tap do |data|
-					# 		Async.logger.debug(self) do |buffer|
-					# 			buffer.puts "Encode headers: #{headers.inspect}"
-					# 			buffer.puts "-> #{data.inspect}"
-					# 			buffer.puts "@encoder: #{@encoder.inspect}"
-					# 		end
-					# 	end
-					# end
-					# 
-					# def decode_headers(data)
-					# 	super.tap do |headers|
-					# 		Async.logger.debug(self) do |buffer|
-					# 			buffer.puts "Decode headers: #{data.inspect}"
-					# 			buffer.puts "-> #{headers.inspect}"
-					# 			buffer.puts "@decoder: #{@decoder.inspect}"
-					# 		end
-					# 	end
-					# end
 				end
 			end
 		end

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

@@ -94,8 +94,7 @@ module Async
 							else
 								# We only construct the input/body if data is coming.
 								unless end_stream
-									@input = Body::Writable.new(@length)
-									@request.body = @input
+									@request.body = prepare_input(@length)
 								end
 								
 								# We are ready for processing:

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

@@ -70,8 +70,7 @@ module Async
 							else
 								# We only construct the input/body if data is coming.
 								unless end_stream
-									@input = Body::Writable.new(@length)
-									@response.body = @input
+									@response.body = prepare_input(@length)
 								end
 							end
 							

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

@@ -19,13 +19,31 @@
 # THE SOFTWARE.
 
 require 'protocol/http2/stream'
+require_relative '../../body/writable'
 
 module Async
 	module HTTP
 		module Protocol
 			module HTTP2
 				class Stream < ::Protocol::HTTP2::Stream
-					class Buffer
+					class Input < Body::Writable
+						def initialize(stream, length)
+							super(length)
+							
+							@stream = stream
+						end
+						
+						def read
+							if chunk = super
+								# If we read a chunk fron the stream, we want to extend the window if required so more data will be provided.
+								@stream.request_window_update
+							end
+							
+							return chunk
+						end
+					end
+					
+					class Output
 						def initialize(stream, body, task: Task.current)
 							@stream = stream
 							
@@ -37,6 +55,7 @@ module Async
 							@task = task.async(&self.method(:passthrough))
 						end
 						
+						# Reads chunks from the given body and writes them to the stream as fast as possible.
 						def passthrough(task)
 							while chunk = self.read
 								maximum_size = @stream.available_frame_size
@@ -113,11 +132,11 @@ module Async
 						@headers = nil
 						@trailers = nil
 						
-						# Input buffer (receive_data):
+						# Input buffer, reading request body, or response body (receive_data):
 						@length = nil
 						@input = nil
 						
-						# Output buffer (window_updated):
+						# Output buffer, writing request body or response body (window_updated):
 						@output = nil
 					end
 					
@@ -165,6 +184,21 @@ module Async
 						send_reset_stream(error.code)
 					end
 					
+					def prepare_input(length)
+						if @input.nil?
+							@input = Input.new(self, length)
+						else
+							raise ArgumentError, "Input body already prepared!"
+						end
+					end
+					
+					def update_local_window(frame)
+						consume_local_window(frame)
+						
+						# This is done on demand.
+						# request_window_update
+					end
+					
 					def process_data(frame)
 						data = frame.unpack
 						
@@ -188,7 +222,7 @@ module Async
 					
 					# Set the body and begin sending it.
 					def send_body(body)
-						@output = Buffer.new(self, body)
+						@output = Output.new(self, body)
 					end
 					
 					def window_updated(size)

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.46.2"
+		VERSION = "0.46.3"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.46.2
+  version: 0.46.3
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-23 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement