async-http 0.37.14 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e41394903c83a4373a71c00c425e43de172f4200f4f333bb9495239e333ff10
-  data.tar.gz: d5f4bd64ccdb86f5aa63645460da3dc0b28113da37bb07a80dfcea9066a5b00f
+  metadata.gz: 89e83fd398432897302be1ddbb07fad391a285216320e282e218c2faf07f4183
+  data.tar.gz: c9f37f4776390db5b0d050845397d7b530b145b6072f062b453957944683d7d6
 SHA512:
-  metadata.gz: 91a24f4cd7fe39fd844e19b78052d5d813c1af5637da31f36e599e61316d7e120347e3ef18415ab243afe3667affa438671d1d3e43667ba2c8e0ad11233321b0
-  data.tar.gz: 76162e9805315cc4bab01fed4ae9cc465b352134d052cffdbe037b69177cfa0fd20f4094f5d83952b6c7b41b65c8cf022e4c715404f6f96a7c02e03fb39153b1
+  metadata.gz: 53f726aec29bd9130015446d9e05b5b11be437c85978f9cb6d22647ebd17dd033182e647dda82c31bfb42e14cf01b9c1b8bae904e781370564f33df390470916
+  data.tar.gz: c698697b2d53e17a2321d430b01cd5746ef4eaf5623cb59b8a08200f86c4d3357037d85444c4141b23198bf4eba1aedd4915c8e79646717a761c02e8dd7d79b9

data/async-http.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 	spec.add_dependency("async", "~> 1.14")
 	spec.add_dependency("async-io", "~> 1.18")
 	
-	spec.add_dependency("http-protocol", "~> 0.12")
+	spec.add_dependency("http-protocol", "~> 0.15")
 	
 	# spec.add_dependency("openssl")
 	

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

