protocol-http2 0.7.2 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6122b81524b5ecd390cf46cb06d3dbbc8299651e3b83170477b0bfd710352cf
-  data.tar.gz: 73756e9adea21ed0bddd7d3c8b49032e8e0c0014d3905c093663c9d2b2474601
+  metadata.gz: 3b97c3d3611a531fe2facdfe1d21540e45c9857cb83d1d4f5eca735c12efbabe
+  data.tar.gz: 07bfed2bc270bea6fcc2e62caf5cf46cb2e511acbcb563603651223de3d41869
 SHA512:
-  metadata.gz: c12e3e9a9ef1d1461a3c08d6cb1c52c9f38551e7f37da0ef6c70d998c808a6b6bd48138a4509e108279255d5218c6eb72c6524b9e5b48066d9431a6190468a77
-  data.tar.gz: 9f909f2f0b3fbb3914f22b9c01d8ede5a78bb5734be429d152b0b28574447e5886240170126b83c47426f38f14eea5ffb8c4839e51bb1a553bdf0dcd088bd1b8
+  metadata.gz: f9a90343af8732527276180fcb417b1493476bd20459b1c849cba6d9935fae8f8eb07bef20ee9750b3da8f8763586ac719815793c07ad4cc6079f73b0b1b91eb
+  data.tar.gz: f5d27cb750a6e14c02fdeede7308bf0ed180c1fe92b2e6cf982525267591b70632123f22459d014f394efc987cef3af0e47be629f4ac3550f1518c377c9f8dbe

data/lib/protocol/http2/connection.rb

@@ -110,9 +110,7 @@ module Protocol
 			end
 			
 			def encode_headers(headers, buffer = String.new.b)
-				HPACK::Compressor.new(buffer, @encoder).encode(headers)
-				
-				return buffer
+				HPACK::Compressor.new(buffer, @encoder, table_size_limit: @remote_settings.header_table_size).encode(headers)
 			end
 			
 			def decode_headers(data)
@@ -142,7 +140,7 @@ module Protocol
 			def exclusive_child(stream)
 				stream.children = @children
 				
-				@children.each do |child|
+				@children.each_value do |child|
 					child.dependent_id = stream.id
 				end
 				
@@ -231,25 +229,12 @@ module Protocol
 				@framer.write_frame(frame)
 			end
 			
-			def send_ping(data)
-				if @state != :closed
-					frame = PingFrame.new
-					frame.pack data
-					
-					write_frame(frame)
-				else
-					raise ProtocolError, "Cannot send ping in state #{@state}"
-				end
-			end
-			
 			def update_local_settings(changes)
 				capacity = @local_settings.initial_window_size
 				
 				@streams.each_value do |stream|
 					stream.local_window.capacity = capacity
 				end
-				
-				@decoder.table_size = @local_settings.header_table_size
 			end
 			
 			def update_remote_settings(changes)
@@ -258,8 +243,6 @@ module Protocol
 				@streams.each_value do |stream|
 					stream.remote_window.capacity = capacity
 				end
-				
-				@encoder.table_size = @remote_settings.header_table_size
 			end
 			
 			# In addition to changing the flow-control window for streams that are not yet active, a SETTINGS frame can alter the initial flow-control window size for streams with active flow-control windows (that is, streams in the "open" or "half-closed (remote)" state).  When the value of SETTINGS_INITIAL_WINDOW_SIZE changes, a receiver MUST adjust the size of all stream flow-control windows that it maintains by the difference between the new value and the old value.
@@ -305,6 +288,17 @@ module Protocol
 				end
 			end
 			
+			def send_ping(data)
+				if @state != :closed
+					frame = PingFrame.new
+					frame.pack data
+					
+					write_frame(frame)
+				else
+					raise ProtocolError, "Cannot send ping in state #{@state}"
+				end
+			end
+			
 			def receive_ping(frame)
 				if @state != :closed
 					if frame.stream_id != 0
@@ -393,7 +387,14 @@ module Protocol
 				end
 			end
 			
-			# On the client and server side, sets the priority for an incoming stream.
+			def send_priority(stream_id, priority)
+				frame = PriorityFrame.new(stream_id)
+				frame.pack(priority)
+				
+				write_frame(frame)
+			end
+			
+			# Sets the priority for an incoming stream.
 			def receive_priority(frame)
 				if stream = @streams[frame.stream_id]
 					stream.receive_priority(frame)

data/lib/protocol/http2/framer.rb

@@ -52,8 +52,6 @@ module Protocol
 		CONNECTION_PREFACE_MAGIC = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n".freeze
 		
 		class Framer
-			# DEBUG = !!ENV['FRAMER_DEBUG']
-			
 			def initialize(stream, frames = FRAMES)
 				@stream = stream
 				@frames = frames
@@ -86,7 +84,8 @@ module Protocol
 			def read_frame(maximum_frame_size = MAXIMUM_ALLOWED_FRAME_SIZE)
 				# Read the header:
 				length, type, flags, stream_id = read_header
-				# puts "read_frame: length=#{length} type=#{type} flags=#{flags} stream_id=#{stream_id} -> klass=#{@frames[type].inspect}"
+				
+				# Async.logger.debug(self) {"read_frame: length=#{length} type=#{type} flags=#{flags} stream_id=#{stream_id} -> klass=#{@frames[type].inspect}"}
 				
 				# Allocate the frame:
 				klass = @frames[type] || Frame
@@ -95,13 +94,14 @@ module Protocol
 				# Read the payload:
 				frame.read(@stream, maximum_frame_size)
 				
-				# DEBUG and puts "read_frame: #{frame.inspect}"
+				# Async.logger.debug(self, name: "read") {frame.inspect}
 				
 				return frame
 			end
 			
 			def write_frame(frame)
-				# DEBUG and puts "write_frame: #{frame.inspect}"
+				# Async.logger.debug(self, name: "write") {frame.inspect}
+				
 				frame.write(@stream)
 				
 				@stream.flush

data/lib/protocol/http2/priority_frame.rb

@@ -27,7 +27,7 @@ module Protocol
 		# Stream Dependency:  A 31-bit stream identifier for the stream that
 		# this stream depends on (see Section 5.3).  This field is only
 		# present if the PRIORITY flag is set.
-		Priority = Struct.new(:exclusive, :stream_dependency, :weight) do
+		class Priority < Struct.new(:exclusive, :stream_dependency, :weight)
 			FORMAT = "NC".freeze
 			EXCLUSIVE = 1 << 31
 			
@@ -46,6 +46,8 @@ module Protocol
 			def pack
 				if exclusive
 					stream_dependency = self.stream_dependency | EXCLUSIVE
+				else
+					stream_dependency = self.stream_dependency
 				end
 				
 				return [stream_dependency, self.weight - 1].pack(FORMAT)

data/lib/protocol/http2/stream.rb

@@ -161,7 +161,7 @@ module Protocol
 			def exclusive_child(stream)
 				stream.children = @children
 				
-				@children.each do |child|
+				@children.each_value do |child|
 					child.dependent_id = stream.id
 				end
 				
@@ -182,13 +182,15 @@ module Protocol
 				stream.add_child(self)
 			end
 			
-			def priority= priority
+			def update_priority priority
 				dependent_id = priority.stream_dependency
 				
 				if dependent_id == @id
 					raise ProtocolError, "Stream priority for stream id #{@id} cannot depend on itself!"
 				end
 				
+				@weight = priority.weight
+				
 				if priority.exclusive
 					self.parent&.remove_child(self)
 					
@@ -333,7 +335,7 @@ module Protocol
 				priority, data = frame.unpack
 				
 				if priority
-					self.priority = priority
+					self.update_priority(priority)
 				end
 				
 				@connection.decode_headers(data)
@@ -397,8 +399,23 @@ module Protocol
 				end
 			end
 			
+			# Change the priority of the stream both locally and remotely.
+			def priority= priority
+				send_priority(priority)
+				update_priority(priority)
+			end
+			
+			# The current local priority of the stream.
+			def priority(exclusive = false)
+				Priority.new(exclusive, @dependent_id, @weight)
+			end
+			
+			def send_priority(priority)
+				@connection.send_priority(@id, priority)
+			end
+			
 			def receive_priority(frame)
-				self.priority = frame.unpack
+				self.update_priority(frame.unpack)
 			end
 			
 			def receive_reset_stream(frame)

data/lib/protocol/http2/version.rb

@@ -20,6 +20,6 @@
 
 module Protocol
 	module HTTP2
-		VERSION = "0.7.2"
+		VERSION = "0.7.4"
 	end
 end

data/protocol-http2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 	
-	spec.add_dependency "protocol-hpack", "~> 1.3"
+	spec.add_dependency "protocol-hpack", "~> 1.4"
 	spec.add_dependency "protocol-http", "~> 0.2"
 	
 	spec.add_development_dependency "covered"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protocol-http2
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.4
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protocol-hpack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: protocol-http
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,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 low level implementation of the HTTP/2 protocol.