io-stream 0.1.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15a89f071ddff7b47577a25a20195cb1d246f9b7105af8ee605ae01e0d267923
-  data.tar.gz: c29039d3ab0d1e234733ddf38f1ddc4be40cbffa92b5f9b47ba1dc247e9ea357
+  metadata.gz: 93cc26a0208cdfd7e20115522eeb3a51234834a5b6ce6670248c6bb85dd84e3c
+  data.tar.gz: bec8f1a9e90cb7fe37845d4acb96c0c8f1919d253662da476a169a29a27b33bf
 SHA512:
-  metadata.gz: 90d91151a245677dd5e7b96c2942af1b85f16d2a59c64c981e0d3d256d4af0ce5cc81115bfeb3a1981f765695e4777a0e76caf9c8f3d8995bbba204ebce8d91e
-  data.tar.gz: e40408fa7e69bab982229290640cb0e9c7a4efb9bc39ac40003ef1fe698f1aac962cd10a7464b5b2643bf46dddf6697e26296209527d507a0d135f112bc4bbae
+  metadata.gz: 865a0a1031f7c83bbd428675e970fd2421a42ae4e19cd22ccf2080678d4009c78add651212f1f69cada5ba07075e1411d39978f3f9cba721d291a56f266a71e8
+  data.tar.gz: 73ff08ba993904115d3158fe5e233cc6e0e9667c34614b4c1e4efae5873417a3cd8f08cb30ac58edace8cb118ee640afdef1f37aaa73677d2c4ca64f7bad82de

data/lib/io/stream/buffered.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2024, by Samuel Williams.
 
 require_relative 'generic'
 
@@ -22,6 +22,8 @@ module IO::Stream
 		def self.wrap(io, **options)
 			if io.respond_to?(:buffered=)
 				io.buffered = false
+			else
+				io.sync = true
 			end
 			
 			stream = self.new(io, **options)
@@ -39,6 +41,11 @@ module IO::Stream
 			super(...)
 			
 			@io = io
+			if io.respond_to?(:timeout)
+				@timeout = io.timeout
+			else
+				@timeout = nil
+			end
 		end
 		
 		attr :io
@@ -68,7 +75,25 @@ module IO::Stream
 		end
 		
 		def syswrite(buffer)
-			@io.write(buffer)
+			# This fails due to re-entrancy issues with a concurrent call to `sysclose`.
+			# return @io.write(buffer)
+			
+			while true
+				result = @io.write_nonblock(buffer, exception: false)
+				
+				case result
+				when :wait_readable
+					@io.wait_readable(@io.timeout) or raise ::IO::TimeoutError, "read timeout"
+				when :wait_writable
+					@io.wait_writable(@io.timeout) or raise ::IO::TimeoutError, "write timeout"
+				else
+					if result == buffer.bytesize
+						return
+					else
+						buffer = buffer.byteslice(result, buffer.bytesize)
+					end
+				end
+			end
 		end
 		
 		# Reads data from the underlying stream as efficiently as possible.
@@ -79,9 +104,9 @@ module IO::Stream
 				
 				case result
 				when :wait_readable
-					@io.wait_readable
+					@io.wait_readable(@io.timeout) or raise ::IO::TimeoutError, "read timeout"
 				when :wait_writable
-					@io.wait_writable
+					@io.wait_writable(@io.timeout) or raise ::IO::TimeoutError, "write timeout"
 				else
 					return result
 				end

data/lib/io/stream/generic.rb

@@ -5,8 +5,9 @@
 
 require_relative 'string_buffer'
 
-require_relative '../buffered'
-require_relative '../readable'
+require_relative 'shim/buffered'
+require_relative 'shim/readable'
+require_relative 'shim/timeout'
 
 require_relative 'openssl'
 

data/lib/io/stream/openssl.rb

@@ -1,3 +1,8 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Samuel Williams.
+
 require 'openssl'
 
 module OpenSSL
@@ -26,6 +31,18 @@ module OpenSSL
 					to_io.wait_writable(...)
 				end
 			end
+			
+			unless method_defined?(:timeout)
+				def timeout
+					to_io.timeout
+				end
+			end
+			
+			unless method_defined?(:timeout=)
+				def timeout=(value)
+					to_io.timeout = value
+				end
+			end
 		end
 	end
 end

data/lib/io/stream/shim/shim.md

@@ -0,0 +1,4 @@
+# Shims
+
+Several shims are included for compatibility.
+

data/lib/io/stream/shim/timeout.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class IO
+	unless const_defined?(:TimeoutError)
+		# Compatibility shim.
+		class TimeoutError < IOError
+		end
+	end
+	
+	unless method_defined?(:timeout)
+		# Compatibility shim.
+		attr_accessor :timeout
+	end
+end

data/lib/io/stream/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2023-2024, by Samuel Williams.
 
 module IO::Stream
-	VERSION = "0.1.0"
+	VERSION = "0.4.0"
 end

data/lib/io/stream.rb

@@ -4,9 +4,17 @@
 # Copyright, 2023-2024, by Samuel Williams.
 
 require_relative 'stream/version'
-require_relative 'stream/buffered_stream'
+require_relative 'stream/buffered'
 
 class IO
 	module Stream
 	end
+	
+	def self.Stream(io)
+		if io.is_a?(Stream::Buffered)
+			io
+		else
+			Stream::Buffered.wrap(io)
+		end
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-stream
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-04-22 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -45,12 +45,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/io/buffered.rb
-- lib/io/readable.rb
 - lib/io/stream.rb
 - lib/io/stream/buffered.rb
 - lib/io/stream/generic.rb
 - lib/io/stream/openssl.rb
+- lib/io/stream/shim/buffered.rb
+- lib/io/stream/shim/readable.rb
+- lib/io/stream/shim/shim.md
+- lib/io/stream/shim/timeout.rb
 - lib/io/stream/string_buffer.rb
 - lib/io/stream/version.rb
 - license.md