async-bus 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 354c43b3ef6922366c369eb209cede56b7bbca16d896b718ebfbe222eb7a4d97
-  data.tar.gz: 856c7c3cd32189b912d3115a3c218a1210215d4850391b18b7d0960be0686de9
+  metadata.gz: f0862030bd7ad9cf8ffe84a3e35e4ec52e3c3f3cc81b8192c5d59cc0bc435e3c
+  data.tar.gz: d2f9a0398f4aa94a35fc3d2dc8aa1d4097777e9f85eeab2ca19405e30d902aa5
 SHA512:
-  metadata.gz: a38c42252effdbadbacd1d15da7d1e76f2632085430e3954668d0cef74b18404462b3c51ed6303598510679707c75d0bdbce7b1cc622a1abd2d70d126e5d457b
-  data.tar.gz: da3e7ccca7be7eb09180aa85d62412393056c36a38aee64b418feaef02dd244367f636c7d6a4bbb4a2a88b3aa993b7ab8447885c2c14b8dda25a47f13725c713
+  metadata.gz: f4f6d79a2da0ecd4cba25ad79a2be878728701c01113c6f65aa6f9980a863a721f8863841bcfb1c0206f21e25bd0d1b4747a97102b3fbc2b5658dd045c1bf58d
+  data.tar.gz: ecc5632d806ceebbf5b61aebc85ae1b47118303cf9f03320ecc243b403ca7edb00cf60ee966a55cc7c247bd4969897ef10588a97940c55518603fd34afb7c6fc

data/lib/async/bus/protocol/connection.rb

@@ -54,8 +54,13 @@ module Async
 					@id = id
 					
 					@objects = {}
+					@proxies = ::ObjectSpace::WeakMap.new
+					@finalized = Thread::Queue.new
 				end
 				
+				attr :objects
+				attr :proxies
+				
 				attr :unpacker
 				attr :packer
 				
@@ -69,7 +74,7 @@ module Async
 				attr :transactions
 				
 				def proxy(object)
-					name = "proxy:#{object_id}"
+					name = next_id.to_s(16).freeze
 					
 					bind(name, object)
 					
@@ -80,11 +85,23 @@ module Async
 					@objects[name] = object
 				end
 				
+				private def finalize(name)
+					proc{@finalized << name}
+				end
+				
 				def [](name)
-					Proxy.new(self, name)
+					unless proxy = @proxies[name]
+						proxy = Proxy.new(self, name)
+						@proxies[name] = proxy
+						
+						ObjectSpace.define_finalizer(proxy, finalize(name))
+					end
+					
+					return proxy
 				end
 				
-				def invoke(name, arguments, options, &block)
+				def invoke(name, arguments, options = {}, &block)
+					
 					id = self.next_id
 					
 					transaction = Transaction.new(self, id)
@@ -94,11 +111,19 @@ module Async
 				end
 				
 				def run
-					# @unpacker.each do |message|
+					finalizer_task = Async do
+						while name = @finalized.pop
+							@packer.write([:release, name])
+						end
+					end
+					
 					@unpacker.each do |message|
 						id = message.shift
 						
-						if transaction = @transactions[id]
+						if id == :release
+							name = message.shift
+							@objects.delete(name) if name.is_a?(String)
+						elsif transaction = @transactions[id]
 							transaction.received.enqueue(message)
 						elsif message.first == :invoke
 							message.shift
@@ -119,11 +144,14 @@ module Async
 						end
 					end
 				ensure
+					finalizer_task.stop
+					
 					@transactions.each do |id, transaction|
 						transaction.close
 					end
 					
 					@transactions.clear
+					@proxies = ::ObjectSpace::WeakMap.new
 				end
 				
 				def close

data/lib/async/bus/protocol/proxy.rb

@@ -22,21 +22,53 @@ module Async
 	module Bus
 		module Protocol
 			class Proxy < BasicObject
-				def initialize(bus, name)
-					@bus = bus
+				def initialize(connection, name)
+					@connection = connection
 					@name = name
 				end
 				
+				def !
+					@connection.invoke(@name, [:!])
+				end
+				
+				def == object
+					@connection.invoke(@name, [:==, object])
+				end
+				
+				def != object
+					@connection.invoke(@name, [:!=, object])
+				end
+				
+				def eql?(other)
+					self.equal?(other)
+				end
+				
+				def methods(all = true)
+					@connection.invoke(@name, [:methods, all]) | super
+				end
+				
+				def protected_methods(all = true)
+					@connection.invoke(@name, [:protected_methods, all]) | super
+				end
+				
+				def public_methods(all = true)
+					@connection.invoke(@name, [:public_methods, all]) | super
+				end
+				
 				def inspect
-					"[Proxy #{method_missing(:inspect)}]"
+					"[Proxy (#{@name}) #{method_missing(:inspect)}]"
 				end
 				
 				def method_missing(*arguments, **options, &block)
-					@bus.invoke(@name, arguments, options, &block)
+					@connection.invoke(@name, arguments, options, &block)
 				end
 				
 				def respond_to?(name, include_all = false)
-					@bus.invoke(@name, [:respond_to?, name, include_all])
+					@connection.invoke(@name, [:respond_to?, name, include_all])
+				end
+				
+				def respond_to_missing?(name, include_all = false)
+					@connection.invoke(@name, [:respond_to?, name, include_all]) || super
 				end
 			end
 		end

data/lib/async/bus/protocol/transaction.rb

@@ -61,6 +61,8 @@ module Async
 				
 				# Invoke a remote procedure.
 				def invoke(name, arguments, options, &block)
+					Console.logger.debug(self) {[name, arguments, options, block]}
+					
 					self.write(:invoke, name, arguments, options, block_given?)
 					
 					while response = self.read

data/lib/async/bus/version.rb

@@ -22,6 +22,6 @@
 
 module Async
 	module Bus
-		VERSION = "0.1.0"
+		VERSION = "0.1.1"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: async-bus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -74,12 +74,10 @@ extra_rdoc_files: []
 files:
 - lib/async/bus.rb
 - lib/async/bus/client.rb
-- lib/async/bus/local.rb
 - lib/async/bus/protocol/connection.rb
 - lib/async/bus/protocol/proxy.rb
 - lib/async/bus/protocol/transaction.rb
 - lib/async/bus/protocol/wrapper.rb
-- lib/async/bus/remote.rb
 - lib/async/bus/server.rb
 - lib/async/bus/version.rb
 homepage: https://github.com/socketry/async-bus

data/lib/async/bus/local.rb

@@ -1,61 +0,0 @@
-# Copyright, 2018, 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 'proxy'
-
-module Async
-	module Bus
-		class Local
-			def initialize
-				@instances = {}
-			end
-			
-			def close
-				@instances.clear
-			end
-			
-			def []= name, instance
-				@instances[name] = instance
-				
-				Proxy.new(self, name, instance)
-			end
-			
-			def [] name
-				Proxy.new(self, name, @instances[name])
-			end
-			
-			class Proxy < Bus::Proxy
-				def initialize(name, bus, instance)
-					super(name, bus)
-					
-					@instance = instance
-				end
-				
-				def method_missing(name, *args, &block)
-					@instance.send(name, *args, &block)
-				end
-				
-				def respond_to?(*args)
-					@instance.respond_to?(*args)
-				end
-			end
-		end
-	end
-end

data/lib/async/bus/remote.rb

@@ -1,69 +0,0 @@
-# Copyright, 2018, 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 'proxy'
-
-module Async
-	module Bus
-		class Remote
-			def initialize(connection)
-				@connection = connection
-			end
-			
-			def close
-				@instances.clear
-			end
-			
-			def []= name, instance
-				@instances[name] = instance
-				
-				@connection.
-				
-				Proxy.new(self, name, instance)
-			end
-			
-			def [] name
-				Proxy.new(self, name, @instances[name])
-			end
-			
-			def invoke(name, *arguments, **options, &block)
-				@connection.invoke(name, arguments, options, block_given?) do |transaction|
-					while response = transaction.read
-						what, *arguments = response
-						
-						case what
-						when :error
-							raise(*arguments)
-						when :return
-							return(*arguments)
-						when :yield
-							begin
-								result = yield(*arguments)
-								transaction.write(:next, result)
-							rescue => error
-								transaction.write(:error, error)
-							end
-						end
-					end
-				end
-			end
-		end
-	end
-end