io-endpoint 0.14.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f51510c717c48af4dbb57bdc410ba223ca4bb5f7880c57ca37e8a95c33a1c59
-  data.tar.gz: 1175cb1f51a2e242a87f3d807047ca01b4f42d06842d5162459cc9f8566eb196
+  metadata.gz: 52e4f0d4b8e0e46f2ad47c655f0b841fd9cbd4b26165139a5260546f5baa5167
+  data.tar.gz: a86e657651e34a15f300d67e1df05b7ef29b6e5624b61c2bc06df57269f005dd
 SHA512:
-  metadata.gz: 616c3bc275c978686816bc6dbcfb5100101bea253e393693d7f319fca284b41955b58d59d2091cf2cc6f0f00bfbdf00b2b1ad8d04346d91f2af8a70f55817070
-  data.tar.gz: 1e9b8a3e7e1d1379a270f92fef0075b938a708f7744f622e9c14ab5cb6e179e7e0ea465e03b9ce49eeec88bb9f2aeca126b397c92d0f7f4e378512a8327ce5ef
+  metadata.gz: b33453871ae938df8dc7c21bf5eb2db870a7433ec61015dc3aa0b1f1f572ff36f3bd46c3f447e53ee58891c4570215bcf14c8c06010433d6dcaf1956b7034659
+  data.tar.gz: 8a1143e06da6a04216f6e7a5a9af31530b3867e89771e739e28e67d68987dbb9be7e587bba86cfd934f7e80f85043f4cbfb10119dd11521bac4747d70708e840

data/lib/io/endpoint/address_endpoint.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
-require 'socket'
+require "socket"
 
-require_relative 'generic'
-require_relative 'wrapper'
+require_relative "generic"
+require_relative "wrapper"
 
 module IO::Endpoint
 	class AddressEndpoint < Generic
@@ -37,13 +37,13 @@ module IO::Endpoint
 		# @yield {|socket| ...}	An optional block which will be passed the socket.
 		#   @parameter socket [Socket] The socket which has been bound.
 		# @return [Array(Socket)] the bound socket
-		def bind(wrapper = Wrapper.default, &block)
+		def bind(wrapper = self.wrapper, &block)
 			[wrapper.bind(@address, **@options, &block)]
 		end
 		
 		# Connects a socket to the given address. If a block is given, the socket will be automatically closed when the block exits.
 		# @return [Socket] the connected socket
-		def connect(wrapper = Wrapper.default, &block)
+		def connect(wrapper = self.wrapper, &block)
 			wrapper.connect(@address, **@options, &block)
 		end
 	end

data/lib/io/endpoint/bound_endpoint.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
+# Copyright, 2024-2025, by Samuel Williams.
 
-require_relative 'generic'
-require_relative 'composite_endpoint'
-require_relative 'address_endpoint'
+require_relative "generic"
+require_relative "composite_endpoint"
+require_relative "address_endpoint"
 
 module IO::Endpoint
 	class BoundEndpoint < Generic
@@ -62,10 +62,10 @@ module IO::Endpoint
 			"\#<#{self.class} #{@sockets.size} bound sockets for #{@endpoint}>"
 		end
 		
-		def bind(wrapper = Wrapper.default, &block)
+		def bind(wrapper = self.wrapper, &block)
 			@sockets.map do |server|
 				if block_given?
-					wrapper.async do
+					wrapper.schedule do
 						yield server
 					end
 				else

data/lib/io/endpoint/composite_endpoint.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
-require_relative 'generic'
+require_relative "generic"
 
 module IO::Endpoint
 	# A composite endpoint is a collection of endpoints that are used in order.
@@ -44,7 +44,7 @@ module IO::Endpoint
 			end
 		end
 		
-		def connect(wrapper = Wrapper.default, &block)
+		def connect(wrapper = self.wrapper, &block)
 			last_error = nil
 			
 			@endpoints.each do |endpoint|
@@ -57,7 +57,7 @@ module IO::Endpoint
 			raise last_error
 		end
 		
-		def bind(wrapper = Wrapper.default, &block)
+		def bind(wrapper = self.wrapper, &block)
 			if block_given?
 				@endpoints.each do |endpoint|
 					endpoint.bind(&block)

data/lib/io/endpoint/connected_endpoint.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2024, by Samuel Williams.
+# Copyright, 2024-2025, by Samuel Williams.
 
-require_relative 'generic'
-require_relative 'composite_endpoint'
-require_relative 'socket_endpoint'
+require_relative "generic"
+require_relative "composite_endpoint"
+require_relative "socket_endpoint"
 
-require 'openssl'
+require "openssl"
 
 module IO::Endpoint
 	class ConnectedEndpoint < Generic
@@ -41,7 +41,7 @@ module IO::Endpoint
 			AddressEndpoint.new(socket.to_io.remote_address, **options)
 		end
 		
-		def connect(wrapper = Wrapper.default, &block)
+		def connect(wrapper = self.wrapper, &block)
 			if block_given?
 				yield @socket
 			else

data/lib/io/endpoint/generic.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
 # require_relative 'address'
-require 'uri'
-require 'socket'
+require "uri"
+require "socket"
 
 module IO::Endpoint
 	Address = Addrinfo
@@ -64,21 +64,21 @@ module IO::Endpoint
 		# @yields {|socket| ...}	An optional block which will be passed the socket.
 		#   @parameter socket [Socket] The socket which has been bound.
 		# @returns [Array(Socket)] the bound socket
-		def bind(wrapper = Wrapper.default, &block)
+		def bind(wrapper = self.wrapper, &block)
 			raise NotImplementedError
 		end
 		
 		# Connects a socket to the given address. If a block is given, the socket will be automatically closed when the block exits.
 		# @parameter wrapper [Wrapper] The wrapper to use for connecting.
 		# @return [Socket] the connected socket
-		def connect(wrapper = Wrapper.default, &block)
+		def connect(wrapper = self.wrapper, &block)
 			raise NotImplementedError
 		end
 		
 		# Bind and accept connections on the given address.
 		# @parameter wrapper [Wrapper] The wrapper to use for accepting connections.
 		# @yields [Socket] The accepted socket.
-		def accept(wrapper = Wrapper.default, &block)
+		def accept(wrapper = self.wrapper, &block)
 			bind(wrapper) do |server|
 				wrapper.accept(server, **@options, &block)
 			end
@@ -109,5 +109,10 @@ module IO::Endpoint
 			
 			IO::Endpoint.public_send(uri.scheme, uri.host, uri.port, **options)
 		end
+		
+		# The default wrapper to use for binding, connecting, and accepting connections.
+		def wrapper
+			@options[:wrapper] || Wrapper.default
+		end
 	end
 end

data/lib/io/endpoint/host_endpoint.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
-require_relative 'address_endpoint'
+require_relative "address_endpoint"
 
 module IO::Endpoint
 	class HostEndpoint < Generic
@@ -38,7 +38,7 @@ module IO::Endpoint
 		# @yield [Socket] the socket which is being connected, may be invoked more than once
 		# @return [Socket] the connected socket
 		# @raise if no connection could complete successfully
-		def connect(wrapper = Wrapper.default, &block)
+		def connect(wrapper = self.wrapper, &block)
 			last_error = nil
 			
 			Addrinfo.foreach(*@specification) do |address|
@@ -63,7 +63,7 @@ module IO::Endpoint
 		# Invokes the given block for every address which can be bound to.
 		# @yield [Socket] the bound socket
 		# @return [Array<Socket>] an array of bound sockets
-		def bind(wrapper = Wrapper.default, &block)
+		def bind(wrapper = self.wrapper, &block)
 			Addrinfo.foreach(*@specification).map do |address|
 				wrapper.bind(address, **@options, &block)
 			end

data/lib/io/endpoint/shared_endpoint.rb

@@ -3,5 +3,5 @@
 # Released under the MIT License.
 # Copyright, 2023-2024, by Samuel Williams.
 
-require_relative 'bound_endpoint'
-require_relative 'connected_endpoint'
+require_relative "bound_endpoint"
+require_relative "connected_endpoint"

data/lib/io/endpoint/socket_endpoint.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2024, by Samuel Williams.
 
-require_relative 'generic'
+require_relative "generic"
 
 module IO::Endpoint
 	# This class doesn't exert ownership over the specified socket, wraps a native ::IO.

data/lib/io/endpoint/ssl_endpoint.rb

@@ -3,10 +3,10 @@
 # Released under the MIT License.
 # Copyright, 2023-2024, by Samuel Williams.
 
-require_relative 'host_endpoint'
-require_relative 'generic'
+require_relative "host_endpoint"
+require_relative "generic"
 
-require 'openssl'
+require "openssl"
 
 module OpenSSL
 	module SSL

data/lib/io/endpoint/unix_endpoint.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2024, by Samuel Williams.
 
-require_relative 'address_endpoint'
+require_relative "address_endpoint"
 
 module IO::Endpoint
 	# This class doesn't exert ownership over the specified unix socket and ensures exclusive access by using `flock` where possible.

data/lib/io/endpoint/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Endpoint
-		VERSION = "0.14.0"
+		VERSION = "0.15.1"
 	end
 end

data/lib/io/endpoint/wrapper.rb

@@ -1,14 +1,33 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2023-2025, by Samuel Williams.
 
-require 'socket'
+require "socket"
 
 module IO::Endpoint
 	class Wrapper
 		include ::Socket::Constants
 		
