Better TTY integration - no read-ahead.

Author: ioquatix

async-htty.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
 	spec.add_dependency "async", "~> 2.39"
 	spec.add_dependency "async-http", "~> 0.88"
 	spec.add_dependency "protocol-http", "~> 0.62"
-	spec.add_dependency "protocol-htty", "~> 0.2"
+	spec.add_dependency "protocol-htty", "~> 0.3"
 end

fixtures/async/htty/pty_stream.rb

@@ -14,6 +14,9 @@ def initialize(input, output)
 				@buffer = +"".b
 			end
 
+			attr :input
+			attr :output
+			
 			def read(length)
 				while @buffer.bytesize < length
 					@buffer << @input.readpartial(4096).b

lib/async/htty/protocol/htty.rb

@@ -13,7 +13,11 @@ module HTTY
 		module Protocol
 			module HTTY
 				def self.client(stream, settings: ::Async::HTTP::Protocol::HTTP2::CLIENT_SETTINGS)
-					stream = ::Protocol::HTTY::Stream.open(stream, bootstrap: :read)
+					mode = stream.read_bootstrap
+					
+					unless mode == ::Protocol::HTTY::Stream::RAW_MODE
+						raise ::Protocol::HTTY::ProtocolError, "Expected HTTY bootstrap mode #{::Protocol::HTTY::Stream::RAW_MODE.inspect}, got #{mode.inspect}"
+					end
 
 					client = ::Async::HTTP::Protocol::HTTP2::Client.new(stream)
 					client.send_connection_preface(settings)
@@ -23,7 +27,7 @@ def self.client(stream, settings: ::Async::HTTP::Protocol::HTTP2::CLIENT_SETTING
 				end
 
 				def self.server(stream, settings: ::Async::HTTP::Protocol::HTTP2::SERVER_SETTINGS)
-					stream = ::Protocol::HTTY::Stream.open(stream, bootstrap: :write)
+					stream.write_bootstrap
 
 					server = Server.new(stream)
 					server.read_connection_preface(settings)

lib/async/htty/protocol/htty/server.rb

@@ -12,9 +12,10 @@ module HTTY
 				class Server < ::Async::HTTP::Protocol::HTTP2::Server
 					def receive_goaway(frame)
 						super
-
-						unless self.framer.nil?
+						
+						if framer = self.framer
 							self.send_goaway
+							framer.flush
 						end
 					end
 				end

lib/async/htty/server.rb

@@ -45,7 +45,7 @@ def self.open(app = nil, input: $stdin, output: $stdout, error: $stderr, env: EN
 				original_output = output.dup
 				original_error = error.dup
 
-				stream = ::IO::Stream::Duplex(original_input, original_output)
+				stream = ::Protocol::HTTY::Stream.new(original_input, original_output)
 				input.reopen(File::NULL)
 				output.reopen(File::NULL)
 				error.reopen(File::NULL)

releases.md

@@ -1,5 +1,10 @@
 # Releases
 
+## Unreleased
+
+  - Pass explicit terminal input and output endpoints into `Protocol::HTTY::Stream`, avoiding buffered duplex reads across the HTTY HTTP/2 transport.
+  - Expect the HTTY protocol adapter to receive a prepared `Protocol::HTTY::Stream` instance before performing bootstrap and HTTP/2 setup.
+
 ## v0.2.1
 
   - Send a server-side GOAWAY when the HTTY client closes an HTTP/2 session, allowing terminal clients to detach cleanly.

test/async/htty/protocol/htty.rb

@@ -65,11 +65,11 @@ def close_pipes(pipes)
 	end
 
 	def client_stream(pipes)
-		IO::Stream::Duplex(pipes[:client_input], pipes[:client_output])
+		Protocol::HTTY::Stream.new(pipes[:client_input], pipes[:client_output])
 	end
 
 	def server_stream(pipes)
-		IO::Stream::Duplex(pipes[:server_input], pipes[:server_output])
+		Protocol::HTTY::Stream.new(pipes[:server_input], pipes[:server_output])
 	end
 
 	def spawn_fixture(name)
@@ -123,7 +123,8 @@ def with_fixture(name)
 		payload = (0x00..0xff).to_a.pack("C*")
 
 		with_fixture("echo_body.rb") do |stream|
-			Protocol::HTTY::Stream.new(stream).read_bootstrap
+			stream = Protocol::HTTY::Stream.new(stream.input, stream.output)
+			stream.read_bootstrap
 
 			framer = Protocol::HTTP2::Framer.new(stream)
 			client = EchoClient.new(framer)
@@ -174,7 +175,8 @@ def with_fixture(name)
 				server_finished.signal
 			end
 
-			stream = Protocol::HTTY::Stream.open(client_stream(pipes), bootstrap: :read)
+			stream = client_stream(pipes)
+			stream.read_bootstrap
 			framer = Protocol::HTTP2::Framer.new(stream)
 			client = Protocol::HTTP2::Client.new(framer)
 			client.send_connection_preface

test/async/htty/server.rb

@@ -88,8 +88,8 @@ def connection.close
 
 		protocol.define_singleton_method(:server) do |stream|
 			reopened_to_null = [input.reopened_to_null?, output.reopened_to_null?, error.reopened_to_null?]
-			duplex_input = stream.io.input
-			duplex_output = stream.io.output
+			duplex_input = stream.input
+			duplex_output = stream.output
 
 			stream.write("response", flush: true)