myxi 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afd97a9d7707f7273a9cc1526c16b838840de982
-  data.tar.gz: c3a82e6d83e6da41657ba23d17bcfec4f4bea14a
+  metadata.gz: f04936ddd50485e99372aa1248f99bf41fbc6c61
+  data.tar.gz: 16b9d860964f5f8c733697cc13001977949ca541
 SHA512:
-  metadata.gz: c25c8b738510f2e80d1897a85353705474157b3ac6446f4109b896dddede06ca87bd38123b972d1cc6624799560ed2f96c4a7cfc7608778388e64adc775e44f1
-  data.tar.gz: bf1995d685b86924c6a346a932c30f46ba8ce633d8593cb3133a04bc6923d68de22bbb5fd3d0df57dbf621ada5093e32c7e3701b6b24002940a688b7e1150f5c
+  metadata.gz: 0aabc52d678b70c8fc7d929bb00d9b876b5fc8a7c847cc9d7f8be0f3350a21579f7cb309cc88d1b25f9f57dc6f2effe74de9e59278ae97143a7932822ae265f8
+  data.tar.gz: 4e9b22ef5ba86dc807a8f8240a510c40ae2602fde0f47f9cc177e9a1857724b0114ab0fc2e21395d87c6595b483718dca8bd9a2e05b90924198f58f7ab63b5d7

data/lib/myxi.rb

@@ -1,6 +1,11 @@
+require 'myxi/exchange'
+require 'myxi/railtie' if defined?(Rails)
+
 module Myxi
   class << self
 
+    class Error < StandardError; end
+
     #
     # 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/action.rb

@@ -1,3 +1,5 @@
+require 'myxi/environment'
+
 module Myxi
   class Action
 
@@ -13,7 +15,12 @@ module Myxi
     end
 
     def execute(session, payload = {})
-      @block.call(session, payload)
+      environment = Environment.new(session, payload)
+      environment.instance_exec(session, payload, &@block)
+    rescue Environment::Error => e
+      session.send('Error', :error => e.class.to_s.split('::').last)
+    rescue => e
+      session.send('InternalError', :error => e.class.to_s, :message => e.message)
     end
 
   end

data/lib/myxi/default_actions.rb

@@ -1,13 +1,33 @@
 Myxi::Action.add(:Subscribe) do |session, payload|
-  session.subscribe(payload['exchange'], payload['routing_key'])
+  if payload['routing_keys'].is_a?(Array)
+    for key in payload['routing_keys']
+      session.subscribe(payload['exchange'], key)
+    end
+  else
+    session.subscribe(payload['exchange'], payload['routing_key'])
+  end
 end
 
 Myxi::Action.add(:Unsubscribe) do |session, payload|
   if payload['exchange'] && payload['routing_key']
-    session.unsubscribe(payload['exchange'], payload['routing_key'])
+    if payload['routing_keys'].is_a?(Array)
+      for key in payload['routing_keys']
+        session.unsubscribe(payload['exchange'], key)
+      end
+    else
+      session.unsubscribe(payload['exchange'], payload['routing_key'])
+    end
   elsif payload['exchange'] && payload['routing_key'].nil?
     session.unsubscribe_all_for_exchange(payload['exchange'])
   else
     session.unsubscribe_all
   end
 end
+
+Myxi::Action.add(:ListSubscriptions) do |session, payload|
+  session.send "YourSubscriptions", :subscriptions => session.subscriptions
+end
+
+Myxi::Action.add(:Ping) do |session, payload|
+  session.send "Pong", :time => Time.now.to_i
+end

data/lib/myxi/environment.rb

@@ -0,0 +1,21 @@
+module Myxi
+  class Environment
+
+    class Error < StandardError; end
+    class AuthRequired < Error; end
+
+    def initialize(session, payload = {})
+      @session, @payload = session, payload
+    end
+
+    attr_reader :session
+    attr_reader :payload
+
+    def auth_required!
+      if session.auth_object.nil?
+        raise AuthRequired, "Authentication is required for this action"
+      end
+    end
+
+  end
+end

data/lib/myxi/railtie.rb

@@ -0,0 +1,8 @@
+module Myxi
+  class Railtie < ::Rails::Engine
+
+    initializer 'myxi.initialize' do |app|
+    end
+
+  end
+end

data/lib/myxi/server.rb

@@ -19,14 +19,30 @@ module Myxi
       end
     end
 
+    def sessions
+      @sessions ||= []
+    end
+
+    def monitor_sessions
+      unless options[:touch_interval] == 0
+        Thread.new do
+          loop do
+            sessions.each(&:touch)
+            sleep options[:touch_interval] || 60
+          end
+        end
+      end
+    end
+
     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}"
+      monitor_sessions
       EM.run do
         EM::WebSocket.run(:host => options[:bind_address] || ENV['MYXI_BIND_ADDRESS'] || '0.0.0.0', :port => port) do |ws|
 
-          session = Session.new(ws)
+          sessions << session = Session.new(self, ws)
 
           ws.onopen do |handshake|
             case handshake.path
@@ -36,7 +52,10 @@ module Myxi
 
               session.queue = Myxi.channel.queue("", :exclusive => true)
               session.queue.subscribe do |delivery_info, properties, body|
-                ws.send(body)
+                if hash = JSON.parse(body) rescue nil
+                  hash['mq'] = {'e' => delivery_info.exchange, 'rk' => delivery_info.routing_key}
+                  ws.send(hash.to_json.force_encoding('UTF-8'))
+                end
               end
             else
               log "[#{session.id}] Invalid path"
@@ -48,11 +67,13 @@ module Myxi
           ws.onclose do
             log "[#{session.id}] Disconnected"
             session.queue.delete if session.queue
+            sessions.delete(session)
           end
 
           ws.onmessage do |msg|
             if ws.state == :connected
-              if json = JSON.parse(msg) rescue nil
+              json = JSON.parse(msg) rescue nil
+              if json.is_a?(Hash)
                 session.tag = json['tag'] || nil
                 payload = json['payload'] || {}
                 if action = Myxi::Action::ACTIONS[json['action'].to_sym]

data/lib/myxi/session.rb

@@ -4,12 +4,14 @@ require 'myxi/exchange'
 module Myxi
   class Session
 
-    def initialize(ws)
+    def initialize(server, ws)
+      @server = server
       @ws = ws
       @id  = SecureRandom.hex(8)
     end
 
     attr_reader :id
+    attr_reader :server
     attr_reader :ws
     attr_accessor :queue
     attr_accessor :auth_object
@@ -26,7 +28,7 @@ module Myxi
     # Send an event back to the client on this session
     #
     def send(name, payload = {})
-      ws.send({:event => name, :tag => tag, :payload => payload}.to_json)
+      ws.send({:event => name, :tag => tag, :payload => payload}.to_json.force_encoding('UTF-8'))
     end
 
     #
@@ -38,7 +40,7 @@ module Myxi
           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
-          puts "[#{id}] Subscribed to #{exchange_name} / #{routing_key}"
+          server.log "[#{id}] Subscribed to #{exchange_name} / #{routing_key}"
           send('Subscribed', :exchange => exchange_name, :routing_key => routing_key)
         else
           send('Error', :error => 'SubscriptionDenied', :exchange => exchange_name, :routing_key => routing_key)
@@ -51,12 +53,13 @@ module Myxi
     #
     # Unsubscribe this session from the given exchange name and routing key
     #
-    def unsubscribe(exchange_name, routing_key)
+    def unsubscribe(exchange_name, routing_key, auto = false)
       queue.unbind(exchange_name.to_s, :routing_key => routing_key.to_s)
       if subscriptions[exchange_name.to_s]
         subscriptions[exchange_name.to_s].delete(routing_key.to_s)
       end
-      send('Unsubscribed', :exchange_name => exchange_name, :routing_key => routing_key)
+      server.log "[#{id}] Unsubscribed from #{exchange_name}/#{routing_key}"
+      send('Unsubscribed', :exchange_name => exchange_name, :routing_key => routing_key, :auto => auto)
     end
 
     #
@@ -79,5 +82,22 @@ module Myxi
       end
     end
 
+    #
+    # Called by the server every so often whenever this session is active. This
+    # should verify that subscriptions are still valid etc...
+    #
+    def touch
+      subscriptions.each do |exchange_name, routing_keys|
+        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}"
+              unsubscribe(exchange_name, routing_key, true)
+            end
+          end
+        end
+      end
+    end
+
   end
 end

data/lib/myxi/version.rb

@@ -1,3 +1,3 @@
 module Myxi
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myxi
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -60,7 +60,9 @@ files:
 - lib/myxi.rb
 - lib/myxi/action.rb
 - lib/myxi/default_actions.rb
+- lib/myxi/environment.rb
 - lib/myxi/exchange.rb
+- lib/myxi/railtie.rb
 - lib/myxi/server.rb
 - lib/myxi/session.rb
 - lib/myxi/version.rb
@@ -89,3 +91,4 @@ signing_key:
 specification_version: 4
 summary: A RabbitMQ-based web socket server & framework
 test_files: []
+has_rdoc: