protocol-http2 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c08e3a01dc017b795d02fbe0c0d40ba55afb475952309edb0e0a76146a9e6f3b
-  data.tar.gz: c493a5e2bcd50eae781baaa83a7a01224a09227490aeb5e1472a1f2c7f017181
+  metadata.gz: 28d53d86975d6aa52e2ea20e36c41fa4e8fff6437ef8b831de001b3d2849609b
+  data.tar.gz: 6c13193934a0eea767493757ff70e814d68f66fe68af4a774fb22d707e78437d
 SHA512:
-  metadata.gz: 32ddc91c1bcb1396305760e956291cbaa199af6cbd84026c102d0860c0fa852c232cceb1f9561758ea73fa2902ac525045411a9e2dd02297b35643f2349b5993
-  data.tar.gz: b00bf59cf1e91b5464960b0e6848e67a96653e48a9739985c9c03070c8d66c5d18067d5e9db38c904447ce696d57766493f656c22b35490363cf73d703867306
+  metadata.gz: 13bcd265d3eba3c322cdc6a473955a946a219f9d6f0015607a04248392fccadf70d456b42e1fdc455697678f95a87982e95ca7dda1774468f87dfdb16ed09d4e
+  data.tar.gz: 1f393c99f5657db925c6ea337ba5190cc722b8e8698d7d30751348b061719c60f905b551a2d60e1d90182a94dae1c2dcbc23eee9c2bf408b46bb0b08faa3799f

data/lib/protocol/http2/client.rb

@@ -1,22 +1,7 @@
-# Copyright, 2018, 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'connection'
 
@@ -68,10 +53,6 @@ module Protocol
 					# 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

data/lib/protocol/http2/connection.rb

@@ -1,22 +1,8 @@
-# Copyright, 2018, 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2023, by Marco Concetto Rudilosso.
 
 require_relative 'framer'
 require_relative 'dependency'
@@ -55,7 +41,7 @@ module Protocol
 				@decoder = HPACK::Context.new
 				@encoder = HPACK::Context.new
 				
-				@local_window = LocalWindow.new
+				@local_window = LocalWindow.new()
 				@remote_window = Window.new
 			end
 			
@@ -77,7 +63,7 @@ module Protocol
 			end
 			
 			def maximum_concurrent_streams
-				[@local_settings.maximum_concurrent_streams, @remote_settings.maximum_concurrent_streams].min
+				@local_settings.maximum_concurrent_streams
 			end
 			
 			attr :framer
@@ -301,9 +287,10 @@ module Protocol
 			
 			def receive_ping(frame)
 				if @state != :closed
-					if frame.stream_id != 0
-						raise ProtocolError, "Ping received for non-zero stream!"
-					end
+					# This is handled in `read_payload`:
+					# if frame.stream_id != 0
+					# 	raise ProtocolError, "Ping received for non-zero stream!"
+					# end
 					
 					unless frame.acknowledgement?
 						reply = frame.acknowledge
@@ -327,7 +314,7 @@ module Protocol
 				end
 			end
 			
-			def valid_remote_stream_id?
+			def valid_remote_stream_id?(stream_id)
 				false
 			end
 			
@@ -352,6 +339,10 @@ module Protocol
 			# On the client side, we create requests.
 			# @return [Stream] the created stream.
 			def create_stream(id = next_stream_id, &block)
+				if @streams.key?(id)
+					raise ProtocolError, "Cannot create stream with id #{id}, already exists!"
+				end
+				
 				if block_given?
 					return yield(self, id)
 				else
@@ -396,24 +387,6 @@ module Protocol
 				write_frame(frame)
 			end
 			
-			def idle_stream_id?(id)
-				if id.even?
-					# Server-initiated streams are even.
-					if @local_stream_id.even?
-						id >= @local_stream_id
-					else
-						id > @remote_stream_id
-					end
-				elsif id.odd?
-					# Client-initiated streams are odd.
-					if @local_stream_id.odd?
-						id >= @local_stream_id
-					else
-						id > @remote_stream_id
-					end
-				end
-			end
-			
 			# Sets the priority for an incoming stream.
 			def receive_priority(frame)
 				if dependency = @dependencies[frame.stream_id]
@@ -435,27 +408,34 @@ module Protocol
 				id.even?
 			end
 			
-			def closed_stream_id?(id)
-				if id.zero?
-					# The connection "stream id" can never be closed:
-					false
-				elsif id.even?
+			def idle_stream_id?(id)
+				if id.even?
 					# Server-initiated streams are even.
 					if @local_stream_id.even?
-						id < @local_stream_id
+						id >= @local_stream_id
 					else
-						id <= @remote_stream_id
+						id > @remote_stream_id
 					end
 				elsif id.odd?
 					# Client-initiated streams are odd.
 					if @local_stream_id.odd?
-						id < @local_stream_id
+						id >= @local_stream_id
 					else
-						id <= @remote_stream_id
+						id > @remote_stream_id
 					end
 				end
 			end
 			
+			# This is only valid if the stream doesn't exist in `@streams`.
+			def closed_stream_id?(id)
+				if id.zero?
+					# The connection "stream id" can never be closed:
+					false
+				else
+					!idle_stream_id?(id)
+				end
+			end
+			
 			def receive_reset_stream(frame)
 				if frame.connection?
 					raise ProtocolError, "Cannot reset connection!"

data/lib/protocol/http2/continuation_frame.rb

@@ -1,22 +1,7 @@
-# Copyright, 2018, 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'frame'
 
@@ -29,6 +14,10 @@ module Protocol
 				@continuation = nil
 			end
 			
+			def continued?
+				!!@continuation
+			end
+			
 			def end_headers?
 				flag_set?(END_HEADERS)
 			end
@@ -112,7 +101,7 @@ module Protocol
 			end
 			
 			def inspect
-				"\#<#{self.class} stream_id=#{@stream_id} flags=#{@flags} #{@length}b>"
+				"\#<#{self.class} stream_id=#{@stream_id} flags=#{@flags} length=#{@length || 0}b>"
 			end
 		end
 	end

data/lib/protocol/http2/data_frame.rb

@@ -1,23 +1,7 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2013, by Ilya Grigorik.
-# 
-# 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'frame'
 require_relative 'padded'
@@ -59,7 +43,7 @@ module Protocol
 			end
 			
 			def inspect
-				"\#<#{self.class} stream_id=#{@stream_id} flags=#{@flags} #{@length}b>"
+				"\#<#{self.class} stream_id=#{@stream_id} flags=#{@flags} #{@length || 0}b>"
 			end
 		end
 	end

data/lib/protocol/http2/dependency.rb

@@ -1,22 +1,7 @@
-# Copyright, 2018, 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2020-2023, by Samuel Williams.
 
 module Protocol
 	module HTTP2
@@ -185,7 +170,7 @@ module Protocol
 			end
 			
 			def total_weight
-				self.orderd_children
+				self.ordered_children
 				
 				return @total_weight
 			end
@@ -218,14 +203,14 @@ module Protocol
 				end
 			end
 			
-			def to_s
+			def inspect
 				"\#<#{self.class} id=#{@id} parent id=#{@parent&.id} weight=#{@weight} #{@children&.size || 0} children>"
 			end
 			
-			def print_hierarchy(buffer, indent: 0)
-				buffer.puts "#{" " * indent}#{self}"
+			def print_hierarchy(output = $stderr, indent: 0)
+				output.puts "#{"\t" * indent}#{self.inspect}"
 				@children&.each_value do |child|
-					child.print_hierarchy(buffer, indent: indent+1)
+					child.print_hierarchy(output, indent: indent+1)
 				end
 			end
 		end

data/lib/protocol/http2/error.rb

@@ -1,22 +1,7 @@
-# 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require 'protocol/http/error'
 
@@ -95,12 +80,6 @@ module Protocol
 			end
 		end
 		
-		class HeaderError < StreamClosed
-			def initialize(message)
-				super(message)
-			end
-		end
-		
 		class GoawayError < ProtocolError
 		end
 		
@@ -111,6 +90,12 @@ module Protocol
 			end
 		end
 		
+		class HeaderError < StreamClosed
+			def initialize(message)
+				super(message)
+			end
+		end
+		
 		# Raised on invalid flow control frame or command.
 		class FlowControlError < ProtocolError
 			def initialize(message)

data/lib/protocol/http2/flow_controlled.rb

@@ -1,22 +1,8 @@
-# Copyright, 2018, 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019, by Yuta Iwama.
 
 require_relative 'window_update_frame'
 

data/lib/protocol/http2/frame.rb

@@ -1,23 +1,8 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2013, by Ilya Grigorik.
-# 
-# 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
+# Copyright, 2019, by Yuta Iwama.
 
 require_relative 'error'
 
@@ -46,12 +31,15 @@ module Protocol
 			LENGTH_HISHIFT = 16
 			LENGTH_LOMASK  = 0xFFFF
 			
