async-io 1.18.5 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4521c94506778f0d7e6f5dec2fe76bf6b6f0374ae3c327e29775063bd3393aaa
-  data.tar.gz: 56d1f0388b1d1a64a87dbb5086bcbd209602933ab805fae44ea6e699cc3eba8b
+  metadata.gz: 69adfd1cd876361c3b94bc80a5f5c164d45df0156a37c6f9fc54542a79bc443c
+  data.tar.gz: 32758166362e4780b7d251d4f649cdc2eb14fd4ab48a378be94968c5719053df
 SHA512:
-  metadata.gz: 7c84cb8f453e9b7c7f80af18443d04eaeca38e46172afbc1ec4f6c219123449a5b8744d72db0c282e2d3da8826f29aa64f331698608a589c9c35a761bc6531f4
-  data.tar.gz: 027bf4fc6e910b3e1fdf883f7aa6a98045131f43318a014f77bb6e1734d9e932f95bd54fb23b9237e9ef78bccb1f70fc52c424ece21020e31663ea3a6b151ffe
+  metadata.gz: 9fc9a5d6e563b8dbe9b2c700ce284ae905efb90a338b79ebed4daff5368912707355fe40efcbda243948e061bd0b143cd8e4bf22bf232dbc9afcf9d93aa5356b
+  data.tar.gz: 94d7271c1c6e50a84c3120ae408989b2caeab045a8b07e54d417d4bc6159eea35138cc20cc86ba879d4492e457aee75eaa078ad23d2826c80c21fa12ed24d128

data/Gemfile

@@ -12,7 +12,5 @@ group :test do
 	gem 'benchmark-ips'
 	gem 'ruby-prof', platforms: :mri
 	
-	gem 'async-container'
-
 	gem 'http'
 end

data/async-io.gemspec

@@ -19,7 +19,9 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency "async-rspec", "~> 1.10"
 
 	spec.required_ruby_version = '~> 2.3'
-
+	
+	spec.add_development_dependency "async-container", "~> 0.10.0"
+	
 	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "covered"
 	spec.add_development_dependency "rake", "~> 10.0"

data/examples/millions/client.rb

@@ -20,7 +20,9 @@ puts "Starting #{CONCURRENCY} processes, running #{TASKS} tasks, making #{REPEAT
 puts "Total number of connections: #{CONCURRENCY * TASKS * REPEATS}!"
 
 begin
-	container = Async::Container::Forked.new(concurrency: CONCURRENCY) do
+	container = Async::Container::Forked.new
+	
+	container.run(count: CONCURRENCY) do
 		Async do |task|
 			connections = []
 			

data/lib/async/io/address_endpoint.rb

@@ -28,7 +28,6 @@ module Async
 				super(**options)
 				
 				@address = address
-				@options = options
 			end
 			
 			def to_s
@@ -36,7 +35,6 @@ module Async
 			end
 			
 			attr :address
-			attr :options
 			
 			# 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
@@ -51,11 +49,5 @@ module Async
 				Socket.connect(@address, **@options, &block)
 			end
 		end
-		
-		class Endpoint
-			def self.unix(*args, **options)
-				AddressEndpoint.new(Address.unix(*args), **options)
-			end
-		end
 	end
 end

data/lib/async/io/socket.rb

@@ -50,10 +50,13 @@ module Async
 				when 0, Socket::IPPROTO_TCP
 					self.setsockopt(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, value ? 1 : 0)
 				else
-					warn "Unsure how to sync=#{value} for #{self.protocol}!"
+					Async.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}!"}
 			end
 			
 			def sync
@@ -138,6 +141,7 @@ module Async
 			alias accept_nonblock accept
 			alias sysaccept accept
 			
+			# Build and wrap the underlying io.
 			def self.build(*args, timeout: nil, task: Task.current)
 				socket = wrapped_klass.new(*args)
 				

data/lib/async/io/unix_endpoint.rb