+		if Fiber.respond_to?(:scheduler)
+			def schedule(&block)
+				if Fiber.scheduler
+					Fiber.schedule(&block)
+				else
+					Thread.new(&block)
+				end
+			end
+		else
+			def schedule(&block)
+				Thread.new(&block)
+			end
+		end
+		
+		# Legacy method for compatibility with older code.
+		def async(&block)
+			schedule(&block)
+		end
+		
 		def set_timeout(io, timeout)
 			if io.respond_to?(:timeout=)
 				io.timeout = timeout
@@ -30,8 +49,13 @@ module IO::Endpoint
 			# It may not be supported by the protocol (e.g. UDP). ¯\_(ツ)_/¯
 		end
 		
-		def async
-			raise NotImplementedError
+		# Connect a socket to a remote address.
+		# This is an extension point for subclasses to provide additional functionality.
+		#
+		# @parameter socket [Socket] The socket to connect.
+		# @parameter remote_address [Address] The remote address to connect to.
+		def socket_connect(socket, remote_address)
+			socket.connect(remote_address.to_sockaddr)
 		end
 		
 		# Establish a connection to a given `remote_address`.
@@ -72,7 +96,7 @@ module IO::Endpoint
 			end
 			
 			begin
-				socket.connect(remote_address.to_sockaddr)
+				socket_connect(socket, remote_address)
 			rescue Exception
 				socket.close
 				raise
@@ -142,7 +166,7 @@ module IO::Endpoint
 			
 			return socket unless block_given?
 			
-			async do
+			schedule do
 				begin
 					yield socket
 				ensure
@@ -151,11 +175,21 @@ module IO::Endpoint
 			end
 		end
 		
+		# Accept a connection from a bound socket.
+		# This is an extension point for subclasses to provide additional functionality.
+		#
+		# @parameter server [Socket] The bound server socket.
+		# @returns [Tuple(Socket, Address)] The connected socket and the remote address.
+		def socket_accept(server)
+			server.accept
+		end
+		
 		# Bind to a local address and accept connections in a loop.
 		def accept(server, timeout: nil, linger: nil, **options, &block)
 			# Ensure we use a `loop do ... end` so that state is not leaked between iterations:
+			
 			loop do
-				socket, address = server.accept
+				socket, address = socket_accept(server)
 				
 				if linger
 					socket.setsockopt(SOL_SOCKET, SO_LINGER, 1)
@@ -165,7 +199,7 @@ module IO::Endpoint
 					set_timeout(socket, timeout)
 				end
 				
-				async do
+				schedule do
 					# Some sockets, notably SSL sockets, need application level negotiation before they are ready:
 					if socket.respond_to?(:start)
 						begin
@@ -183,31 +217,11 @@ module IO::Endpoint
 				end
 			end
 		end
-	end
-	
-	class ThreadWrapper < Wrapper
-		def async(&block)
-			::Thread.new(&block)
-		end
-	end
-	
-	class FiberWrapper < Wrapper
-		def async(&block)
-			::Fiber.schedule(&block)
-		end
-	end
-	
-	if Fiber.respond_to?(:scheduler)
-		def Wrapper.default
-			if Fiber.scheduler
-				FiberWrapper.new
-			else
-				ThreadWrapper.new
-			end
-		end
-	else
-		def Wrapper.default
-			ThreadWrapper.new
+		
+		DEFAULT = new
+		
+		def self.default
+			DEFAULT
 		end
 	end
 end

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright, 2023-2024, by Samuel Williams.  
+Copyright, 2023-2025, by Samuel Williams.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: io-endpoint
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Samuel Williams
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -37,10 +36,8 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-10-12 00:00:00.000000000 Z
+date: 2025-02-13 00:00:00.000000000 Z
 dependencies: []
-description:
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -66,7 +63,6 @@ licenses:
 metadata:
   documentation_uri: https://socketry.github.io/io-endpoint
   source_code_uri: https://github.com/socketry/io-endpoint.git
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,8 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Provides a separation of concerns interface for IO endpoints.
 test_files: []

metadata.gz.sig

@@ -1,2 +1,4 @@
-^�cC��|��Ta]}�e@�y�! �M��!��"y%�s��M1LWDk�&���X���N
-Q0./���I�>�r߯{�{n֧�.)P����FM7+�N9�����J[�Rk;+�R�Qr�u�Z~�"[_at�!�Q�>�lFi��އ4�L�}�	�,��L"Y�L|/
+m�����h9tq]G�d���o}�W	L,P��\d���N@��x\"���gx
":M8 �����zar)��:�݊�˕�Hh{�B�Z[�].l���*�5�&�s4bA���c�����=�1�m����x�a�z2�l%n��P�ջOčpmL���6����
+@@���Nۏ��ܐ�Q}r���
+�幊c��@ �\�G6�����ޢ
+�H�Y�ߍV��(�֑����R�R�4坼