@@ -33,7 +33,7 @@ module Async
 				}
 				
 				SERVER_SETTINGS = {
-					::HTTP::Protocol::HTTP2::Settings::ENABLE_PUSH => 0,
+					::HTTP::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
 					# We choose a lower maximum concurrent streams to avoid overloading a single connection/thread.
 					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_CONCURRENT_STREAMS => 32,
 					::HTTP::Protocol::HTTP2::Settings::MAXIMUM_FRAME_SIZE => 0x100000,
@@ -57,6 +57,20 @@ module Async
 					
 					return server
 				end
+				
+				module WithPush
+					CLIENT_SETTINGS = HTTP2::CLIENT_SETTINGS.merge(
+						::HTTP::Protocol::HTTP2::Settings::ENABLE_PUSH => 1,
+					)
+					
+					def self.client(stream, settings = CLIENT_SETTINGS)
+						HTTP2.client(stream, settings)
+					end
+					
+					def self.server(stream, settings = SERVER_SETTINGS)
+						HTTP2.server(stream, settings)
+					end
+				end
 			end
 		end
 	end

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

@@ -68,6 +68,8 @@ module Async
 						end
 					end
 					
+					attr :promises
+					
 					def peer
 						@stream.io
 					end

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

@@ -0,0 +1,71 @@
+# 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 '../response'
+
+module Async
+	module HTTP
+		module Protocol
+			module HTTP2
+				class Promise < Response
+					def initialize(protocol, headers, stream_id)
+						super(protocol, stream_id)
+						
+						@request = build_request(headers)
+					end
+					
+					attr :stream
+					attr :request
+					
+					private def build_request(headers)
+						request = HTTP::Request.new
+						request.headers = Headers.new
+						
+						headers.each do |key, value|
+							if key == SCHEME
+								return @stream.send_failure(400, "Request scheme already specified") if request.scheme
+								
+								request.scheme = value
+							elsif key == AUTHORITY
+								return @stream.send_failure(400, "Request authority already specified") if request.authority
+								
+								request.authority = value
+							elsif key == METHOD
+								return @stream.send_failure(400, "Request method already specified") if request.method
+								
+								request.method = value
+							elsif key == PATH
+								return @stream.send_failure(400, "Request path already specified") if request.path
+								
+								request.path = value
+							else
+								request.headers[key] = value
+							end
+						end
+						
+						return request
+					end
+					
+					undef send_request
+				end
+			end
+		end
+	end
+end

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

@@ -40,6 +40,36 @@ module Async
 						false
 					end
 					
+					def push?
+						@protocol.enable_push?
+					end
+					
+					def create_promise_stream(headers, stream_id)
+						request = self.class.new(@protocol, stream_id)
+						request.receive_headers(self, headers, false)
+						
+						return request.stream
+					end
+					
+					# @return [Stream] the promised stream, on which to send data.
+					def push(path, headers = nil)
+						push_headers = [
+							[SCHEME, @scheme],
+							[METHOD, GET],
+							[PATH, path],
+							[AUTHORITY, @authority]
+						]
+						
+						if headers
+							push_headers = Headers::Merged.new(
+								push_headers,
+								headers
+							)
+						end
+						
+						@stream.send_push_promise(push_headers)
+					end
+					
 					def receive_headers(stream, headers, end_stream)
 						headers.each do |key, value|
 							if key == SCHEME

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

@@ -36,6 +36,20 @@ module Async
 						
 						@notification = Async::Notification.new
 						@exception = nil
+						
+						@promises = nil
+					end
+					
+					def promises
+						@promises ||= Async::Queue.new
+					end
+					
+					def create_promise_stream(headers, stream_id)
+						promise = Promise.new(@protocol, headers, stream_id)
+						
+						self.promises.enqueue(promise)
+						
+						return promise.stream
 					end
 					
 					# Notify anyone waiting on the response headers to be received (or failure).
@@ -44,6 +58,10 @@ module Async
 							@notification.signal
 							@notification = nil
 						end
+						
+						# if @input
+						# 	@input.close(@exception)
+						# end
 					end
 					
 					# Wait for the headers to be received or for stream reset.

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

@@ -20,6 +20,7 @@
 
 require_relative 'connection'
 require_relative 'request'
+require_relative 'promise'
 
 require 'http/protocol/http2/server'
 

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

@@ -39,6 +39,10 @@ module Async
 					attr_accessor :delegate
 					attr :body
 					
+					def create_promise_stream(headers, stream_id)
+						@delegate.create_promise_stream(headers, stream_id)
+					end
+					
 					def send_body(body, task: Async::Task.current)
 						# TODO Might need to stop this task when body is cancelled.
 						@task = task.async do |subtask|
@@ -100,7 +104,7 @@ module Async
 					def receive_headers(frame)
 						headers = super
 						
-						delegate.receive_headers(self, headers, frame.end_stream?)
+						@delegate.receive_headers(self, headers, frame.end_stream?)
 						
 						return headers
 					end
@@ -109,7 +113,7 @@ module Async
 						data = super
 						
 						if data
-							delegate.receive_data(self, data, frame.end_stream?)
+							@delegate.receive_data(self, data, frame.end_stream?)
 						end
 						
 						return data
@@ -123,7 +127,7 @@ module Async
 							@body = nil
 						end
 						
-						delegate.receive_reset_stream(self, error_code)
+						@delegate.receive_reset_stream(self, error_code)
 						
 						return error_code
 					end
@@ -134,7 +138,7 @@ module Async
 							@body = nil
 						end
 						
-						delegate.stop_connection(error)
+						@delegate.stop_connection(error)
 					end
 				end
 			end

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

@@ -38,6 +38,10 @@ module Async
 					false
 				end
 				
+				def push?
+					false
+				end
+				
 				def peer
 					if @protocol
 						@protocol.peer

data/lib/async/http/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module HTTP
-		VERSION = "0.37.14"
+		VERSION = "0.38.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-http
 version: !ruby/object:Gem::Version
-  version: 0.37.14
+  version: 0.38.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -183,6 +183,7 @@ files:
 - lib/async/http/protocol/http2.rb
 - lib/async/http/protocol/http2/client.rb
 - lib/async/http/protocol/http2/connection.rb
+- lib/async/http/protocol/http2/promise.rb
 - lib/async/http/protocol/http2/request.rb
 - lib/async/http/protocol/http2/response.rb
 - lib/async/http/protocol/http2/server.rb