+			# The base class does not have any specific type index:
+			TYPE = nil
+			
 			# @param length [Integer] the length of the payload, or nil if the header has not been read yet.
 			def initialize(stream_id = 0, flags = 0, type = self.class::TYPE, length = nil, payload = nil)
-				@length = length
-				@type = type
-				@flags = flags
 				@stream_id = stream_id
+				@flags = flags
+				@type = type
+				@length = length
 				@payload = payload
 			end
 			
@@ -94,7 +82,7 @@ module Protocol
 				@length = payload.bytesize
 				
 				if maximum_size and @length > maximum_size
-					raise ProtocolError, "Frame length #{@length} bigger than maximum allowed: #{maximum_size}"
+					raise ProtocolError, "Frame length bigger than maximum allowed: #{@length} > #{maximum_size}"
 				end
 			end
 			
@@ -127,7 +115,7 @@ module Protocol
 			# @return [String]
 			def header
 				unless VALID_LENGTH.include? @length
-					raise ProtocolError, "Invalid frame size: #{@length.inspect}"
+					raise ProtocolError, "Invalid frame length: #{@length.inspect}"
 				end
 				
 				unless VALID_STREAM_ID.include? @stream_id
@@ -193,8 +181,15 @@ module Protocol
 			end
 			
 			def write(stream)
-				if @payload and @length != @payload.bytesize
-					raise ProtocolError, "Invalid payload size: #{@length} != #{@payload.bytesize}"
+				# Validate the payload size:
+				if @payload.nil?
+					if @length != 0
+						raise ProtocolError, "Invalid frame length: #{@length} != 0"
+					end
+				else
+					if @length != @payload.bytesize
+						raise ProtocolError, "Invalid payload size: #{@length} != #{@payload.bytesize}"
+					end
 				end
 				
 				self.write_header(stream)
@@ -206,7 +201,7 @@ module Protocol
 			end
 			
 			def inspect
-				"\#<#{self.class} stream_id=#{@stream_id} flags=#{@flags} #{self.unpack}>"
+				"\#<#{self.class} stream_id=#{@stream_id} flags=#{@flags} payload=#{self.unpack}>"
 			end
 		end
 	end

data/lib/protocol/http2/framer.rb

@@ -1,23 +1,7 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2013, by Ilya Grigorik.
-# 
-# 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'error'
 
@@ -49,7 +33,7 @@ module Protocol
 		].freeze
 		
 		# Default connection "fast-fail" preamble string as defined by the spec.
-		CONNECTION_PREFACE_MAGIC = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n".freeze
+		CONNECTION_PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n".freeze
 		
 		class Framer
 			def initialize(stream, frames = FRAMES)
@@ -66,13 +50,13 @@ module Protocol
 			end
 			
 			def write_connection_preface
-				@stream.write(CONNECTION_PREFACE_MAGIC)
+				@stream.write(CONNECTION_PREFACE)
 			end
 			
 			def read_connection_preface
-				string = @stream.read(CONNECTION_PREFACE_MAGIC.bytesize)
+				string = @stream.read(CONNECTION_PREFACE.bytesize)
 				
-				unless string == CONNECTION_PREFACE_MAGIC
+				unless string == CONNECTION_PREFACE
 					raise HandshakeError, "Invalid connection preface: #{string.inspect}"
 				end
 				

data/lib/protocol/http2/goaway_frame.rb

@@ -1,22 +1,7 @@
-# Copyright, 2018, 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'frame'
 

data/lib/protocol/http2/headers_frame.rb

@@ -1,22 +1,7 @@
-# Copyright, 2018, 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'frame'
 require_relative 'padded'
@@ -83,7 +68,7 @@ module Protocol
 			end
 			
 			def inspect
-				"\#<#{self.class} stream_id=#{@stream_id} flags=#{@flags} #{@length}b>"
+				"\#<#{self.class} stream_id=#{@stream_id} flags=#{@flags} #{@length || 0}b>"
 			end
 		end
 	end

data/lib/protocol/http2/padded.rb

@@ -1,23 +1,7 @@
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2013, by Ilya Grigorik.
-# 
-# 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.
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2019-2023, by Samuel Williams.
 
 require_relative 'frame'
 
@@ -63,7 +47,7 @@ module Protocol
 			def unpack
 				if padded?
 					padding_size = @payload[0].ord
-					data_size = (@payload.bytesize - 1) - padding_size
+					data_size = @payload.bytesize - padding_size
 					
 					if data_size < 0
 						raise ProtocolError, "Invalid padding length: #{padding_size}"