io-endpoint 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc52bab1fde2330c0b971cf987db15dc5865f9f3ce72a130121db97d00671ba
-  data.tar.gz: a7503b553781fd02e86a082015e82f1c5af24b5fa3a735dbdeb7415498901da8
+  metadata.gz: c519269d1e8459a607159be713100765c2e424f199a08cce97e1ba6c877b5b6a
+  data.tar.gz: ee2e142c5320d9412395c80098e669971b8956b43ad58252d52a85e2a97a5a97
 SHA512:
-  metadata.gz: 40343e43190bd695c0152fb5ec45946efe281245eb033eacae1eeda9291c37b4bc975dffac6db9d007b060bf9d375cdf3beed31f70a81f344c65f17b6772bff4
-  data.tar.gz: 40a34915f55409d96fddfaea9925c71c5bcddee36c0f6a6cc001982ec1e884a7694a3f4d89aad534353df3c182eb9b94f618619fdec9a77fc36d723620b5af09
+  metadata.gz: 67ce6a415b998cd1d072a1faee146803f30de818666278846cbdf69f8f72fd8c30d0df371ec44747a2ea74a1fdd0d86f100e187ba15d17275ffbb335d29e6df5
+  data.tar.gz: 360a4f1ee5e162e71be467b0090e54eade25f141abde4452f6ba0e389def1398eaabfe5f76aaed4cbf333ba0c40334e014029d7fb76e13d09ff60f428ac63d9f

data/lib/io/endpoint/address_endpoint.rb

@@ -23,10 +23,11 @@ module IO::Endpoint
 		attr :address
 		
 		# Bind a socket to the given address. If a block is given, the socket will be automatically closed when the block exits.
-		# @yield [Socket] the bound socket
-		# @return [Socket] the bound socket
+		# @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)
-			wrapper.bind(@address, **@options, &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.

data/lib/io/endpoint/composite_endpoint.rb

@@ -13,7 +13,9 @@ module IO::Endpoint
 		end
 		
 		def each(&block)
-			@endpoints.each(&block)
+			@endpoints.each do |endpoint|
+				endpoint.each(&block)
+			end
 		end
 		
 		def connect(&block)
@@ -30,7 +32,13 @@ module IO::Endpoint
 		end
 		
 		def bind(&block)
-			@endpoints.map(&:bind)
+			if block_given?
+				@endpoints.each do |endpoint|
+					endpoint.bind(&block)
+				end
+			else
+				@endpoints.map(&:bind).flatten.compact
+			end
 		end
 	end
 	

data/lib/io/endpoint/generic.rb

@@ -77,13 +77,15 @@ module IO::Endpoint
 					socket, address = server.accept
 					
 					Fiber.schedule do
-						yield accepted(socket), address
+						yield socket, address
 					end
 				end
 			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.
 		#
 		# @param string [String] URI as string. Scheme will decide implementation used.
 		# @param options keyword arguments passed through to {#initialize}
@@ -95,13 +97,7 @@ module IO::Endpoint
 		def self.parse(string, **options)
 			uri = URI.parse(string)
 			
-			self.public_send(uri.scheme, uri.host, uri.port, **options)
-		end
-		
-		protected
-		
-		def accepted(socket)
-			socket
+			IO::Endpoint.public_send(uri.scheme, uri.host, uri.port, **options)
 		end
 	end
 end

data/lib/io/endpoint/host_endpoint.rb

@@ -23,7 +23,11 @@ module IO::Endpoint
 		attr :specification
 		
 		def hostname
-			@specification.first
+			@specification[0]
+		end
+		
+		def service
+			@specification[1]
 		end
 		
 		# Try to connect to the given host by connecting to each address in sequence until a connection is made.
@@ -35,7 +39,7 @@ module IO::Endpoint
 			
 			Addrinfo.foreach(*@specification) do |address|
 				begin
-					socket = wrapper.connect(@address, **@options)
+					socket = wrapper.connect(address, **@options)
 				rescue Errno::ECONNREFUSED, Errno::ENETUNREACH, Errno::EAGAIN => last_error
 					# Try again unless if possible, otherwise raise...
 				else

data/lib/io/endpoint/shared_endpoint.rb

@@ -7,16 +7,16 @@ require_relative 'generic'
 require_relative 'composite_endpoint'
 require_relative 'socket_endpoint'
 
+require 'openssl'
+
 module IO::Endpoint
 	# Pre-connect and pre-bind sockets so that it can be used between processes.
 	class SharedEndpoint < Generic
 		# Create a new `SharedEndpoint` by binding to the given endpoint.
 		def self.bound(endpoint, backlog: Socket::SOMAXCONN, close_on_exec: false, **options)
-			sockets = []
+			sockets = endpoint.bind(**options)
 			
-			endpoint.each do |server_endpoint|
-				server = server_endpoint.bind(**options)
-				
+			sockets.each do |server|
 				# This is somewhat optional. We want to have a generic interface as much as possible so that users of this interface can just call it without knowing a lot of internal details. Therefore, we ignore errors here if it's because the underlying socket does not support the operation.
 				begin
 					server.listen(backlog)
@@ -25,8 +25,6 @@ module IO::Endpoint
 				end
 				
 				server.close_on_exec = close_on_exec
-				
-				sockets << server
 			end
 			
 			return self.new(endpoint, sockets)

data/lib/io/endpoint/ssl_endpoint.rb

@@ -8,6 +8,38 @@ require_relative 'generic'
 
 require 'openssl'
 
+module OpenSSL::SSL::SocketForwarder
+	unless method_defined?(:close_on_exec=)
+		def close_on_exec=(value)
+			to_io.close_on_exec = value
+		end
+	end
+	
+	unless method_defined?(:close_on_exec)
+		def local_address
+			to_io.local_address
+		end
+	end
+	
+	unless method_defined?(:wait)
+		def wait(*arguments)
+			to_io.wait(*arguments)
+		end
+	end
+	
+	unless method_defined?(:wait_readable)
+		def wait_readable(*arguments)
+			to_io.wait_readable(*arguments)
+		end
+	end
+	
+	unless method_defined?(:wait_writable)
+		def wait_writable(*arguments)
+			to_io.wait_writable(*arguments)
+		end
+	end
+end
+
 module IO::Endpoint
 	class SSLEndpoint < Generic
 		def initialize(endpoint, **options)
@@ -41,13 +73,13 @@ module IO::Endpoint
 			@options[:ssl_params]
 		end
 		
-		def build_context(context = OpenSSL::SSL::SSLContext.new)
+		def build_context(context = ::OpenSSL::SSL::SSLContext.new)
 			if params = self.params
 				context.set_params(params)
 			end
 			
-			context.setup
-			context.freeze
+			# context.setup
+			# context.freeze
 			
 			return context
 		end
@@ -62,10 +94,12 @@ module IO::Endpoint
 		def bind
 			if block_given?
 				@endpoint.bind do |server|
-					yield OpenSSL::SSL::SSLServer.new(server, context)
+					yield ::OpenSSL::SSL::SSLServer.new(server, context)
 				end
 			else
-				return OpenSSL::SSL::SSLServer.new(@endpoint.bind, context)
+				@endpoint.bind.map do |server|
+					::OpenSSL::SSL::SSLServer.new(server, context)
+				end
 			end
 		end
 		
@@ -73,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, context)
 			
 			if hostname = self.hostname
 				socket.hostname = hostname
@@ -102,13 +136,6 @@ module IO::Endpoint
 				yield self.class.new(endpoint, **@options)
 			end
 		end
-		
-		protected
-		
-		def accepted(socket)
-			socket.accept
-			socket
-		end
 	end
 
 	# @param arguments

data/lib/io/endpoint/version.rb

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

data/readme.md

@@ -18,6 +18,14 @@ We welcome contributions to this project.
 4.  Push to the branch (`git push origin my-new-feature`).
 5.  Create new Pull Request.
 
+### Developer Certificate of Origin
+
+This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this project must agree to this document to have their contributions accepted.
+
+### Contributor Covenant
+
+This project is governed by the [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and participants agree to abide by its terms.
+
 ## See Also
 
   - [async-io](https://github.com/socketry/async-io) — Asynchronous IO primitives.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-endpoint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,50 +37,8 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-12-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: covered
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2023-12-28 00:00:00.000000000 Z
+dependencies: []
 description:
 email:
 executables: []
@@ -120,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Provides a separation of concerns interface for IO endpoints.