wampus 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfb58f22049d9f09a70845982e65ed973ab1d05a
-  data.tar.gz: 9c5e02435c5282da1145a002b67c1792a74f3211
+  metadata.gz: 1344ac9b431935be7e6eb17811b05b32553b216f
+  data.tar.gz: 4f0633e43c52ca041dadd7f77f54a8b99233b506
 SHA512:
-  metadata.gz: fab955b9b85aa6fb3a99fe7c325ddd1637e7b7bd73c8b3913b4827d289be06829c677d3a1b0066d0b2955fb0cf5d9219d5f25d86a9211bdf6be7c44d5e4607e0
-  data.tar.gz: e6ca9efc648328ec02d8d43cef3309869eff6c78934ba7ea85eda40d195412602bef68bb9fbabdd43cc0230cd434ba0b5cff51c63acc96c45d138c3b22ffc2bc
+  metadata.gz: 2049c1ac5788a583a73b0441cb87c0b4986dc2824bc42b767e3bd0cfe65e5872c92cfcab6b5293635adfec7f4e71407519344dea0bb2365225052afd96020b38
+  data.tar.gz: 33e317dd4d990ef424176be6207cf89f83fce62574c810e14433139f3b0b2f0eabf566ede047e5c6d4ef55ceb7039282ca67a0389014ed6ce8eaa441c8af6c78

data/lib/wampus/backends/redis.rb

@@ -8,6 +8,10 @@ module Wampus
 
       attr_reader :redis_config
 
+      after_init {
+        connect_to_redis
+      }
+
       def initialize(*args)
         @redis_config = redis_defaults.dup
         super(*args) if defined? super

data/lib/wampus/pubsub/server_ext.rb

@@ -82,16 +82,15 @@ module Wampus
         if handler[2].nil? && handler[3].nil?
           topic.add_subscriber connection
         else
-          begin
-            if handler[2]
-              result = handler[2].send handler[3], connection, topic_uri
-            elsif handler[3].is_a? Proc
-              result = handler[3].call connection, topic_uri
+          EM.defer lambda {
+            run_subscribe_deferred connection, handler, topic_uri
+          }, lambda { |result|
+            if result.is_a? Exception
+              # TODO Log errors
+            elsif result
+              topic.add_subscriber connection
             end
-            topic.add_subscriber connection
-          rescue => error
-            # Nothing
-          end
+          }
         end
       end
 
@@ -121,19 +120,15 @@ module Wampus
         if handler[2].nil? && handler[3].nil?
           dispatch_event topic.uri, event, exclude, include
         else
-          begin
-            begin
-              if handler[2]
-                result = handler[2].send handler[3], [connection, topic_uri, event]
-              elsif handler[3].is_a? Proc
-                result = handler[3].call connection, topic_uri, event
-              end
+          EM.defer lambda {
+            run_publish_deferred connection, handler, topic_uri, event
+          }, lambda {|result|
+            if result.is_a? Exception
+              # TODO Log errors
+            elsif result
               dispatch_event topic.uri, event, exclude, include
-            rescue => error
-              puts error.message
-              # Nothing
             end
-          end
+          }
         end
       end
 
@@ -146,6 +141,26 @@ module Wampus
 
       private
 
+      def run_subscribe_deferred(connection, handler, topic_uri)
+        if handler[2]
+          handler[2].send handler[3], connection, topic_uri
+        elsif handler[3].is_a? Proc
+          handler[3].call connection, topic_uri
+        end
+      rescue => error
+        error
+      end
+
+      def run_publish_deferred(connection, handler, topic_uri, event)
+        if handler[2]
+          handler[2].send handler[3], [connection, topic_uri, event]
+        elsif handler[3].is_a? Proc
+          handler[3].call connection, topic_uri, event
+        end
+      rescue => error
+        error
+      end
+
       def topic_for_uri(topic_uri)
         uri = topics.keys.select { |uri| topic_uri.include? uri }.sort_by(&:length).last
         topics[uri]

data/lib/wampus/rpc/server_ext.rb

@@ -47,25 +47,25 @@ module Wampus
         uri = connection.resolve_prefix proc_uri
         handler = rpcs[uri]
 
-        begin
-          rpc_call_exists = rpcs.has_key?(uri)
-          uri, args = on_before_call connection, call_id, uri, args, rpc_call_exists
-          unless rpc_call_exists
-            raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'NoSuchRPCEndpoint', 'Missing Method')
-          end
-          if handler[0]
-            result = handler[0].send handler[1], connection, call_id, *args
-          elsif handler[1].is_a? Proc
-            result = handler[1].call connection, call_id, *args
-          end
-          result = on_after_call_success connection, result
-          connection.write call_result_msg call_id, result
-        rescue => error
-          error = on_after_call_error connection, error
-          msg = call_error_msg call_id, *error.to_call_error
-          connection.write msg
-          on_after_send_call_error connection, msg
+        rpc_call_exists = rpcs.has_key?(uri)
+        uri, args = on_before_call connection, call_id, uri, args, rpc_call_exists
+        unless rpc_call_exists
+          raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'NoSuchRPCEndpoint', 'Missing Method')
         end
+
+        EM.defer lambda {
+          run_rpc_deferred connection, handler, args
+        }, lambda { |result|
+          if result.is_a? StandardError
+            error = on_after_call_error connection, result
+            msg = call_error_msg call_id, *error.to_call_error
+            connection.write msg
+            on_after_send_call_error connection, msg
+          else
+            result = on_after_call_success connection, result
+            connection.write call_result_msg call_id, result
+          end
+        }
       end
 
       # -- RPC Hooks
@@ -90,6 +90,16 @@ module Wampus
 
       private
 
+      def run_rpc_deferred(connection, handler, args)
+        if handler[0]
+          handler[0].send handler[1], connection, *args
+        elsif handler[1].is_a? Proc
+          handler[1].call connection, *args
+        end
+      rescue => error
+        error
+      end
+
       def proc_for_uri(rpc_uri)
         uri = rpcs.keys.select { |uri| uri.include? rpc_uri }.sort_by(&:length).last
         rpcs[uri]

data/lib/wampus/servers/wamp_cra.rb

@@ -10,28 +10,33 @@ module Wampus
 
       after_init do
         register_rpc_method Wampus::Protocols::WampCra::URI_PROCEDURE+'authRequest', self, :auth_request
+        register_rpc_method Wampus::Protocols::WampCra::URI_PROCEDURE+'authStatus', self, :auth_status
         register_rpc_method Wampus::Protocols::WampCra::URI_PROCEDURE+'auth', self, :auth
       end
 
+      # Implement in your server
       def get_auth_permissions(connection, auth_key, auth_extra)
         {:permissions => { :pubsub => [], :rpc => [] } }
       end
 
+      # Implement in your server
       def get_auth_secret(connection, auth_key)
         nil
       end
 
+      # Implement in your server
       def on_auth_timeout(connection)
         # Nothing
       end
 
+      # Implement in your server
       def on_authenticated(connection, auth_key, permissions)
         # Nothing
       end
 
       def on_session_open(connection)
         if client_auth_timeout > 0
-          connection.auth_timeout_call = EventMachine.add_timer client_auth_timeout {
+          connection.auth_timeout_call = EventMachine.add_timer(client_auth_timeout) {
             on_auth_timeout(connection)
           }
         end
@@ -46,6 +51,7 @@ module Wampus
           raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'authentication-already-requested', 'Authentication Already Requested')
         end
 
+        extra = {} if extra.nil?
         unless extra.is_a? Hash
           raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'invalid-argument', 'Extra is not a Dictionary/Hash')
         end
@@ -58,6 +64,18 @@ module Wampus
         on_get_auth_secret_ok connection, auth_secret, auth_key, extra
       end
 
+      def auth_status(connection)
+        if connection.authenticated
+          return :authenticated
+        end
+
+        unless connection.pending_auth.nil?
+          return :pending
+        end
+
+        :unauthenticated
+      end
+
       def auth(connection, signature = nil)
         if connection.authenticated
           raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'already-authenticated', 'Already Authenticated')
@@ -70,12 +88,12 @@ module Wampus
         if connection.pending_auth[1] != signature
           connection.pending_auth = nil
 
-          return EventMachine.add_timer expo(1.25) {
-            raise Wampus::Errors::CallError.new Wampus::Protocols::Wamp::URI_ERROR+'invalid-signature', 'Signature for authentication request is invalid'
+          return EventMachine.add_timer(expo(1.25)) {
+            raise Wampus::Errors::CallError.new(Wampus::Protocols::Wamp::URI_ERROR+'invalid-signature', 'Signature for authentication request is invalid')
           }
         end
 
-        permissions = connection.pending_auth
+        permissions = connection.pending_auth[2]
         auth_key = connection.pending_auth[0][:auth_key]
         connection.authenticated = true
         connection.pending_auth = nil
@@ -86,7 +104,7 @@ module Wampus
 
         on_authenticated connection, auth_key, permissions
 
-        return permissions[:permissions]
+        permissions[:permissions]
       end
 
       private
@@ -107,9 +125,10 @@ module Wampus
         auth_info[:auth_extra] = results[:auth_extra] if results.has_key? :auth_extra
 
         if auth_key
-          auth_sig = auth_signature auth_info, auth_secret
+          auth_json = auth_info.to_json
+          auth_sig = auth_signature auth_json, auth_secret
           connection.pending_auth = [auth_info, auth_sig, results]
-          return auth_info
+          return auth_json
         else
           connection.pending_auth = [auth_info, nil, results]
           return nil

data/lib/wampus/version.rb

@@ -1,3 +1,3 @@
 module Wampus
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wampus
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Michael Stack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2013-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler