http-protocol 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88f948d7e13dd7114fc7f83b002035a6fa5229b15756fcad9edc92e9ac14ad9
-  data.tar.gz: ef513cdd8c0ad42a5ac9cc7e24f37ce2540abe8e4e041ca04322d61de656192c
+  metadata.gz: 1baf62bdb22b5778de7e8fceaf33f97a9ab003b27da9057b81408b1abe871503
+  data.tar.gz: 85219e156d6ed52c0120d15579782767796fe1cdd5bb6917f4bdd354702fc27d
 SHA512:
-  metadata.gz: '0694ce003550f943c96bcbe8a8b9dc5e1bc387f496bf7feb07bc5e7614f43f2bdd3745c6709327e3b073d466cdb33f1fa8cb73259c994c02d986d5afe9663ef3'
-  data.tar.gz: d21bb4ab8fdbeacecc4772d5108f7e5ae79878b7ea6b5fc51b15a89eff6f766e6910e7fc72472d2f3b1213f29fb6556f665045a1cfb5510248c6d6cf8eb23e3e
+  metadata.gz: 9ebfd44308c12dfaf2dbefd44b29b01810cae5ba781b5549b2130eca635a9c894ca47442a5edc70dc9b51ae5bd8e23c5500577337676dbc6488508fee170405c
+  data.tar.gz: c7b015854f7c07c2040214c11f530810c91846021276a8e989029493c7cb84b59626290c81d8e06877197d04621c7ad64a8dcb94844758dd722641d29604fd6d

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

@@ -43,6 +43,23 @@ module HTTP
 						raise ProtocolError, "Cannot send connection preface in state #{@state}"
 					end
 				end
+				
+				def receive_push_promise(frame)
+					if frame.stream_id == 0
+						raise ProtocolError, "Cannot receive headers for stream 0!"
+					end
+					
+					if stream = @streams[frame.stream_id]
+						# This is almost certainly invalid:
+						promised_stream, request_headers = stream.receive_push_promise(frame)
+						
+						if stream.closed?
+							@streams.delete(stream.id)
+						end
+						
+						return promised_stream, request_headers
+					end
+				end
 			end
 		end
 	end

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

@@ -41,6 +41,14 @@ module HTTP
 						raise ProtocolError, "Cannot send connection preface in state #{@state}"
 					end
 				end
+				
+				def enable_push?
+					@remote_settings.enable_push?
+				end
+				
+				def receive_push_promise
+					raise ProtocolError, "Server cannot receive push promises."
+				end
 			end
 		end
 	end

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

@@ -115,7 +115,7 @@ module HTTP
 				end
 				
 				def send_headers?
-					@state == :idle or @state == :reseved_local or @state == :open or @state == :half_closed_remote
+					@state == :idle or @state == :reserved_local or @state == :open or @state == :half_closed_remote
 				end
 				
 				def send_failure(status, reason)
@@ -127,6 +127,8 @@ module HTTP
 					else
 						send_reset_stream(PROTOCOL_ERROR)
 					end
+					
+					return nil
 				end
 				
 				private def write_headers(priority, headers, flags = 0)
@@ -150,7 +152,7 @@ module HTTP
 						else
 							@state = :open
 						end
-					elsif @state == :reseved_local
+					elsif @state == :reserved_local
 						frame = write_headers(*args)
 						
 						@state = :half_closed_remote
@@ -246,7 +248,7 @@ module HTTP
 						end
 						
 						@headers = process_headers(frame)
-					elsif @state == :reseved_remote
+					elsif @state == :reserved_remote
 						@state = :half_closed_local
 						
 						@headers = process_headers(frame)
@@ -307,6 +309,65 @@ module HTTP
 						raise ProtocolError, "Cannot reset stream in state: #{@state}"
 					end
 				end
+				
+				# A normal request is client request -> server response -> client.
+				# A push promise is server request -> client -> server response -> client.
+				# The server generates the same set of headers as if the client was sending a request, and sends these to the client. The client can reject the request by resetting the (new) stream. Otherwise, the server will start sending a response as if the client had send the request.
+				private def write_push_promise(stream_id, headers, flags = 0, **options)
+					data = @connection.encode_headers(headers)
+					
+					frame = PushPromiseFrame.new(@id, flags)
+					frame.pack(stream_id, data, maximum_size: @connection.maximum_frame_size)
+					
+					write_frame(frame)
+					
+					return frame
+				end
+				
+				def reserved_local!
+					if @state == :idle
+						@state = :reserved_local
+					else
+						raise ProtocolError, "Cannot reserve stream in state: #{@state}"
+					end
+				end
+				
+				def reserved_remote!
+					if @state == :idle
+						@state = :reserved_remote
+					else
+						raise ProtocolError, "Cannot reserve stream in state: #{@state}"
+					end
+				end
+				
+				def create_promise_stream(headers, stream_id)
+					@connection.create_stream(stream_id)
+				end
+				
+				# Server push is semantically equivalent to a server responding to a request; however, in this case, that request is also sent by the server, as a PUSH_PROMISE frame.
+				# @param headers [Hash] contains a complete set of request header fields that the server attributes to the request.
+				def send_push_promise(headers, stream_id = @connection.next_stream_id)
+					if @state == :open or @state == :half_closed_remote
+						promised_stream = self.create_promise_stream(headers, stream_id)
+						promised_stream.reserved_local!
+						
+						write_push_promise(promised_stream.id, headers)
+						
+						return promised_stream
+					else
+						raise ProtocolError, "Cannot send push promise in state: #{@state}"
+					end
+				end
+				
+				def receive_push_promise(frame)
+					promised_stream_id, data = frame.unpack
+					headers = @connection.decode_headers(data)
+					
+					stream = self.create_promise_stream(headers, promised_stream_id)
+					stream.reserved_remote!
+					
+					return stream, headers
+				end
 			end
 		end
 	end

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.14.0"
+		VERSION = "0.15.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.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: http-hpack
@@ -143,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Provides abstractions to handle HTTP1 and HTTP2 protocols.