myxi 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a50043a96e96ff44cef317e03314866dc254a39c
-  data.tar.gz: e2a1f27a1bc4a5b839d22ecc64a1bbedb78ddef8
+  metadata.gz: cdd11c1300de89acea4cb8a73d3992613d58f7f2
+  data.tar.gz: c2ea7abf4a441def1601963eb2ffe7f4e50dedeb
 SHA512:
-  metadata.gz: b5befc8b9663554974828df4676d57a4f92faacba6038d50449e5577dce6ea25eba1ea5778a42561c86e87d3e89b7e6a3e137e1592f35ce4f97c6d9257562071
-  data.tar.gz: e5be4621e3703edb1ae32f5bd4bc1910a37c135573761d63afb11110085e80d72a38af250dc5d9b4c4945650d2f257bad36fd4b1e8e76cfdb29dbdc0dfe4b8f7
+  metadata.gz: 2efc388890bf6c0650b658af3179dcba083a970cc9802b39b43892b5d006a87b188e3d3cb05cc19ababdcdbf03fb03fe315572bef505363233b3ab9129cad33f
+  data.tar.gz: a102bd2d3fb000bfa6aa700133a2c2ab439e222d69897db61a76b1752fbd8994c8438b85dde6e7efd803e0e5391be4832448a1854ee43c0dd38794b372aeeee1

data/lib/myxi.rb

@@ -1,3 +1,4 @@
+require 'logger'
 require 'myxi/exchange'
 require 'myxi/railtie' if defined?(Rails)
 
@@ -6,6 +7,14 @@ module Myxi
 
     class Error < StandardError; end
 
+    #
+    # Return a logger
+    #
+    def logger
+      @logger ||= Logger.new(STDOUT)
+    end
+    attr_writer :logger
+
     #
     # Return a bunny client instance which will be used by the web socket service.
     # This can be overriden if you already have a connection RabbitMQ available

data/lib/myxi/server.rb

@@ -13,12 +13,6 @@ module Myxi
       @options = options
     end
 
-    def log(message)
-      if options[:debug]
-        puts message
-      end
-    end
-
     def sessions
       @sessions ||= []
     end
@@ -37,7 +31,7 @@ module Myxi
     def run
       Myxi::Exchange.declare_all
       port = (options[:port] || ENV['MYXI_PORT'] || ENV['PORT'] || 5005).to_i
-      puts "Running Myxi Web Socket Server on 0.0.0.0:#{port}"
+      Myxi.logger.info "Running Myxi Web Socket Server on 0.0.0.0:#{port}"
       monitor_sessions
       EM.run do
         EM::WebSocket.run(:host => options[:bind_address] || ENV['MYXI_BIND_ADDRESS'] || '0.0.0.0', :port => port) do |ws|
@@ -47,7 +41,7 @@ module Myxi
           ws.onopen do |handshake|
             case handshake.path
             when /\A\/pushwss/
-              log "[#{session.id}] Connection opened"
+              Myxi.logger.debug "[#{session.id}] Connection opened"
               ws.send({:event => 'Welcome', :payload => {:id => session.id}}.to_json)
 
               session.queue = Myxi.channel.queue("", :exclusive => true)
@@ -58,15 +52,14 @@ module Myxi
                 end
               end
             else
-              log "[#{session.id}] Invalid path"
+              Myxi.logger.debug "[#{session.id}] Invalid path"
               ws.send({:event => 'Error', :payload => {:error => 'PathNotFound'}}.to_json)
               ws.close
             end
           end
 
           ws.onclose do
-            log "[#{session.id}] Disconnected"
-            session.queue.delete if session.queue
+            session.close
             sessions.delete(session)
           end
 
@@ -76,7 +69,7 @@ module Myxi
               if json.is_a?(Hash)
                 session.tag = json['tag'] || nil
                 payload = json['payload'] || {}
-                if action = Myxi::Action::ACTIONS[json['action'].to_sym]
+                if action = Myxi::Action::ACTIONS[json['action'].to_s.to_sym]
                   action.execute(session, payload)
                 else
                   ws.send({:event => 'Error', :tag => session.tag, :payload => {:error => 'InvalidAction'}}.to_json)

data/lib/myxi/session.rb

@@ -8,6 +8,8 @@ module Myxi
       @server = server
       @ws = ws
       @id  = SecureRandom.hex(8)
+      @closure_callbacks = []
+      @data = {}
     end
 
     attr_reader :id
@@ -17,6 +19,15 @@ module Myxi
     attr_accessor :auth_object
     attr_accessor :tag
 
+    def [](name)
+      @data[name.to_sym]
+    end
+
+    def []=(name, value)
+      Myxi.logger.debug "[#{id}] Stored '#{name}' with '#{value}'"
+      @data[name.to_sym] = value
+    end
+
     #
     # Keep track of all subscriptions
     #
@@ -37,11 +48,15 @@ module Myxi
     def subscribe(exchange_name, routing_key)
       if exchange = Myxi::Exchange::EXCHANGES[exchange_name.to_sym]
         if exchange.can_subscribe?(routing_key, self.auth_object)
-          queue.bind(exchange.exchange_name.to_s, :routing_key => routing_key.to_s)
           subscriptions[exchange_name.to_s] ||= []
-          subscriptions[exchange_name.to_s] << routing_key.to_s
-          server.log "[#{id}] Subscribed to #{exchange_name} / #{routing_key}"
-          send('Subscribed', :exchange => exchange_name, :routing_key => routing_key)
+          if subscriptions[exchange_name.to_s].include?(routing_key.to_s)
+            send('Error', :error => 'AlreadySubscribed', :exchange => exchange_name, :routing_key => routing_key)
+          else
+            queue.bind(exchange.exchange_name.to_s, :routing_key => routing_key.to_s)
+            subscriptions[exchange_name.to_s] << routing_key.to_s
+            Myxi.logger.debug "[#{id}] Subscribed to #{exchange_name} / #{routing_key}"
+            send('Subscribed', :exchange => exchange_name, :routing_key => routing_key)
+          end
         else
           send('Error', :error => 'SubscriptionDenied', :exchange => exchange_name, :routing_key => routing_key)
         end
@@ -58,7 +73,7 @@ module Myxi
       if subscriptions[exchange_name.to_s]
         subscriptions[exchange_name.to_s].delete(routing_key.to_s)
       end
-      server.log "[#{id}] Unsubscribed from #{exchange_name}/#{routing_key}"
+      Myxi.logger.debug "[#{id}] Unsubscribed from #{exchange_name}/#{routing_key}"
       send('Unsubscribed', :exchange_name => exchange_name, :routing_key => routing_key, :auto => auto)
     end
 
@@ -91,7 +106,7 @@ module Myxi
         if exchange = Myxi::Exchange::EXCHANGES[exchange_name.to_sym]
           routing_keys.each do |routing_key|
             unless exchange.can_subscribe?(routing_key, self.auth_object)
-              puts "[#{id}] Session is not longer allowed to subscibe to #{exchange_name}/#{routing_key}"
+              Myxi.logger.info "[#{id}] Session is not longer allowed to subscibe to #{exchange_name}/#{routing_key}"
               unsubscribe(exchange_name, routing_key, true)
             end
           end
@@ -99,5 +114,23 @@ module Myxi
       end
     end
 
+    #
+    # Called when the connection for this session is closed
+    #
+    def close
+      Myxi.logger.debug "[#{id}] Session closed"
+      self.queue.delete if self.queue
+      while callback = @closure_callbacks.shift
+        callback.call
+      end
+    end
+
+    #
+    # Adds a callback to be executed when this session closes
+    #
+    def on_close(&block)
+      @closure_callbacks << block
+    end
+
   end
 end

data/lib/myxi/version.rb

@@ -1,3 +1,3 @@
 module Myxi
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myxi
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2017-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -89,9 +89,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A RabbitMQ-based web socket server & framework
 test_files: []
-has_rdoc: