http-protocol 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb12e7a8d32427098f6c15718572cf392c024930750fb04eba1fd29d14d01880
-  data.tar.gz: 4b49a2a43e85066a4fef4cdcc28e9b1e66ad09fa882653ef8e28544b251b0e09
+  metadata.gz: 192ee24ff847367b1c8f59d6108c6e32a725eddf64284a62e087034a9d4c1a43
+  data.tar.gz: bed20c2c1217b0279b9bec642df410a0a7e8ecab0cdbb2975a94a9f6e0dd33f3
 SHA512:
-  metadata.gz: 8c8834c64b4dffb5a85b35134cefe1a03c3b8f7fe179bc0e45b6ed12bc87ca22eddd9b34ea5f80e4454ed7374297b7495f51e0f47e61139e5d7b95340090b338
-  data.tar.gz: '0680483659424dd89bb13bb27fd8cd0200e5f621f5832198530262210b2f2a96adedde8fa22bec124bb74d0a687a67f2d0e09068f50fa3d93524a9ece6f92124'
+  metadata.gz: a8d2032762049eeb8fc18ed69bcdcc7b7c7de1ff4108df5a0473b4ee2033e67138f981b866c66f9912a921684073cbec65a3075ce97f95ef7417b8b75927afc9
+  data.tar.gz: 39cbcf536e6eb442533586457e87c4295c8d106a6e8fac09cf1b45e2e25bbae5c4fc17a6368ecd1a634cd735f2e2dd264d37c9923f799f014ab35c800c779fd2

data/lib/http/protocol/headers.rb

@@ -30,6 +30,7 @@ module HTTP
 		KEEP_ALIVE = 'keep-alive'.freeze
 		
 		HOST = 'host'.freeze
+		UPGRADE = 'upgrade'.freeze
 		
 		class Headers
 			class Split < Array

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

@@ -32,6 +32,7 @@ module HTTP
 					@stream = stream
 					
 					@persistent = persistent
+					@upgrade = nil
 					
 					@count = 0
 				end
@@ -41,9 +42,18 @@ module HTTP
 				# Whether the connection is persistent.
 				attr :persistent
 				
+				# Whether the connection has been upgraded, and to what.
+				attr :upgrade
+				
 				# The number of requests processed.
 				attr :count
 				
+				def upgrade?(headers)
+					if upgrade = headers[UPGRADE]
+						return upgrade.first
+					end
+				end
+				
 				def persistent?(version, headers)
 					if version == HTTP10
 						if connection = headers[CONNECTION]
@@ -60,18 +70,29 @@ module HTTP
 					end
 				end
 				
+				def upgrade!(protocol)
+					@upgrade = protocol
+					@persistent = false
+					
+					return @stream
+				end
+				
 				# Write the appropriate header for connection persistence.
-				def write_persistent_header(version)
-					if version == HTTP10
-						@stream.write("connection: keep-alive\r\n") if @persistent
+				def write_connection_header(version)
+					if @upgrade
+						@stream.write("connection: upgrade\r\nupgrade: #{@upgrade}\r\n")
 					else
-						@stream.write("connection: close\r\n") unless @persistent
+						if version == HTTP10
+							@stream.write("connection: keep-alive\r\n") if @persistent
+						else
+							@stream.write("connection: close\r\n") unless @persistent
+						end
 					end
 				end
 				
 				# Effectively close the connection and return the underlying IO.
 				# @return [IO] the underlying non-blocking IO.
-				def hijack
+				def hijack!
 					@persistent = false
 					
 					@stream.flush
@@ -89,14 +110,14 @@ module HTTP
 					@stream.write("host: #{authority}\r\n")
 					
 					write_headers(headers)
-					write_persistent_header(version)
+					write_connection_header(version)
 				end
 				
 				def write_response(version, status, headers, body = nil, head = false)
 					@stream.write("#{version} #{status}\r\n")
 					
 					write_headers(headers)
-					write_persistent_header(version)
+					write_connection_header(version)
 					write_body(body, version == HTTP11, head)
 				end
 				
@@ -113,13 +134,7 @@ module HTTP
 				end
 				
 				def read_line
-					# To support Ruby 2.3, we do the following which is pretty inefficient. Ruby 2.4+ can do the following:
-					# @stream.gets(CRLF, chomp: true) or raise EOFError
-					if line = @stream.gets(CRLF)
-						return line.chomp!(CRLF)
-					else
-						raise EOFError
-					end
+					@stream.gets(CRLF, chomp: true) or raise EOFError
 				end
 				
 				def read_request
@@ -127,6 +142,7 @@ module HTTP
 					headers = read_headers
 					
 					@persistent = persistent?(version, headers)
+					@upgrade = upgrade?(headers)
 					
 					body = read_request_body(headers)
 					
@@ -183,6 +199,19 @@ module HTTP
 					return chunk
 				end
 				
+				def write_upgrade_body
+					@stream.write("\r\n")
+					@stream.flush
+					
+					return @stream unless block_given?
+					
+					begin
+						yield @stream
+					rescue
+						@stream.close_write
+					end
+				end
+				
 				def write_empty_body(body)
 					@stream.write("content-length: 0\r\n\r\n")
 					@stream.flush
@@ -264,6 +293,8 @@ module HTTP
 				def write_body(body, chunked = true, head = false)
 					if body.nil? or body.empty?
 						write_empty_body(body)
+					# elsif body.respond_to?(:call)
+					# 	write_upgrade_body(&body)
 					elsif length = body.length
 						write_fixed_length_body(body, length, head)
 					elsif @persistent and chunked

data/lib/http/protocol/version.rb

@@ -20,6 +20,6 @@
 
 module HTTP
 	module Protocol
-		VERSION = "0.16.0"
+		VERSION = "0.17.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http-protocol
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-30 00:00:00.000000000 Z
+date: 2019-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-hpack
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Provides abstractions to handle HTTP1 and HTTP2 protocols.