toq 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fa9dccb95205fadf37ce8a48a133f6e08f5c1f5d07f2377041562c3a08e39b3
-  data.tar.gz: d0ed2e661f09eda4815eed365c3397fa920192e8c42e8cc55109733d66229c71
+  metadata.gz: c4a52cfe51fc062860cb41237c2453b35ccc2b7c7447491a8fb0e3bb5578c26c
+  data.tar.gz: 58c73eef95e49b2cd66ab977b3d6fc70a3705f0a79000c0c2db05bc50804618f
 SHA512:
-  metadata.gz: 795adb9468a8b873b8c9f8fe41726368eb2314abf531f8d011d6606fbe519b011ccf0ceb10e5a52682b6ed4dee6b7abd14acd6b913357a5e6f31c81c201d8ac1
-  data.tar.gz: 26a6fbf1afa05c8cc0d8702bdc0e40a0597ff26c235c71ca0e079b33f0686f99990d2a102927281690f49c506503d114f8306d30a6621257245f55e5acf9801c
+  metadata.gz: e74a30760feac7886f77c025f975df9fd9d4cb0aa36d8f3105f74b1fbbc43508b259db5a2f6d443f268b88174b6cdc9f17149766f88ed3b47408b9363a099d79
+  data.tar.gz: d9cde530727fdb95148c404a0d02884c46278f2537d88c55e99e1c0393a056b892ae9d9aa01bfaa9acfb47f23a28a4cca6dd67a8a9e627cb150cb276d3614ae7

data/CHANGELOG.md

@@ -1,5 +1 @@
 # ChangeLog
-
-# 0.0.3
-
- - Don't whitelist public methods, they could have changed dynamically after server start.

data/README.md

@@ -3,12 +3,12 @@
 <table>
     <tr>
         <th>Version</th>
-        <td>0.0.1</td>
+        <td>0.0.4</td>
     </tr>
     <tr>
         <th>Github page</th>
         <td><a href="http://github.com/qadron/toq">http://github.com/qadron/toq</a></td>
-     <tr/>
+     </tr>
     <tr>
         <th>Code Documentation</th>
         <td><a href="http://rubydoc.info/github/qadron/toq/">http://rubydoc.info/github/qadron/toq/</a></td>

data/Rakefile

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/client/handler.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC EM
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq EM
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/client.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC EM
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq EM
     web site for more information on licensing and terms of use.
 
 =end
@@ -22,6 +22,8 @@ class Client
     # Default amount of connections to maintain in the re-use pool.
     DEFAULT_CONNECTION_POOL_SIZE = 1
 
+    attr_reader :reactor
+
     # @return   [Hash]
     #   Options hash.
     attr_reader :opts
@@ -87,7 +89,11 @@ class Client
 
         @pool_size = @opts[:connection_pool_size] || DEFAULT_CONNECTION_POOL_SIZE
 
-        @reactor = Raktr.global
+        @reactor = Raktr.new
+
+        @reactor.on_error do |e|
+            p e
+        end
 
         @connections      = @reactor.create_queue
         @connection_count = 0
@@ -200,7 +206,13 @@ class Client
     def set_exception( req, e )
         msg = @socket ? " for '#{@socket}'." : " for '#{@host}:#{@port}'."
 
-        exc = Exceptions::ConnectionError.new( e.to_s + msg )
+        exc = case e
+            when Errno::ENOENT, Errno::EACCES
+                Exceptions::ConnectionError.new( e.to_s + msg )
+
+            else
+                Exception.new( e.to_s + msg )
+        end
 
         exc.set_backtrace e.backtrace
         req.callback.call exc

data/lib/toq/exceptions.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/message.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/protocol.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC EM
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq EM
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/proxy.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/request.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/response.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/server/handler.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC EM project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC EM
+    This file is part of the Toq EM project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq EM
     web site for more information on licensing and terms of use.
 
 =end

data/lib/toq/server.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC EM project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC EM
+    This file is part of the Toq EM project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq EM
     web site for more information on licensing and terms of use.
 
 =end
@@ -29,6 +29,8 @@ class Server
     # @return   [Logger]
     attr_reader :logger
 
+    attr_reader :reactor
+
     # Starts the RPC server.
     #
     # @example  Example options:
@@ -98,6 +100,10 @@ class Server
 
         @reactor = Raktr.global
 
+        @reactor.on_error do |e|
+            @logger.error( 'System' ){ "#{e}" }
+        end
+
         clear_handlers
     end
 
@@ -128,13 +134,7 @@ class Server
     # @param    [Object]    obj
     #   Instantiated server object to expose.
     def add_handler( name, obj )
-        @objects[name]       = obj
-        @methods[name]       = Set.new
-        @async_methods[name] = Set.new
-
-        obj.class.public_instance_methods( false ).each do |method|
-            @async_methods[name] << method.to_s if async_check( obj.method( method ) )
-        end
+        @objects[name] = obj
     end
 
     # Clears all handlers and their associated information like methods and
@@ -144,20 +144,23 @@ class Server
     # @see #add_async_check
     def clear_handlers
         @objects = {}
-        @methods = {}
-
-        @async_checks  = []
-        @async_methods = {}
+        @async_checks = []
     end
 
     # Runs the server and blocks while `Raktr` is running.
     def run
-        @reactor.run { start }
+        @reactor.run do
+            @reactor.on_error do |e|
+                @logger.error( 'System' ){ "#{e}" }
+            end
+
+            start
+        end
     end
 
     # Starts the server but does not block.
     def start
-        @logger.info( 'System' ){ 'RPC Server started.' }
+        @logger.info( 'System' ){ "[PID #{Process.pid}] RPC Server started." }
         @logger.info( 'System' ) do
             interface = @socket ? @socket : "#{@host}:#{@port}"
             "Listening on #{interface}"
@@ -228,7 +231,7 @@ class Server
     private
 
     def async?( objname, method )
-        @async_methods[objname].include?( method )
+        async_check( @objects[objname].method( method ) )
     end
 
     def async_check( method )
@@ -257,7 +260,7 @@ class Server
     end
 
     def object_exist?( obj_name )
-        @objects[obj_name] ? true : false
+        !!@objects[obj_name]
     end
 
 end

data/lib/toq/version.rb

@@ -1,13 +1,13 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq
     web site for more information on licensing and terms of use.
 
 =end
 
 module Toq
 
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
 
 end

data/lib/toq.rb

@@ -1,7 +1,7 @@
 =begin
 
-    This file is part of the Arachni-RPC project and may be subject to
-    redistribution and commercial restrictions. Please see the Arachni-RPC
+    This file is part of the Toq project and may be subject to
+    redistribution and commercial restrictions. Please see the Toq
     web site for more information on licensing and terms of use.
 
 =end

data/spec/servers/server.rb

@@ -19,7 +19,7 @@ def rpc_opts_with_socket
     opts.delete( :host )
     opts.delete( :port )
 
-    opts.merge( socket: '/tmp/arachni-rpc-test' )
+    opts.merge( socket: '/tmp/toq-rpc-test' )
 end
 
 def rpc_opts_with_ssl_primitives
@@ -53,12 +53,8 @@ end
 
 class Test < Parent
 
-    # In order to make inherited methods accessible you've got to explicitly
-    # make them public.
-    private :foo
-    public  :foo
-
     def delay( arg, &block )
+        Raktr.global.run_in_thread if !Raktr.global.running?
         Raktr.global.delay( 1 ) { block.call( arg ) }
     end
 

data/spec/servers/unix_socket.rb

@@ -1,7 +1,7 @@
 require_relative 'server'
 
 opts = rpc_opts.merge(
-    socket:     '/tmp/arachni-rpc-test',
+    socket:     '/tmp/toq-rpc-test',
     serializer: Marshal
 )
 

data/spec/spec_helper.rb

@@ -21,8 +21,10 @@ RSpec.configure do |config|
     config.color = true
     config.add_formatter :documentation
 
+    # config.filter_run_including focus: true
+
     config.before( :suite ) do
-        File.delete( '/tmp/arachni-rpc-test' ) rescue nil
+        File.delete( '/tmp/toq-rpc-test' ) rescue nil
 
         files = %w(basic with_ssl_primitives)
         files << 'unix_socket' if Raktr.supports_unix_sockets?
@@ -30,7 +32,7 @@ RSpec.configure do |config|
         files.each do |name|
             server_pids << quiet_spawn( name ).tap { |pid| Process.detach( pid ) }
         end
-        sleep 5
+        sleep 1
     end
 
     config.after( :suite ) do

data/spec/toq/client_spec.rb

@@ -3,13 +3,11 @@ require 'spec_helper'
 describe Toq::Client do
 
     def wait
-        Raktr.global.wait rescue Raktr::Error::NotRunning
+        reactor.wait rescue reactor::Error::NotRunning
     end
 
     before(:each) do
-        if Raktr.global.running?
-            Raktr.stop
-        end
+        reactor.stop if reactor.running?
     end
 
     let(:arguments) do
@@ -20,7 +18,7 @@ describe Toq::Client do
             [ 4 ]
         ]
     end
-    let(:reactor) { Raktr.global }
+    let(:reactor) { subject.reactor }
     let(:handler) { 'test' }
     let(:remote_method) { 'foo' }
     let(:options) { rpc_opts }
@@ -69,7 +67,7 @@ describe Toq::Client do
                             subject.call( "#{handler}.#{remote_method}", arg ) do |res|
                                 cnt += 1
                                 mismatches << [i, arg, res] if arg != res
-                                Raktr.stop if cnt == n || mismatches.any?
+                                reactor.stop if cnt == n || mismatches.any?
                             end
                         end
                         wait
@@ -86,7 +84,7 @@ describe Toq::Client do
                         response = nil
                         call do |res|
                             response = res
-                            Raktr.stop
+                            reactor.stop
                         end
                         wait
 
@@ -167,7 +165,7 @@ describe Toq::Client do
                     subject.call( "#{handler}.#{remote_method}", arg ) do |res|
                         cnt += 1
                         mismatches << [i, arg, res] if arg != res
-                        Raktr.stop if cnt == n || mismatches.any?
+                        reactor.stop if cnt == n || mismatches.any?
                     end
                 end
 
@@ -187,7 +185,7 @@ describe Toq::Client do
                 response = nil
                 call do |res|
                     response = res
-                    Raktr.stop
+                    reactor.stop
                 end
                 wait
 
@@ -199,11 +197,10 @@ describe Toq::Client do
             it 'should be able to perform asynchronous calls' do
                 response = nil
 
-                Raktr.stop
                 reactor.run do
                     call do |res|
                         response = res
-                        Raktr.stop
+                        reactor.stop
                     end
                 end
 
@@ -213,13 +210,12 @@ describe Toq::Client do
             it 'should not be able to perform synchronous calls' do
                 exception = nil
 
-                Raktr.stop
                 reactor.run do
                     begin
                         call
                     rescue => e
                         exception = e
-                        Raktr.stop
+                        reactor.stop
                     end
                 end
 
@@ -235,7 +231,7 @@ describe Toq::Client do
                     response = nil
                     call do |res|
                         response = res
-                        Raktr.stop
+                        reactor.stop
                     end
                     wait
 
@@ -252,7 +248,7 @@ describe Toq::Client do
 
                     call do |res|
                         response = res
-                        Raktr.stop
+                        reactor.stop
                     end
                     wait
 
@@ -261,6 +257,23 @@ describe Toq::Client do
                 end
             end
 
+            # context 'and requesting a non-public method' do
+            #     let(:remote_method) { 'bar' }
+            #
+            #     it "returns #{Toq::Exceptions::InvalidMethod}" do
+            #         response = nil
+            #
+            #         call do |res|
+            #             response = res
+            #             reactor.stop
+            #         end
+            #         wait
+            #
+            #         response.should be_rpc_invalid_method_error
+            #         response.should be_kind_of Toq::Exceptions::InvalidMethod
+            #     end
+            # end
+
             context 'and there is a remote exception' do
                 let(:remote_method) { :exception }
 
@@ -268,7 +281,7 @@ describe Toq::Client do
                     response = nil
                     call do |res|
                         response = res
-                        Raktr.stop
+                        reactor.stop
                     end
                     wait
 
@@ -305,6 +318,19 @@ describe Toq::Client do
                 end
             end
 