@@ -0,0 +1,67 @@
+# Copyright, 2019, 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require_relative 'address_endpoint'
+
+module Async
+	module IO
+		# This class doesn't exert ownership over the specified unix socket and ensures exclusive access by using `flock` where possible.
+		class UNIXEndpoint < AddressEndpoint
+			def initialize(path, type, **options)
+				# I wonder if we should implement chdir behaviour in here if path is longer than 104 characters.
+				super(Address.unix(path, type), **options)
+				
+				@path = path
+			end
+			
+			def to_s
+				"\#<#{self.class} #{@path.inspect}>"
+			end
+			
+			attr :path
+			
+			def bound?
+				self.connect do
+					return true
+				end
+			rescue Errno::ECONNREFUSED
+				return false
+			end
+			
+			def bind(&block)
+				Socket.bind(@address, **@options, &block)
+			rescue Errno::EADDRINUSE
+				# If you encounter EADDRINUSE from `bind()`, you can check if the socket is actually accepting connections by attempting to `connect()` to it. If the socket is still bound by an active process, the connection will succeed. Otherwise, it should be safe to `unlink()` the path and try again.
+				if !bound? && File.exist?(@path)
+					File.unlink(@path)
+					retry
+				else
+					raise
+				end
+			end
+		end
+		
+		class Endpoint
+			def self.unix(path, type = ::Socket::SOCK_STREAM, **options)
+				UNIXEndpoint.new(path, type, **options)
+			end
+		end
+	end
+end

data/lib/async/io/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module IO
-		VERSION = "1.18.5"
+		VERSION = "1.20.0"
 	end
 end

data/spec/async/io/shared_endpoint/server_spec.rb

@@ -41,21 +41,26 @@ RSpec.shared_examples_for Async::IO::SharedEndpoint do |container_class|
 		end.wait
 	end
 	
+	let(:container) {container_class.new}
+	
 	it "can use bound endpoint in container" do
-		container = container_class.new(concurrency: 1) do
+		container.run(count: 1) do
 			bound_endpoint.accept do |peer|
 				peer.write "Hello World"
 				peer.close
 			end
 		end
 		
-		Async do
-			client_endpoint.connect do |peer|
-				expect(peer.read(11)).to eq "Hello World"
+		container.wait do
+			Async do
+				client_endpoint.connect do |peer|
+					expect(peer.read(11)).to eq "Hello World"
+				end
 			end
+			
+			container.stop(false)
 		end
 		
-		container.stop
 		bound_endpoint.close
 	end
 end

data/spec/async/io/unix_endpoint_spec.rb

@@ -0,0 +1,78 @@
+# Copyright, 2017, 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
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'async/io/unix_endpoint'
+
+RSpec.describe Async::IO::UNIXEndpoint do
+	include_context Async::RSpec::Reactor
+	
+	let(:data) {"The quick brown fox jumped over the lazy dog."} 
+	let(:path) {File.join(__dir__, "unix-socket")}
+	subject {described_class.unix(path)}
+	
+	before(:each) do
+		FileUtils.rm_f path
+	end
+	
+	after do
+		FileUtils.rm_f path
+	end
+	
+	it "should echo data back to peer" do
+		server_task = reactor.async do
+			subject.accept do |peer|
+				peer.send(peer.recv(512))
+			end
+		end
+		
+		reactor.async do
+			subject.connect do |client|
+				client.send(data)
+				
+				response = client.recv(512)
+				
+				expect(response).to be == data
+			end
+		end.wait
+		
+		server_task.stop
+	end
+	
+	it "should fails to bind if there is an existing binding" do
+		condition = Async::Condition.new
+		
+		reactor.async do
+			condition.wait
+			
+			expect do
+				subject.bind
+			end.to raise_error(Errno::EADDRINUSE)
+		end
+		
+		server_task = reactor.async do
+			subject.bind do |server|
+				server.listen(1)
+				condition.signal
+			end
+		end
+		
+		server_task.stop
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: async-io
 version: !ruby/object:Gem::Version
-  version: 1.18.5
+  version: 1.20.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: async-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,7 @@ files:
 - lib/async/io/tcp_socket.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
@@ -162,6 +177,7 @@ files:
 - 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
@@ -211,6 +227,7 @@ test_files:
 - 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