http-protocol 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9327c9adf284058c58e7e426b736ff72e3752fecd81197fe6b924a1c6df5c283
-  data.tar.gz: a34c59791a0aaa73fa92ac2414142ce3b0fc8fcb0eeaffc681b470dd81a239ee
+  metadata.gz: 06c19174884cf3035af9e9f8ae64625b8973238ee4c0e6ae8b55a5d1a5d7392c
+  data.tar.gz: 0b82b044493d1c712d920f08932062d731abc1b204ed79c557ece5aaf340e9a6
 SHA512:
-  metadata.gz: eaac214ab838e2e1a96a86ccd4756af6a7213b79157f738c43cbdaf2754e36b2dd08e04da675d49cd3f1d199db5bcfa9e468381e48ac8155508b920ef48e3e88
-  data.tar.gz: 8f1dc78539df7034795ba5d407213d3905f354878bf3758e4261b0ac7cbc61b88c6338c924ac4abd23462266e2d8e94e56b5fe26b6cb93d0dbbcd1fa97db6b03
+  metadata.gz: bddc90de39bfc55f4ee72d44701e248828342a7a171d80d874e1df5ea94944544030b4edbfb3f9017cdfbf6df0564fc0b219dabe6969bee9b02cdb1d221aa5d6
+  data.tar.gz: f1981cbbce0573ac3de49212193ab7cdabc32ec3e865396caac80a6c5cd6728fbcfae64418e1ea4b972e24b2f861c8011244c6d7a8d1f4e7628898a2e03b67f6

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

@@ -111,6 +111,7 @@ module HTTP
 				def read_frame
 					frame = @framer.read_frame(@local_settings.maximum_frame_size)
 					# puts "#{self.class} #{@state} read_frame: class=#{frame.class} flags=#{frame.flags} length=#{frame.length}"
+					# puts "Windows: local_window=#{@local_window.inspect}; remote_window=#{@remote_window.inspect}"
 					
 					yield frame if block_given?
 					
@@ -171,6 +172,7 @@ module HTTP
 				
 				def update_local_settings(changes)
 					capacity = @local_settings.initial_window_size
+					
 					@streams.each_value do |stream|
 						stream.local_window.capacity = capacity
 					end
@@ -178,6 +180,7 @@ module HTTP
 				
 				def update_remote_settings(changes)
 					capacity = @remote_settings.initial_window_size
+					
 					@streams.each_value do |stream|
 						stream.remote_window.capacity = capacity
 					end
@@ -210,9 +213,6 @@ module HTTP
 				end
 				
 				def open!
-					@local_window.capacity = self.local_settings.initial_window_size
-					@remote_window.capacity = self.remote_settings.initial_window_size
-					
 					@state = :open
 					
 					return self

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

@@ -66,12 +66,13 @@ module HTTP
 					
 					write_frame(frame)
 					
-					@local_window.used -= window_increment
+					@local_window.expand(window_increment)
 				end
 				
 				def receive_window_update(frame)
 					was_full = @remote_window.full?
 					
+					# puts "expand remote_window=#{@remote_window} by #{frame.unpack}"
 					@remote_window.expand(frame.unpack)
 					
 					self.window_updated if was_full

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

@@ -83,8 +83,8 @@ module HTTP
 					@state = :idle
 					
 					@priority = nil
-					@local_window = connection.local_window.dup
-					@remote_window = connection.remote_window.dup
+					@local_window = Window.new(connection.local_settings.initial_window_size)
+					@remote_window = Window.new(connection.remote_settings.initial_window_size)
 					
 					@headers = nil
 					@data = nil

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

@@ -22,7 +22,12 @@ module HTTP
 	module Protocol
 		module HTTP2
 			class Window
-				def initialize(capacity)
+				# @param capacity [Integer] The initial window size, typically from the settings.
+				def initialize(capacity = 0xFFFF)
+					# This is the main field required:
+					@available = capacity
+					
+					# These two fields are primarily used for efficiently sending window updates:
 					@used = 0
 					@capacity = capacity
 					
@@ -35,34 +40,40 @@ module HTTP
 				
 				# The window is completely full?
 				def full?
-					@used == @capacity
+					@available.zero?
 				end
 				
-				attr_accessor :used
-				attr_accessor :capacity
+				attr :used
+				attr :capacity
+				
+				# 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.
+				def capacity= value
+					difference = value - @capacity
+					@available += difference
+				end
 				
 				def consume(amount)
+					@available -= amount
 					@used += amount
 				end
 				
-				def available
-					@capacity - @used
-				end
+				attr :available
 				
 				def available?
-					available > 0
+					@available > 0
 				end
 				
 				def expand(amount)
+					@available += amount
 					@used -= amount
 				end
 				
 				def limited?
-					@used > (@capacity / 2)
+					@available < (@capacity / 2)
 				end
 				
 				def to_s
-					"\#<Window #{@used}/#{@capacity}>"
+					"\#<Window used=#{@used} available=#{@available} capacity=#{@capacity}>"
 				end
 			end
 			

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.6.0"
+		VERSION = "0.6.1"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack