http-protocol 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc3146b471e66a9c5aa3c96ca8542b8a0c62b9e5db3c5ab345f9631320496b66
-  data.tar.gz: c1aeb31222c732ed4f7e20cff448b8b6ae0cedc3f6d0fe534084d7d3505131df
+  metadata.gz: 8ba0f4a74cb833ca6a7c69171365f88c20bbec3259f772113584925184eaa94d
+  data.tar.gz: 26a7e84575e89fb6df648385919c78d83b97eebdc62964f2236760d9014bdcab
 SHA512:
-  metadata.gz: b322ec2b8596ea94eb543efe7b4ace32b32eb15111fbff9760b2fdfe3ef1967c1b766e7b8d87bdee968e46fc594cb4ae8df83fc3eb241d9a3f4a180860c11040
-  data.tar.gz: 3a770b0dc7a42d435cd93823483b6e4d27f80a7d3fb7bd254177f4ea7835d78f107fe4acea2b2959868d4b49cab060e241b813504dce668234d9250a1f6256f9
+  metadata.gz: d0e337d55ea940907d52cd94767b2a6a0016a19512b35cbdf8632e96f82ef510d06de7d63e2bafea741d6c37fd0f55966ffcdf3865b1829b107891533b237b4c
+  data.tar.gz: 7c9c8dd1cd2684a8036260cbd847d60e1540450467cc871460a6baa63a9f460906d0c3bf3f0e6494ba6e4db5c0e11273bd0b6fbb356eed4128ee3c9181214846

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

@@ -127,13 +127,18 @@ module HTTP
 				
 				def send_goaway(error_code = 0, message = "")
 					frame = GoawayFrame.new
-					frame.pack @last_stream_id, error_code, message
+					frame.pack @remote_stream_id, error_code, message
 					
 					write_frame(frame)
 					
 					@state = :closed
 				end
 				
+				def receive_goaway(frame)
+					@state = :closed
+					@framer.close
+				end
+				
 				def write_frame(frame)
 					# puts "#{self.class} #{@state} write_frame: #{frame.inspect}"
 					@framer.write_frame(frame)
@@ -260,11 +265,20 @@ module HTTP
 					end
 				end
 				
+				def deleted_stream? frame
+					frame.stream_id <= @local_stream_id or frame.stream_id <= @remote_stream_id
+				end
+				
 				def receive_priority(frame)
 					if stream = @streams[frame.stream_id]
 						stream.receive_priority(frame)
+					elsif deleted_stream? frame
+						# ignore
 					else
-						raise ProtocolError, "Bad stream"
+						stream = create_stream(frame.stream_id)
+						stream.receive_priority(frame)
+						
+						@streams[frame.stream_id] = stream
 					end
 				end
 				
@@ -273,6 +287,8 @@ module HTTP
 						stream.receive_reset_stream(frame)
 						
 						@streams.delete(stream.id)
+					elsif deleted_stream? frame
+						# ignore
 					else
 						raise ProtocolError, "Bad stream"
 					end
@@ -283,8 +299,8 @@ module HTTP
 						super
 					elsif stream = @streams[frame.stream_id]
 						stream.receive_window_update(frame)
-					elsif frame.stream_id <= @local_stream_id or frame.stream_id <= @remote_stream_id
-						# The stream was closed/deleted, ignore
+					elsif deleted_stream? frame
+						# ignore
 					else
 						raise ProtocolError, "Cannot update window of non-existant stream: #{frame.stream_id}"
 					end

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

@@ -60,6 +60,10 @@ module HTTP
 					@buffer = String.new.b
 				end
 				
+				def close
+					@io.close
+				end
+				
 				def write_connection_preface
 					@io.write(CONNECTION_PREFACE_MAGIC)
 				end
@@ -97,7 +101,12 @@ module HTTP
 				end
 				
 				def read_header
-					return Frame.parse_header(@io.read(9))
+					if buffer = @io.read(9)
+						return Frame.parse_header(buffer)
+					else
+						# TODO: Is this necessary? I thought the IO would throw this.
+						raise EOFError
+					end
 				end
 			end
 		end

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

@@ -45,12 +45,6 @@ module HTTP
 				
 				TYPE = 0x1
 				
-				def initialize(*)
-					super
-					
-					@priority = nil
-				end
-				
 				def priority?
 					flag_set?(PRIORITY)
 				end

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

@@ -122,7 +122,7 @@ module HTTP
 					if send_headers?
 						send_headers(nil, [
 							[':status', status.to_s],
-							[':reason', reason]
+							['reason', reason]
 						], END_STREAM)
 					else
 						send_reset_stream(PROTOCOL_ERROR)

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.1.1"
+		VERSION = "0.2.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2018-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack