protocol-htty 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a3aa4c350c134deb40265ae418e15fbd1158b70a8cf4c21e1748de514ca867
-  data.tar.gz: 506e9101a8df67e75aed817e3227919e06dc00ee5aa8d58d62c6d7139ae8d1ea
+  metadata.gz: 957aa78a655ceb3136db0acd1614010a25d1cda14b6e0861e6ebfb371870b739
+  data.tar.gz: d70de3f0375aef142f90beca94c2bd50f9986bbc6bfaf2920ea64dae13185467
 SHA512:
-  metadata.gz: 82d2c3b0fbbd56482711a10da4dad9e0e86177168d1cbc198d126e1d0c347e27dd3123e5d3982f9884e7bc2ee8b8f1be429164f06f16d5c3dde65ff5424750e3
-  data.tar.gz: cb61305b1df49d733cc5b4e0755d2d8962813eafc1e3fb2137122014643b7b7a90bfd44e2490edd428eb32b8bb9a7e31745bfeaa8b8b847ea1ad39d5c2f8aa25
+  metadata.gz: cdc24469f4d8bad151261849af0a4bd85b5ca86d2f6f007404e131cf90ab18f6fd279a82634a46565f3ffa19337c698741103c64220b7c89a8c1261d44652eea
+  data.tar.gz: 750995dc4c72f1eb9026bbba25795c8b5489d734d48e93edae8cabad4af12b4bc6a69746550e044f10ceaac2eab3f15fc6e2dddb08a919eccbc953c12c833ef3

data/lib/protocol/htty/stream.rb

@@ -3,8 +3,6 @@
 # Released under the MIT License.
 # Copyright, 2026, by Samuel Williams.
 
-require "io/stream"
-
 module Protocol
 	module HTTY
 		# Transport an opaque byte stream after the HTTY bootstrap handshake.
@@ -15,11 +13,13 @@ module Protocol
 			BOOTSTRAP_PREFIX = "+H"
 			RAW_MODE = "raw"
 			
-			HTTP2_FRAME_HEADER_SIZE = 9
-			
 			def self.open(input, output, bootstrap: nil, mode: RAW_MODE)
 				stream = self.new(input, output)
 				
+				# Disable buffering:
+				input.sync = true
+				output.sync = true
+				
 				case bootstrap
 				when :write
 					stream.write_bootstrap(mode)
@@ -39,8 +39,7 @@ module Protocol
 			# @parameter output [IO] The writable endpoint.
 			def initialize(input, output)
 				@input = input
-				@output = ::IO::Stream(output)
-				@frame_remaining = nil
+				@output = output
 				@local_closed = false
 			end
 			
@@ -73,27 +72,9 @@ module Protocol
 			end
 			
 			# Read application bytes from the HTTY transport.
+			# The HTTP/2 framer always requests exact byte counts (header size, then payload length), so we delegate directly to the underlying input.
 			def read(length = nil)
-				if length == 0
-					@frame_remaining = nil if @frame_remaining == 0
-					return +"".b
-				end
-				
-				requested_length = length
-				length = [length, @frame_remaining].min if length && @frame_remaining && @frame_remaining > 0
-				buffer = read_exact(length)
-				
-				if buffer && requested_length == HTTP2_FRAME_HEADER_SIZE && !@frame_remaining
-					if buffer.bytesize == HTTP2_FRAME_HEADER_SIZE
-						frame_length = self.class.frame_length(buffer)
-						@frame_remaining = frame_length if frame_length > 0
-					end
-				elsif buffer && @frame_remaining
-					@frame_remaining -= buffer.bytesize
-					@frame_remaining = nil if @frame_remaining <= 0
-				end
-				
-				return buffer
+				@input.read(length)
 			end
 			
 			# Write application bytes after bootstrap.
@@ -140,33 +121,8 @@ module Protocol
 			
 			private
 			
-			def self.frame_length(buffer)
-				length_high, length_low = buffer.unpack("Cn")
-				return (length_high << 16) | length_low
-			end
-			
-			def read_exact(length)
-				return @input.read if length.nil?
-				
-				buffer = +"".b
-				
-				while buffer.bytesize < length
-					chunk = read_some(length - buffer.bytesize)
-					break unless chunk
-					
-					buffer << chunk.b
-				end
-				
-				return nil if buffer.empty?
-				return buffer
-			end
-			
 			def read_some(length)
-				if @input.respond_to?(:readpartial)
-					@input.readpartial(length)
-				else
-					@input.read(length)
-				end
+				@input.read(length)
 			rescue EOFError, Errno::EIO
 				return nil
 			end
@@ -186,7 +142,7 @@ module Protocol
 			end
 			
 			def consume_packet
-				buffer = +""
+				buffer = String.new.b
 				
 				while chunk = read_some(1)
 					if chunk == ESC

data/lib/protocol/htty/version.rb

@@ -5,6 +5,6 @@
 
 module Protocol
 	module HTTY
-		VERSION = "0.3.0"
+		VERSION = "0.4.0"
 	end
 end

data/readme.md

@@ -36,6 +36,11 @@ Please see the [project documentation](https://socketry.github.io/protocol-htty/
 
 Please see the [project releases](https://socketry.github.io/protocol-htty/releases/index) for all releases.
 
+### v0.4.0
+
+  - **Breaking**: Drop the `io-stream` dependency. `Stream.new` and `Stream.open` no longer coerce or wrap their `input` and `output` arguments; raw IO objects are used as-is. Callers that relied on `stream.io` returning an `IO::Stream::Buffered` should wrap the IO themselves before passing it in.
+  - Simplify `Stream#read` to delegate directly to the underlying input, since the HTTP/2 framer always requests exact byte counts (header size, then payload length).
+
 ### v0.3.0
 
   - Change `Protocol::HTTY::Stream` to take explicit input and output endpoints using `Stream.new(input, output)` and `Stream.open(input, output, **options)`.

data/releases.md

@@ -1,5 +1,10 @@
 # Releases
 
+## v0.4.0
+
+  - **Breaking**: Drop the `io-stream` dependency. `Stream.new` and `Stream.open` no longer coerce or wrap their `input` and `output` arguments; raw IO objects are used as-is. Callers that relied on `stream.io` returning an `IO::Stream::Buffered` should wrap the IO themselves before passing it in.
+  - Simplify `Stream#read` to delegate directly to the underlying input, since the HTTP/2 framer always requests exact byte counts (header size, then payload length).
+
 ## v0.3.0
 
   - Change `Protocol::HTTY::Stream` to take explicit input and output endpoints using `Stream.new(input, output)` and `Stream.open(input, output, **options)`.

data/test/protocol/htty/stream.rb

@@ -4,7 +4,6 @@
 # Copyright, 2026, by Samuel Williams.
 
 require "stringio"
-require "tempfile"
 require "protocol/http2/framer"
 require "protocol/htty"
 
@@ -49,7 +48,7 @@ describe Protocol::HTTY::Stream do
 	end
 	
 	it "exposes the underlying output stream" do
-		expect(stream.io).to be(:is_a?, ::IO::Stream::Buffered)
+		expect(stream.io).to be(:equal?, writer)
 	end
 	
 	it "flushes through the underlying stream" do
@@ -86,16 +85,6 @@ describe Protocol::HTTY::Stream do
 		expect(stream).to be(:readable?)
 	end
 	
-	it "reads HTTP/2 frame headers and payloads without reading ahead" do
-		header = [0, 5, 0, 0, 1].pack("CnCCN")
-		input = StringIO.new("#{header}helloextra")
-		reader = subject.open(input, StringIO.new)
-		
-		expect(reader.read(9)).to be == header
-		expect(reader.read(16)).to be == "hello"
-		expect(reader.read(5)).to be == "extra"
-	end
-	
 	it "rejects writes after the local side is closed" do
 		stream.close
 		
@@ -103,24 +92,4 @@ describe Protocol::HTTY::Stream do
 			stream.write("hello")
 		end.to raise_exception(IOError)
 	end
-	
-	it "wraps raw IO handles using IO::Stream" do
-		Tempfile.create("protocol-htty") do |file|
-			io_stream = subject.open(file, file).io
-			
-			expect(io_stream).to be(:is_a?, ::IO::Stream::Buffered)
-			io_stream.close
-		end
-	end
-	
-	it "does not close wrapped raw IO handles when closed" do
-		Tempfile.create("protocol-htty") do |file|
-			wrapped_stream = subject.open(file, file)
-			
-			wrapped_stream.close
-			
-			expect(file).not.to be(:closed?)
-			file.close
-		end
-	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protocol-htty
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: io-stream
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.13.0
 executables: []
 extensions: []
 extra_rdoc_files: []