io-endpoint 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c519269d1e8459a607159be713100765c2e424f199a08cce97e1ba6c877b5b6a
-  data.tar.gz: ee2e142c5320d9412395c80098e669971b8956b43ad58252d52a85e2a97a5a97
+  metadata.gz: 10203d535af830bf9ff71034262b5851ec323024a9de4db527f061cb1cd76102
+  data.tar.gz: b150061a0414c379afb7fb5f2c142767afc5ed1822e5b106b78ece023d1cf459
 SHA512:
-  metadata.gz: 67ce6a415b998cd1d072a1faee146803f30de818666278846cbdf69f8f72fd8c30d0df371ec44747a2ea74a1fdd0d86f100e187ba15d17275ffbb335d29e6df5
-  data.tar.gz: 360a4f1ee5e162e71be467b0090e54eade25f141abde4452f6ba0e389def1398eaabfe5f76aaed4cbf333ba0c40334e014029d7fb76e13d09ff60f428ac63d9f
+  metadata.gz: 82930d72359dee91627b19c771f79c9f2c6cc43dc93b9514a372a4568d1fb92c653ff2da1403c8519eddc4470dc14ef2356abe41cd202fba80bc35ba10e2d053
+  data.tar.gz: 556e87a95eb514e643a3e6bb40468ac851cceea5da6fb6f72db37767dca18882bb9b63e61e05d2e69629a1e4eef1859c3a2b3e0797b36e0e4eb1202684f8d44c

data/lib/io/connected.rb

@@ -0,0 +1,27 @@
+require 'socket'
+
+class IO
+	def connected?
+		!closed?
+	end
+end
+
+class Socket
+	def connected?
+		# Is it likely that the socket is still connected?
+		# May return false positive, but won't return false negative.
+		return false unless super
+		
+		# If we can wait for the socket to become readable, we know that the socket may still be open.
+		result = to_io.recv_nonblock(1, MSG_PEEK, exception: false)
+		
+		# No data was available - newer Ruby can return nil instead of empty string:
+		return false if result.nil?
+		
+		# Either there was some data available, or we can wait to see if there is data avaialble.
+		return !result.empty? || result == :wait_readable
+	rescue Errno::ECONNRESET
+		# This might be thrown by recv_nonblock.
+		return false
+	end
+end

data/lib/io/endpoint/composite_endpoint.rb

@@ -18,12 +18,12 @@ module IO::Endpoint
 			end
 		end
 		
-		def connect(&block)
+		def connect(wrapper = Wrapper.default, &block)
 			last_error = nil
 			
 			@endpoints.each do |endpoint|
 				begin
-					return endpoint.connect(&block)
+					return endpoint.connect(wrapper, &block)
 				rescue => last_error
 				end
 			end
@@ -31,7 +31,7 @@ module IO::Endpoint
 			raise last_error
 		end
 		
-		def bind(&block)
+		def bind(wrapper = Wrapper.default, &block)
 			if block_given?
 				@endpoints.each do |endpoint|
 					endpoint.bind(&block)

data/lib/io/endpoint/generic.rb

@@ -69,21 +69,13 @@ module IO::Endpoint
 		
 		# Accept connections from the specified endpoint.
 		# @param backlog [Integer] the number of connections to listen for.
-		def accept(backlog: Socket::SOMAXCONN, &block)
-			bind do |server|
-				server.listen(backlog) if backlog
-				
-				while true
-					socket, address = server.accept
-					
-					Fiber.schedule do
-						yield socket, address
-					end
-				end
+		def accept(wrapper = Wrapper.default, *arguments, **options, &block)
+			bind(wrapper, *arguments, **options) do |server|
+				wrapper.accept(server, &block)
 			end
 		end
 		
-		# Create an Endpoint instance by URI scheme. The host and port of the URI will be passed to the Endpoint factory method, along with any options.\
+		# Create an Endpoint instance by URI scheme. The host and port of the URI will be passed to the Endpoint factory method, along with any options.
 		#
 		# You should not use untrusted input as it may execute arbitrary code.
 		#

data/lib/io/endpoint/shared_endpoint.rb

@@ -32,11 +32,11 @@ module IO::Endpoint
 		
 		# Create a new `SharedEndpoint` by connecting to the given endpoint.
 		def self.connected(endpoint, close_on_exec: false)
-			wrapper = endpoint.connect
+			socket = endpoint.connect
 			
-			wrapper.close_on_exec = close_on_exec
+			socket.close_on_exec = close_on_exec
 			
