protocol-rack 0.14.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3039968903e553afd725e0d5452f7d4b3975c9596b20ebbe2eeba354e83dba
-  data.tar.gz: 2b692f3676d057dc9c5b380bf13a5c1f79fc23df08f952b2a7b8d79786cb0713
+  metadata.gz: 6d1c1680392355d0bf9a1aa9b6b76f2267f9d1f612e4ae194fe5933a95fb4486
+  data.tar.gz: 8401fd53bbe49d9547f187f06a23ba334eae3814570f041b333c8c3c30aa317b
 SHA512:
-  metadata.gz: b839c48ff5275a8599c4cc98feb27501e4c84815d0945a9a78f239391cae24cbfb2eaf25142986deaccc6b95a184e6e4a9638d6634d210e02021388ddba3d172
-  data.tar.gz: f26a5aed151fcb2a253a36b9ffed7116665f8c16aac2d17523c6da3f5afc868331e038f2fd4c187e50fd21452cf2daacecbae376d4d80ce3832659f05b353fb6
+  metadata.gz: 7e3194c1c3ae772b58d15126fa918150b3e04791bfcf24a25ef6314d573392c3b8fdfca9efd7bab47a17ab1fd99d2b9a32323699014c900840024368fdfcabcd
+  data.tar.gz: ebbcaf7b1368633de01b261c1ad8c6f741f798b74d28070e33d4023887b306acb9a86df5b243f2b3bef737a148663c45a94bd981e6cf3d9757ce82048c4be830

data/lib/protocol/rack/adapter/generic.rb

@@ -114,12 +114,12 @@ module Protocol
 					
 					if request.respond_to?(:hijack?) and request.hijack?
 						env[RACK_IS_HIJACK] = true
-						env[RACK_HIJACK] = proc{request.hijack!.io.dup}
+						env[RACK_HIJACK] = proc{request.hijack!.io}
 					end
 					
 					# HTTP/2 prefers `:authority` over `host`, so we do this for backwards compatibility.
 					env[CGI::HTTP_HOST] ||= request.authority
-								
+					
 					if peer = request.peer
 						env[CGI::REMOTE_ADDR] = peer.ip_address
 					end
@@ -188,7 +188,7 @@ module Protocol
 						# This is the newer mechanism for protocol upgrade:
 						if env["rack.protocol"]
 							headers["rack.protocol"] = protocol
-						
+							
 						# Older mechanism for protocol upgrade:
 						elsif env[CGI::HTTP_UPGRADE]
 							headers["upgrade"] = protocol

data/lib/protocol/rack/adapter/rack2.rb

@@ -44,7 +44,7 @@ module Protocol
 						RACK_INPUT => Input.new(request.body),
 						RACK_ERRORS => $stderr,
 						RACK_LOGGER => self.logger,
-
+						
 						# The HTTP request method, such as "GET" or "POST". This cannot ever be an empty string, and so is always required.
 						CGI::REQUEST_METHOD => request.method,
 						
@@ -55,7 +55,7 @@ module Protocol
 						CGI::PATH_INFO => request_path,
 						CGI::REQUEST_PATH => request_path,
 						CGI::REQUEST_URI => request.path,
-
+						
 						# The portion of the request URL that follows the ?, if any. May be empty, but is always required!
 						CGI::QUERY_STRING => query_string || "",
 						
@@ -68,7 +68,7 @@ module Protocol
 						# I'm not sure what sane defaults should be here:
 						CGI::SERVER_NAME => server_name,
 					}
-
+					
 					# SERVER_PORT is optional but must not be set if it is not present.
 					if server_port
 						env[CGI::SERVER_PORT] = server_port

data/lib/protocol/rack/body/enumerable.rb

@@ -100,7 +100,7 @@ module Protocol
 				def stream?
 					!@body.respond_to?(:each)
 				end
-
+				
 				# Stream the response body to the given stream.
 				# The body is automatically closed after streaming.
 				# 
@@ -112,7 +112,7 @@ module Protocol
 				ensure
 					self.close(error)
 				end
-
+				
 				# Read the next chunk from the response body.
 				# Returns nil when there are no more chunks.
 				# 

data/lib/protocol/rack/input.rb

@@ -4,7 +4,7 @@
 # Copyright, 2022-2025, by Samuel Williams.
 # Copyright, 2023, by Genki Takiuchi.
 
-require "protocol/http/body/stream"
+require "io/stream/readable"
 
 module Protocol
 	module Rack
@@ -14,22 +14,21 @@ module Protocol
 		#
 		# This implementation is not always rewindable, to avoid buffering the input when handling large uploads. See {Rewindable} for more details.
 		class Input
+			include IO::Stream::Readable
+			
 			# Initialize the input wrapper.
 			# @parameter body [Protocol::HTTP::Body::Readable]
-			def initialize(body)
+			def initialize(body, ...)
 				@body = body
 				@closed = false
 				
-				# Will hold remaining data in `#read`.
-				@buffer = nil
+				super(...)
 			end
 			
 			# The input body.
 			# @attribute [Protocol::HTTP::Body::Readable]
 			attr :body
 			
-			include Protocol::HTTP::Body::Stream::Reader
-			
 			# Enumerate chunks of the request body.
 			# @yields {|chunk| ...}
 			# 	@parameter chunk [String]
@@ -65,7 +64,6 @@ module Protocol
 					# If the body is not rewindable, this will fail.
 					@body.rewind
 					
-					@buffer = nil
 					@finished = false
 					@closed = false
 					
@@ -87,7 +85,11 @@ module Protocol
 			
 			private
 			
-			def read_next
+			def flush
+				# No-op.
+			end
+			
+			def sysread(size, buffer = nil)
 				if @body
 					# User's may forget to call #close...
 					if chunk = @body.read
@@ -98,7 +100,15 @@ module Protocol
 							@closed = true
 						end
 						
-						return chunk
+						if buffer
+							# If a buffer is provided, we copy the chunk into it:
+							buffer.replace(chunk)
+						else
+							# Otherwise we return the chunk directly:
+							buffer = chunk
+						end
+						
+						return buffer
 					else
 						unless @closed
 							# So if we are at the end of the stream, we close it automatically:

data/lib/protocol/rack/request.rb

@@ -23,13 +23,13 @@ module Protocol
 			def self.[](env)
 				env["protocol.http.request"] ||= new(env)
 			end
-
+			
 			# Initialize a new Request instance from a Rack environment.
 			# 
 			# @parameter env [Hash] The Rack environment hash.
 			def initialize(env)
 				@env = env
-
+				
 				super(
 					@env["rack.url_scheme"],
 					@env["HTTP_HOST"],
@@ -41,7 +41,7 @@ module Protocol
 					self.class.protocol(@env)
 				)
 			end
-
+			
 			# Extract the protocol list from the Rack environment.
 			# Checks both `rack.protocol` and `HTTP_UPGRADE` headers.
 			# 
@@ -54,7 +54,7 @@ module Protocol
 					return protocols.split(/\s*,\s*/)
 				end
 			end
-
+			
 			# Extract HTTP headers from the Rack environment.
 			# Converts Rack's `HTTP_*` environment variables to proper HTTP headers.
 			# 
@@ -68,7 +68,7 @@ module Protocol
 						headers[key[5..-1].gsub("_", "-").downcase] = value
 					end
 				end
-
+				
 				return headers
 			end
 		end

data/lib/protocol/rack/response.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022-2024, by Samuel Williams.
+# Copyright, 2022-2025, by Samuel Williams.
 
 require_relative "body"
 require_relative "constants"
@@ -45,11 +45,11 @@ module Protocol
 				unless ignored.empty?
 					Console.warn(self, "Ignoring hop headers!", ignored: ignored)
 				end
-
+				
 				if hijack_body = meta["rack.hijack"]
 					body = hijack_body
 				end
-
+				
 				body = Body.wrap(env, status, headers, body, request&.body, request&.head?)
 				
 				protocol = meta[RACK_PROTOCOL]

data/lib/protocol/rack/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module Rack
-		VERSION = "0.14.0"
+		VERSION = "0.16.0"
 	end
 end

data/readme.md

@@ -67,6 +67,14 @@ run proc{|env|
 
 Please see the [project releases](https://socketry.github.io/protocol-rack/releases/index) for all releases.
 
+### v0.16.0
+
+  - Hijacked IO is no longer duped, as it's not retained by the original connection, and `SSLSocket` does not support duping.
+
+### v0.15.0
+
+  - Use `IO::Stream::Readable` for the input body, which is a better tested and more robust interface.
+
 ### v0.14.0
 
   - Handling of `HEAD` requests is now more robust.

data/releases.md

@@ -1,5 +1,13 @@
 # Releases
 
+## v0.16.0
+
+  - Hijacked IO is no longer duped, as it's not retained by the original connection, and `SSLSocket` does not support duping.
+
+## v0.15.0
+
+  - Use `IO::Stream::Readable` for the input body, which is a better tested and more robust interface.
+
 ## v0.14.0
 
   - Handling of `HEAD` requests is now more robust.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-rack
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -40,6 +40,20 @@ cert_chain:
   -----END CERTIFICATE-----
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: io-stream
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: protocol-http
   requirement: !ruby/object:Gem::Requirement