io-endpoint 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 204ed5172990d0df3a5d02e63b8e75d8caaf161808fea4e99b67f0d422241cc6
-  data.tar.gz: 7ba7e7052949565c4cb327076c493db15d6f3057493f93d4210ec5ac5bc7808b
+  metadata.gz: 3f76dc33db329c9e393c817dbc679a3d06c1f523eda8740edd25447ed39f5a1b
+  data.tar.gz: 3917511b6a08184cad66e734120d8ea039b15645b9f0c1b256a5149372628e56
 SHA512:
-  metadata.gz: 12aa8f963bc0787de988e9efcf80fbff38a857e8130e663ed8c329402048ab9e1940dcc2637f17de2f77f43d9222914808b5ec89e91420ed0d07475dbabc9d0e
-  data.tar.gz: ce830974878205da1f7e91378af0bdb05f1a4017cc60715c2dca5607573992f38d97712e6b879d99ab31db95a5b12c40ab3df959da12cc56f4b2189dd37b314e
+  metadata.gz: 9b685cf7785946c7a856eaf7859ce6c8427c0ad1df532b188c1049432b474afd289fe7e31eff9ee6c4c608d42022b84e48d4b963de563b83482a6daa572520e8
+  data.tar.gz: f2a96e35cce3eea736e3ac25eabd3674d595753cdfa3caa652f28da4e9793d7d7d51d3518731018ac19716c779092eaea90d51813504cadca6193a64709fe4e1

data/lib/io/endpoint/ssl_endpoint.rb

@@ -17,7 +17,7 @@ module OpenSSL
 				end
 			end
 			
-			unless method_defined?(:close_on_exec)
+			unless method_defined?(:local_address)
 				def local_address
 					to_io.local_address
 				end

data/lib/io/endpoint/version.rb

@@ -5,6 +5,6 @@
 
 class IO
 	module Endpoint
-		VERSION = "0.5.0"
+		VERSION = "0.7.0"
 	end
 end

data/lib/io/endpoint/wrapper.rb

@@ -147,11 +147,17 @@ module IO::Endpoint
 		end
 		
 		# Bind to a local address and accept connections in a loop.
-		def accept(server, timeout: nil, &block)
+		def accept(server, timeout: nil, linger: nil, **options, &block)
 			while true
 				socket, address = server.accept
 				
-				set_timeout(socket, timeout) if timeout != false
+				if linger
+					socket.setsockopt(SOL_SOCKET, SO_LINGER, 1)
+				end
+				
+				if timeout
+					set_timeout(socket, timeout)
+				end
 				
 				async do
 					yield socket, address

data/lib/io/endpoint.rb

@@ -7,6 +7,8 @@ require_relative "endpoint/version"
 require_relative "endpoint/generic"
 require_relative "endpoint/shared_endpoint"
 
+require_relative 'readable'
+
 module IO::Endpoint
 	def self.file_descriptor_limit
 		Process.getrlimit(Process::RLIMIT_NOFILE).first

data/lib/io/readable.rb

@@ -0,0 +1,56 @@
+class IO
+	unless method_defined?(:readable?)
+		def readable?
+			if self.wait_readable(0).nil?
+				# timeout means it is not eof
+				return true
+			else
+				!self.eof?
+			end
+		end
+	end
+end
+
+require 'socket'
+
+class BasicSocket
+	unless method_defined?(:readable?)
+		def readable?
+			# 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
+end
+
+require 'stringio'
+
+class StringIO
+	unless method_defined?(:readable?)
+		def readable?
+			!eof?
+		end
+	end
+end
+
+require 'openssl'
+
+class OpenSSL::SSL::SSLSocket
+	unless method_defined?(:readable?)
+		def readable?
+			to_io.readable?
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io-endpoint
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-04-20 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -45,7 +45,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/io/connected.rb
 - lib/io/endpoint.rb
 - lib/io/endpoint/address_endpoint.rb
 - lib/io/endpoint/bound_endpoint.rb
@@ -59,6 +58,7 @@ files:
 - lib/io/endpoint/unix_endpoint.rb
 - lib/io/endpoint/version.rb
 - lib/io/endpoint/wrapper.rb
+- lib/io/readable.rb
 - license.md
 - readme.md
 homepage: https://github.com/socketry/io-endpoint

data/lib/io/connected.rb

@@ -1,27 +0,0 @@
-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