-			return self.new(endpoint, [wrapper])
+			return self.new(endpoint, [socket])
 		end
 		
 		def initialize(endpoint, sockets, **options)
@@ -53,18 +53,18 @@ module IO::Endpoint
 		
 		def local_address_endpoint(**options)
 			endpoints = @sockets.map do |wrapper|
-				AddressEndpoint.new(wrapper.to_io.local_address)
+				AddressEndpoint.new(wrapper.to_io.local_address, **options)
 			end
 			
-			return CompositeEndpoint.new(endpoints, **options)
+			return CompositeEndpoint.new(endpoints)
 		end
 		
 		def remote_address_endpoint(**options)
 			endpoints = @sockets.map do |wrapper|
-				AddressEndpoint.new(wrapper.to_io.remote_address)
+				AddressEndpoint.new(wrapper.to_io.remote_address, **options)
 			end
 			
-			return CompositeEndpoint.new(endpoints, **options)
+			return CompositeEndpoint.new(endpoints)
 		end
 		
 		# Close all the internal sockets.
@@ -113,9 +113,9 @@ module IO::Endpoint
 			end
 		end
 		
-		def accept(**options, &block)
-			bind do |server|
-				server.accept(&block)
+		def accept(wrapper = Wrapper.default, &block)
+			bind(wrapper) do |server|
+				wrapper.accept(server, &block)
 			end
 		end
 		

data/lib/io/endpoint/ssl_endpoint.rb

@@ -91,14 +91,14 @@ module IO::Endpoint
 		# Connect to the underlying endpoint and establish a SSL connection.
 		# @yield [Socket] the socket which is being connected
 		# @return [Socket] the connected socket
-		def bind
+		def bind(*arguments, **options, &block)
 			if block_given?
-				@endpoint.bind do |server|
-					yield ::OpenSSL::SSL::SSLServer.new(server, context)
+				@endpoint.bind(*arguments, **options) do |server|
+					yield ::OpenSSL::SSL::SSLServer.new(server, self.context)
 				end
 			else
-				@endpoint.bind.map do |server|
-					::OpenSSL::SSL::SSLServer.new(server, context)
+				@endpoint.bind(*arguments, **options).map do |server|
+					::OpenSSL::SSL::SSLServer.new(server, self.context)
 				end
 			end
 		end
@@ -107,7 +107,7 @@ module IO::Endpoint
 		# @yield [Socket] the socket which is being connected
 		# @return [Socket] the connected socket
 		def connect(&block)
-			socket = ::OpenSSL::SSL::SSLSocket.new(@endpoint.connect, context)
+			socket = ::OpenSSL::SSL::SSLSocket.new(@endpoint.connect, self.context)
 			
 			if hostname = self.hostname
 				socket.hostname = hostname

data/lib/io/endpoint/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Endpoint
-		VERSION = "0.3.0"
+		VERSION = "0.4.0"
 	end
 end

data/lib/io/endpoint/wrapper.rb

@@ -30,7 +30,6 @@ module IO::Endpoint
 			# On Darwin, sometimes occurs when the connection is not yet fully formed. Empirically, TCP_NODELAY is enabled despite this result.
 		rescue Errno::EOPNOTSUPP
 			# Some platforms may simply not support the operation.
-			# Console.logger.warn(self) {"Unable to set sync=#{value}!"}
 		rescue Errno::ENOPROTOOPT
 			# It may not be supported by the protocol (e.g. UDP). ¯\_(ツ)_/¯
 		end
@@ -131,14 +130,14 @@ module IO::Endpoint
 		end
 		
 		# Bind to a local address and accept connections in a loop.
-		def accept(*arguments, backlog: SOMAXCONN, **options, &block)
-			bind(*arguments, **options) do |server|
-				server.listen(backlog) if backlog
+		def accept(server, timeout: server.timeout, &block)
+			while true
+				socket, address = server.accept
+				
+				socket.timeout = timeout if timeout != false
 				
 				async do
-					while true
-						server.accept(&block)
-					end
+					yield socket, address
 				end
 			end
 		end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-endpoint
 version: !ruby/object:Gem::Version
-  version: 0.3.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: 2023-12-28 00:00:00.000000000 Z
+date: 2024-01-01 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -45,6 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/io/connected.rb
 - lib/io/endpoint.rb
 - lib/io/endpoint/address_endpoint.rb
 - lib/io/endpoint/composite_endpoint.rb
@@ -78,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Provides a separation of concerns interface for IO endpoints.