async-io 1.28.0 → 1.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3efc5254f6ca150d428d1a13eeaf36775c9a7f0fe3f3859069eb30db4d6b907
-  data.tar.gz: 287aa5c3bd8e31304a3d60a7f278bd48307224aa457b67ec766d9c160731a37c
+  metadata.gz: a4bd452ecb8105b456fde28d2af79a2d4b360bac0cad9e7e35cc4f71c6c852d1
+  data.tar.gz: b629d8aed875e23295b8ab01da8b22c5f02a5fc79775a8afddae032531557d73
 SHA512:
-  metadata.gz: e8be3b2eb8024ebcea499eafe4845415684ab56a7a952141ef4cccb0e91fb7cde2f439734cb4a126051e9de3f349eb15ee59e65f55292d8705cd900c6ebfca4e
-  data.tar.gz: 9b46e1c7eb93a45e72cd5b0698b57213f31b4f8fc23c546f0bf887fd1e0cc17c9978fa03adb52f58cffb8a4b53df87bb16a514d02b676d7913102e57bac11df8
+  metadata.gz: b905369d33bf79d557dcaee2a68ad24979295d64a746e7d05ae182a2cd00abba3db1c8d93e86e4eda525468ef3875adeb747cee9d95439e20a0246c49d9255f3
+  data.tar.gz: 5dba169bd0668e39aba12df17e53ee2f70a211be0b41e5fc6a9b5a1f0e59336b29ac534b67f40014410c70355753bc92be1951929bd6a36df9a166764e5a9c88

data/lib/async/io/host_endpoint.rb

@@ -77,7 +77,7 @@ module Async
 			# @yield [Socket] the bound socket
 			# @return [Array<Socket>] an array of bound sockets
 			def bind(&block)
-				Addrinfo.foreach(*@specification).collect do |address|
+				Addrinfo.foreach(*@specification).map do |address|
 					Socket.bind(address, **@options, &block)
 				end
 			end

data/lib/async/io/peer.rb

@@ -59,13 +59,13 @@ module Async
 				when 0, IPPROTO_TCP
 					self.setsockopt(IPPROTO_TCP, TCP_NODELAY, value ? 1 : 0)
 				else
-					Async.logger.warn(self) {"Unsure how to sync=#{value} for #{self.protocol}!"}
+					Console.logger.warn(self) {"Unsure how to sync=#{value} for #{self.protocol}!"}
 				end
 			rescue Errno::EINVAL
 				# 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.
-				# Async.logger.warn(self) {"Unable to set sync=#{value}!"}
+				# Console.logger.warn(self) {"Unable to set sync=#{value}!"}
 			end
 			
 			def sync

data/lib/async/io/socket.rb

@@ -116,7 +116,7 @@ module Async
 			# @param remote_address [Address] The remote address to connect to.
 			# @option local_address [Address] The local address to bind to before connecting.
 			def self.connect(remote_address, local_address: nil, task: Task.current, **options)
-				Async.logger.debug(self) {"Connecting to #{remote_address.inspect}"}
+				Console.logger.debug(self) {"Connecting to #{remote_address.inspect}"}
 				
 				task.annotate "connecting to #{remote_address.inspect}"
 				
@@ -154,7 +154,7 @@ module Async
 			# @param local_address [Address] The local address to bind to.
 			# @option protocol [Integer] The socket protocol to use.
 			def self.bind(local_address, protocol: 0, task: Task.current, **options, &block)
-				Async.logger.debug(self) {"Binding to #{local_address.inspect}"}
+				Console.logger.debug(self) {"Binding to #{local_address.inspect}"}
 				
 				wrapper = build(local_address.afamily, local_address.socktype, protocol, **options) do |socket|
 					socket.bind(local_address.to_sockaddr)

data/lib/async/io/ssl_socket.rb

@@ -30,7 +30,7 @@ module Async
 		
 		# Asynchronous TCP socket wrapper.
 		class SSLSocket < Generic
-			wraps OpenSSL::SSL::SSLSocket, :alpn_protocol, :cert, :cipher, :client_ca, :context, :getsockopt, :hostname, :hostname=, :npn_protocol, :peer_cert, :peer_cert_chain, :pending, :post_connection_check, :setsockopt, :session, :session=, :session_reused?, :ssl_version, :state, :sync_close, :sync_close=, :sysclose, :verify_result, :tmp_key
+			wraps OpenSSL::SSL::SSLSocket, :alpn_protocol, :cert, :cipher, :client_ca, :context, :finished_message, :peer_finished_message, :getsockopt, :hostname, :hostname=, :npn_protocol, :peer_cert, :peer_cert_chain, :pending, :post_connection_check, :setsockopt, :session, :session=, :session_reused?, :ssl_version, :state, :sync_close, :sync_close=, :sysclose, :verify_result, :tmp_key
 			
 			wrap_blocking_method :accept, :accept_nonblock
 			wrap_blocking_method :connect, :connect_nonblock
@@ -68,6 +68,7 @@ module Async
 					super
 				else
 					io = self.class.wrapped_klass.new(socket.to_io, context)
+					super(io, socket.reactor)
 					
 					# We detach the socket from the reactor, otherwise it's possible to add the file descriptor to the selector twice, which is bad.
 					socket.reactor = nil
@@ -75,10 +76,7 @@ module Async
 					# This ensures that when the internal IO is closed, it also closes the internal socket:
 					io.sync_close = true
 					
-					# Copy the timeout:
 					@timeout = socket.timeout
-					
-					super(io, socket.reactor)
 				end
 			end
 			

data/lib/async/io/stream.rb

@@ -259,13 +259,13 @@ module Async
 				
 				if @read_buffer.empty?
 					if @io.read_nonblock(size, @read_buffer, exception: false)
-						# Async.logger.debug(self, name: "read") {@read_buffer.inspect}
+						# Console.logger.debug(self, name: "read") {@read_buffer.inspect}
 						return true
 					end
 				else
 					if chunk = @io.read_nonblock(size, @input_buffer, exception: false)
 						@read_buffer << chunk
-						# Async.logger.debug(self, name: "read") {@read_buffer.inspect}
+						# Console.logger.debug(self, name: "read") {@read_buffer.inspect}
 						
 						return true
 					end

data/lib/async/io/tcp_socket.rb

@@ -40,7 +40,7 @@ module Async
 					# We do this unusual dance to avoid leaking an "open" socket instance.
 					socket = Socket.connect(remote_address, local_address: local_address)
 					fd = socket.fcntl(Fcntl::F_DUPFD)
-					Async.logger.debug(self) {"Connected to #{remote_address.inspect}: #{fd}"}
+					Console.logger.debug(self) {"Connected to #{remote_address.inspect}: #{fd}"}
 					socket.close
 					
 					super(::TCPSocket.for_fd(fd))

data/{spec/async/io/socket/udp_spec.rb → lib/async/io/threads.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# Copyright, 2020, by Samuel G. D. Williams. <http://www.codeotaku.com>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -20,44 +20,64 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/io/udp_socket'
+require_relative 'notification'
 
-RSpec.describe Async::IO::Socket do
-	include_context Async::RSpec::Reactor
-	
-	# Shared port for localhost network tests.
-	let(:server_address) {Async::IO::Address.udp("127.0.0.1", 6778)}
-	let(:data) {"The quick brown fox jumped over the lazy dog."}
-	
-	let!(:server_task) do
-		reactor.async do
-			Async::IO::Socket.bind(server_address) do |server|
-				packet, address = server.recvfrom(512)
-				
-				server.send(packet, 0, address)
+module Async
+	module IO
+		class Threads
+			def initialize(parent: nil)
+				@parent = parent
 			end
-		end
-	end
-	
-	describe 'basic udp server' do
-		it "should echo data back to peer" do
-			reactor.async do
-				Async::IO::Socket.connect(server_address) do |client|
-					client.send(data)
-					response = client.recv(512)
-					
-					expect(response).to be == data
+			
+			if Async::Scheduler.supported?
+				def async(parent: (@parent or Task.current))
+					parent.async do
+						thread = ::Thread.new do
+							yield
+						end
+						
+						thread.join
+					rescue Stop
+						if thread&.alive?
+							thread.raise(Stop)
+						end
+						
+						begin
+							thread.join
+						rescue Stop
+							# Ignore.
+						end
+					end
 				end
-			end
-		end
-		
-		it "should use unconnected socket" do
-			reactor.async do
-				Async::IO::UDPSocket.wrap(server_address.afamily) do |client|
-					client.send(data, 0, server_address)
-					response, address = client.recvfrom(512)
-					
-					expect(response).to be == data
+			else
+				def async(parent: (@parent or Task.current))
+					parent.async do |task|
+						notification = Async::IO::Notification.new
+						
+						thread = ::Thread.new do
+							yield
+						ensure
+							notification.signal
+						end
+						
+						task.annotate "Waiting for thread to finish..."
+						
+						notification.wait
+						
+						thread.value
+					ensure
+						if thread&.alive?
+							thread.raise(Stop)
+							
+							begin
+								thread.join
+							rescue Stop
+								# Ignore.
+							end
+						end
+						
+						notification&.close
+					end
 				end
 			end
 		end

data/lib/async/io/trap.rb

@@ -36,6 +36,10 @@ module Async
 				@mutex = Mutex.new
 			end
 			
+			def to_s
+				"\#<#{self.class} #{@name}>"
+			end
+			
 			# Ignore the trap within the current process. Can be invoked before forking and/or invoking `install!` to assert default behaviour.
 			def ignore!
 				Signal.trap(@name, :IGNORE)
@@ -87,9 +91,10 @@ module Async
 			# Deprecated.
 			alias trap wait
 			
-			def async(parent: Task.current, &block)
-				parent.async do |task|
-					self.trap(task: task, &block)
+			# In order to avoid blocking the reactor, specify `transient: true` as an option.
+			def async(parent: Task.current, **options, &block)
+				parent.async(**options) do |task|
+					self.wait(task: task, &block)
 				end
 			end
 			

data/lib/async/io/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module IO
-		VERSION = "1.28.0"
+		VERSION = "1.31.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.31.0
 platform: ruby
 authors:
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: async-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -39,21 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: async-container
+  name: bake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: covered
+  name: bake-bundler
+  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: bake-modernize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bake-bundler
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,36 +136,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
-- Gemfile
-- README.md
-- async-io.gemspec
-- examples/allocations/byteslice.rb
-- examples/allocations/memory.rb
-- examples/allocations/read_chunks.rb
-- examples/chat/client.rb
-- examples/chat/server.rb
-- examples/defer/worker.rb
-- examples/echo/client.rb
-- examples/echo/server.rb
-- examples/issues/broken_ssl.rb
-- examples/issues/pipes.rb
-- examples/millions/client.rb
-- examples/millions/server.rb
-- examples/udp/client.rb
-- examples/udp/server.rb
-- gems/nio4r-2.3.gemfile
 - lib/async/io.rb
 - lib/async/io/address.rb
 - lib/async/io/address_endpoint.rb
@@ -160,49 +164,23 @@ files:
 - lib/async/io/standard.rb
 - lib/async/io/stream.rb
 - lib/async/io/tcp_socket.rb
+- lib/async/io/threads.rb
 - lib/async/io/trap.rb
 - lib/async/io/udp_socket.rb
 - lib/async/io/unix_endpoint.rb
 - lib/async/io/unix_socket.rb
 - lib/async/io/version.rb
-- spec/addrinfo.rb
-- spec/async/io/buffer_spec.rb
-- spec/async/io/c10k_spec.rb
-- spec/async/io/echo_spec.rb
-- spec/async/io/endpoint_spec.rb
-- spec/async/io/generic_examples.rb
-- spec/async/io/generic_spec.rb
-- spec/async/io/notification_spec.rb
-- spec/async/io/protocol/line_spec.rb
-- spec/async/io/shared_endpoint/server_spec.rb
-- spec/async/io/shared_endpoint_spec.rb
-- spec/async/io/socket/tcp_spec.rb
-- spec/async/io/socket/udp_spec.rb
-- spec/async/io/socket_spec.rb
-- spec/async/io/ssl_server_spec.rb
-- spec/async/io/ssl_socket_spec.rb
-- spec/async/io/standard_spec.rb
-- spec/async/io/stream_context.rb
-- spec/async/io/stream_spec.rb
-- spec/async/io/tcp_socket_spec.rb
-- spec/async/io/trap_spec.rb
-- spec/async/io/udp_socket_spec.rb
-- spec/async/io/unix_endpoint_spec.rb
-- spec/async/io/unix_socket_spec.rb
-- spec/async/io/wrap/http_rb_spec.rb
-- spec/async/io/wrap/tcp_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/socketry/async-io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -211,35 +189,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Provides support for asynchonous TCP, UDP, UNIX and SSL sockets.
-test_files:
-- spec/addrinfo.rb
-- spec/async/io/buffer_spec.rb
-- spec/async/io/c10k_spec.rb
-- spec/async/io/echo_spec.rb
-- spec/async/io/endpoint_spec.rb
-- spec/async/io/generic_examples.rb
-- spec/async/io/generic_spec.rb
-- spec/async/io/notification_spec.rb
-- spec/async/io/protocol/line_spec.rb
-- spec/async/io/shared_endpoint/server_spec.rb
-- spec/async/io/shared_endpoint_spec.rb
-- spec/async/io/socket/tcp_spec.rb
-- spec/async/io/socket/udp_spec.rb
-- spec/async/io/socket_spec.rb
-- spec/async/io/ssl_server_spec.rb
-- spec/async/io/ssl_socket_spec.rb
-- spec/async/io/standard_spec.rb
-- spec/async/io/stream_context.rb
-- spec/async/io/stream_spec.rb
-- spec/async/io/tcp_socket_spec.rb
-- spec/async/io/trap_spec.rb
-- spec/async/io/udp_socket_spec.rb
-- spec/async/io/unix_endpoint_spec.rb
-- spec/async/io/unix_socket_spec.rb
-- spec/async/io/wrap/http_rb_spec.rb
-- spec/async/io/wrap/tcp_spec.rb
-- spec/spec_helper.rb
+test_files: []