+            # context 'and requesting a non-public method' do
+            #     let(:remote_method) { 'bar' }
+            #
+            #     it "raises #{Toq::Exceptions::InvalidMethod}" do
+            #         begin
+            #             call
+            #         rescue => e
+            #             e.rpc_invalid_method_error?.should be_true
+            #             e.should be_kind_of Toq::Exceptions::InvalidMethod
+            #         end
+            #     end
+            # end
+
             context 'and there is a remote exception' do
                 let(:remote_method) { :exception }
 
@@ -333,11 +359,10 @@ describe Toq::Client do
             it 'should not be able to establish a connection' do
                 response = nil
 
-                Raktr.stop
                 reactor.run do
                     call do |res|
                         response = res
-                        Raktr.stop
+                        reactor.stop
                     end
                 end
 
@@ -351,11 +376,10 @@ describe Toq::Client do
             it 'should not be able to establish a connection' do
                 response = nil
 
-                Raktr.stop
                 reactor.run do
                     call do |res|
                         response = res
-                        Raktr.stop
+                        reactor.stop
                     end
                 end
 

data/spec/toq/exceptions_spec.rb

@@ -50,17 +50,17 @@ describe Toq::Exceptions do
         end
     end
 
-    describe '#rpc_invalid_method_error?' do
-        context 'for invalid method RPC exceptions' do
-            subject { described_class::InvalidMethod.new.rpc_invalid_method_error? }
-            it { should be_true }
-        end
-
-        context 'for other exceptions' do
-            subject { ::Exception.new.rpc_invalid_method_error? }
-            it { should be_false }
-        end
-    end
+    # describe '#rpc_invalid_method_error?' do
+    #     context 'for invalid method RPC exceptions' do
+    #         subject { described_class::InvalidMethod.new.rpc_invalid_method_error? }
+    #         it { should be_true }
+    #     end
+    #
+    #     context 'for other exceptions' do
+    #         subject { ::Exception.new.rpc_invalid_method_error? }
+    #         it { should be_false }
+    #     end
+    # end
 
     describe '#rpc_invalid_token_error?' do
         context 'for RPC exceptions' do

data/spec/toq/server_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 class Toq::Server
-    public :async?, :async_check, :object_exist?, :public_method?
+    public :async?, :async_check, :object_exist?
     attr_accessor :proxy
 end
 
@@ -111,19 +111,4 @@ describe Toq::Server do
         end
     end
 
-    describe '#public_method?' do
-        context 'when a method is public' do
-            it 'returns true' do
-                subject.public_method?( 'test', 'foo' ).should be_true
-            end
-        end
-
-        context 'when a method is non-existent or not public' do
-            it 'returns false' do
-                subject.public_method?( 'test', 'bar' ).should be_false
-            end
-        end
-    end
-
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toq
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tasos Laskos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: raktr
@@ -90,27 +90,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.9
 signing_key: 
 specification_version: 4
 summary: Simple RPC protocol.
 test_files:
-- spec/pems/cacert.pem
-- spec/pems/client/cert.pem
-- spec/pems/client/foo-cert.pem
-- spec/pems/client/foo-key.pem
-- spec/pems/client/key.pem
-- spec/pems/server/cert.pem
-- spec/pems/server/key.pem
-- spec/servers/basic.rb
-- spec/servers/server.rb
-- spec/servers/unix_socket.rb
-- spec/servers/with_ssl_primitives.rb
 - spec/spec_helper.rb
-- spec/toq/client_spec.rb
-- spec/toq/exceptions_spec.rb
-- spec/toq/message_spec.rb
-- spec/toq/proxy_spec.rb
 - spec/toq/request_spec.rb
 - spec/toq/response_spec.rb
+- spec/toq/client_spec.rb
+- spec/toq/exceptions_spec.rb
 - spec/toq/server_spec.rb
+- spec/toq/proxy_spec.rb
+- spec/toq/message_spec.rb
+- spec/servers/server.rb
+- spec/servers/unix_socket.rb
+- spec/servers/with_ssl_primitives.rb
+- spec/servers/basic.rb
+- spec/pems/cacert.pem
+- spec/pems/server/cert.pem
+- spec/pems/server/key.pem
+- spec/pems/client/foo-key.pem
+- spec/pems/client/foo-cert.pem
+- spec/pems/client/cert.pem
+- spec/pems/client/key.pem