myxi 1.2.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdd11c1300de89acea4cb8a73d3992613d58f7f2
-  data.tar.gz: c2ea7abf4a441def1601963eb2ffe7f4e50dedeb
+  metadata.gz: 938c04e3a273895a36a7658893822de7f0409322
+  data.tar.gz: 13b6a2a52b393e9139b94a9902f817b0d43445d1
 SHA512:
-  metadata.gz: 2efc388890bf6c0650b658af3179dcba083a970cc9802b39b43892b5d006a87b188e3d3cb05cc19ababdcdbf03fb03fe315572bef505363233b3ab9129cad33f
-  data.tar.gz: a102bd2d3fb000bfa6aa700133a2c2ab439e222d69897db61a76b1752fbd8994c8438b85dde6e7efd803e0e5391be4832448a1854ee43c0dd38794b372aeeee1
+  metadata.gz: 83411ecfe5283f033c8c74252acebeb27915141a7426510f8b15d79029744c3ff661e97459bf14c89de3b75058b323470a5bf19d44ab1e1e870be2a627257a23
+  data.tar.gz: 780e26b6594c422d500544c1c4d55adde585e2cdea5c0385c89ac661f0fb7102ac7354e9feb88a6051a6aae5f9affe9757506c0782eaeddcc8db5ead335282f1

data/lib/myxi/action.rb

@@ -20,6 +20,8 @@ module Myxi
     rescue Environment::Error => e
       session.send('Error', :error => e.class.to_s.split('::').last)
     rescue => e
+      Myxi.logger.debug "[#{session.id}] \e[41;37mERROR\e[0m \e[31m#{e.class.to_s} #{e.message}\e[0m"
+      e.backtrace { |br| Myxi.logger.debug "[#{session.id}] \e[41;37mERROR\e[0m #{br}" }
       session.send('InternalError', :error => e.class.to_s, :message => e.message)
     end
 

data/lib/myxi/eventable_socket.rb

@@ -0,0 +1,42 @@
+module Myxi
+  class EventableSocket
+    def initialize(event_loop, socket)
+      @event_loop = event_loop
+      @socket = socket
+      @monitor = @event_loop.selector.register(@socket, :r)
+      @monitor.value = self
+      @read_buffer = String.new.force_encoding('BINARY')
+      @write_buffer = String.new.force_encoding('BINARY')
+    end
+
+    def handle_w
+      bytes_sent = @socket.write_nonblock(@write_buffer)
+      # Send as much data as possible
+      if bytes_sent >= @write_buffer.bytesize
+        @write_buffer = String.new.force_encoding('BINARY')
+        @monitor.interests = :r
+        close if @close_after_write
+      else
+        @write_buffer.slice!(0, bytes_sent)
+      end
+    rescue Errno::ECONNRESET, IOError
+      close
+    end
+
+    def write(data)
+      @event_loop.wakeup
+      @write_buffer << data.force_encoding('BINARY')
+      @monitor.interests = :rw
+    end
+
+    def close_after_write
+      @close_after_write = true
+      @monitor.interests = :w
+    end
+
+    def close
+      @socket.close
+      @event_loop.selector.deregister(@socket)
+    end
+  end
+end

data/lib/myxi/listener.rb

@@ -0,0 +1,34 @@
+require 'socket'
+require 'myxi/session'
+module Myxi
+  class Listener
+
+  def initialize(event_loop, options)
+      @event_loop = event_loop
+      port = (options[:port] || ENV['MYXI_PORT'] || ENV['PORT'] || 5005).to_i
+      Myxi.logger.info "Running Myxi Web Socket Server on 0.0.0.0:#{port}"
+      if ENV['SERVER_FD']
+        @socket = TCPServer.for_fd(ENV['SERVER_FD'].to_i)
+        Process.kill('TERM', Process.ppid)
+      else
+        @socket = TCPServer.open(options[:bind_address] || ENV['MYXI_BIND_ADDRESS'], port)
+        ENV['SERVER_FD'] = @socket.to_i.to_s
+      end
+      @socket.close_on_exec = false
+      monitor = event_loop.selector.register(@socket, :r)
+      monitor.value = self
+    end
+
+    def handle_r
+      # Incoming client connection
+      client_socket = @socket.accept
+      Session.new(@event_loop, client_socket)
+    end
+
+    def close
+      @socket.close
+      @event_loop.selector.deregister(@socket)
+    end
+
+  end
+end

data/lib/myxi/server.rb

@@ -1,87 +1,98 @@
-require 'json'
-require 'em-websocket'
-require 'myxi'
-require 'myxi/session'
-require 'myxi/action'
+require 'nio'
+require 'timers'
+require 'myxi/listener'
 
 module Myxi
   class Server
-
-    attr_reader :options
+    attr_reader :selector, :timers, :options, :sessions
 
     def initialize(options = {})
       @options = options
+      @selector = NIO::Selector.new
+      @timers = Timers::Group.new
+      @sessions = []
     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
+    def wakeup
+      @selector.wakeup
     end
 
     def run
       Myxi::Exchange.declare_all
-      port = (options[:port] || ENV['MYXI_PORT'] || ENV['PORT'] || 5005).to_i
-      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|
+      @listener = Listener.new(self, options)
 
-          sessions << session = Session.new(self, ws)
+      unless options[:touch_interval] == 0
+        @timers.every(options[:touch_interval] || 60) do
+          @sessions.each(&:touch)
+        end
+      end
 
-          ws.onopen do |handshake|
-            case handshake.path
-            when /\A\/pushwss/
-              Myxi.logger.debug "[#{session.id}] Connection opened"
-              ws.send({:event => 'Welcome', :payload => {:id => session.id}}.to_json)
+      Signal.trap("TERM") do
+        if @options[:shutdown_time]
+          @timers.after(0) do
+            Myxi.logger.info("Received TERM signal, beginning #{@options[:shutdown_time]} second shutdown.")
+            @listener.close
+          end
 
-              session.queue = Myxi.channel.queue("", :exclusive => true)
-              session.queue.subscribe do |delivery_info, properties, 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
+          @timers.every(1) do
+            @shutdown_timer ||= 0
+            @sessions.each do |session|
+              if session.hash % @options[:shutdown_time] == @shutdown_timer % @options[:shutdown_time]
+                session.close
               end
-            else
-              Myxi.logger.debug "[#{session.id}] Invalid path"
-              ws.send({:event => 'Error', :payload => {:error => 'PathNotFound'}}.to_json)
-              ws.close
             end
-          end
+            @shutdown_timer += 1
 
-          ws.onclose do
-            session.close
-            sessions.delete(session)
+            if @sessions.size == 0
+              Myxi.logger.info("All clients disconnected. Shutdown complete.")
+              Process.exit(0)
+            end
+          end
+          wakeup
+        else
+          @timers.after(0) do
+            Myxi.logger.info("Received TERM signal, shutting down immediately")
+              Process.exit(0)
           end
+        end
+      end
 
-          ws.onmessage do |msg|
-            if ws.state == :connected
-              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_s.to_sym]
-                  action.execute(session, payload)
-                else
-                  ws.send({:event => 'Error', :tag => session.tag, :payload => {:error => 'InvalidAction'}}.to_json)
-                end
+      loop do
+        wi = @timers.wait_interval
+        if wi > 0
+          wait_interval = wi
+        else
+          wait_interval = 0
+        end
+
+        selector.select(wait_interval) do |monitor|
+          begin
+            monitor.value.handle_r if monitor.readable?
+            monitor.value.handle_w if monitor.writeable?
+          rescue => e
+            # Try to recover wherever possible
+            if monitor && monitor.value
+              if monitor.value == @listener
+                raise
               else
-                ws.send({:event => 'Error', :payload => {:error => 'InvalidJSON'}}.to_json)
+                monitor.value.close rescue nil
               end
+            else
+              raise
+            end
+            begin
+              Myxi.logger.info(e.class.to_s + ' ' + e.message.to_s)
+              e.backtrace.each do |line|
+                Myxi.logger.info('  ' + line)
+              end
+            rescue
             end
           end
         end
+        @timers.fire
       end
 
     end
+
   end
 end

data/lib/myxi/session.rb

@@ -1,24 +1,85 @@
+require 'websocket'
 require 'json'
 require 'myxi/exchange'
+require 'myxi/eventable_socket'
 
 module Myxi
-  class Session
+  class Session < EventableSocket
 
-    def initialize(server, ws)
-      @server = server
-      @ws = ws
+    def initialize(event_loop, client_socket)
       @id  = SecureRandom.hex(8)
       @closure_callbacks = []
       @data = {}
+
+      @handshake = WebSocket::Handshake::Server.new
+      @state = :handshake
+      super
+      @event_loop.sessions << self
+
     end
 
     attr_reader :id
-    attr_reader :server
-    attr_reader :ws
-    attr_accessor :queue
+    #attr_accessor :queue
     attr_accessor :auth_object
     attr_accessor :tag
 
+    def on_connect
+      Myxi.logger.debug "[#{id}] Connection opened"
+      send_text_data({:event => 'Welcome', :payload => {:id => id}}.to_json)
+      begin
+        @queue = Myxi.channel.queue("", :exclusive => true)
+      rescue NoMethodError
+        # This exception may be raised when something goes very wrong with the RabbitMQ connection
+        # Unfortunately the only practical solution is to restart the client
+        Process.exit(1)
+      end
+      @queue.subscribe do |delivery_info, properties, body|
+        if hash = JSON.parse(body) rescue nil
+          hash['mq'] = {'e' => delivery_info.exchange, 'rk' => delivery_info.routing_key}
+          payload = hash.to_json.force_encoding('UTF-8')
+          Myxi.logger.debug "[#{id}] \e[45;37mEVENT\e[0m \e[35m#{payload}\e[0m (to #{delivery_info.exchange}/#{delivery_info.routing_key})"
+          send_text_data(payload)
+        end
+      end
+    end
+
+    def handle_r
+      case @state
+      when :handshake
+        @handshake << @socket.readpartial(1048576)
+        if @handshake.finished?
+          write(@handshake.to_s)
+          if @handshake.valid?
+            on_connect
+            @state = :established
+            @frame_handler = WebSocket::Frame::Incoming::Server.new(version: @handshake.version)
+          else
+            close_after_write
+          end
+        end
+      when :established
+        @frame_handler << @socket.readpartial(1048576)
+        while frame = @frame_handler.next
+          msg = frame.data
+          json = JSON.parse(msg) rescue nil
+          if json.is_a?(Hash)
+            tag = json['tag'] || nil
+            payload = json['payload'] || {}
+            Myxi.logger.debug "[#{id}] \e[43;37mACTION\e[0m \e[33m#{json}\e[0m"
+            if action = Myxi::Action::ACTIONS[json['action'].to_s.to_sym]
+              action.execute(self, payload)
+            else
+              send_text_data({:event => 'Error', :tag => tag, :payload => {:error => 'InvalidAction'}}.to_json)
+            end
+          else
+            send_text_data({:event => 'Error', :payload => {:error => 'InvalidJSON'}}.to_json)
+          end
+        end
+      end
+    rescue EOFError, Errno::ECONNRESET, IOError
+      close
+    end
+
     def [](name)
       @data[name.to_sym]
     end
@@ -39,7 +100,9 @@ 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.force_encoding('UTF-8'))
+      payload = {:event => name, :tag => tag, :payload => payload}.to_json.force_encoding('UTF-8')
+      send_text_data(payload)
+      Myxi.logger.debug "[#{id}] \e[46;37mMESSAGE\e[0m \e[36m#{payload}\e[0m"
     end
 
     #
@@ -52,9 +115,9 @@ module Myxi
           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)
+            @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}"
+            Myxi.logger.debug "[#{id}] \e[42;37mSUBSCRIBED\e[0m \e[32m#{exchange_name} / #{routing_key}\e[0m"
             send('Subscribed', :exchange => exchange_name, :routing_key => routing_key)
           end
         else
@@ -69,11 +132,11 @@ module Myxi
     # Unsubscribe this session from the given exchange name and routing key
     #
     def unsubscribe(exchange_name, routing_key, auto = false)
-      queue.unbind(exchange_name.to_s, :routing_key => routing_key.to_s)
+      @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
-      Myxi.logger.debug "[#{id}] Unsubscribed from #{exchange_name}/#{routing_key}"
+      Myxi.logger.debug "[#{id}] \e[42;37mUNSUBSCRIBED\e[0m \e[32m#{exchange_name} / #{routing_key}\e[0m"
       send('Unsubscribed', :exchange_name => exchange_name, :routing_key => routing_key, :auto => auto)
     end
 
@@ -119,10 +182,12 @@ module Myxi
     #
     def close
       Myxi.logger.debug "[#{id}] Session closed"
-      self.queue.delete if self.queue
+      @event_loop.sessions.delete(self)
+      @queue.delete if @queue
       while callback = @closure_callbacks.shift
         callback.call
       end
+      super
     end
 
     #
@@ -132,5 +197,10 @@ module Myxi
       @closure_callbacks << block
     end
 
+    def send_text_data(data)
+      sender = WebSocket::Frame::Outgoing::Server.new(version: @handshake.version, data: data, type: :text)
+      write(sender.to_s)
+    end
+
   end
 end

data/lib/myxi/version.rb

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

data/vendor/assets/javascripts/myxi/connection.coffee

@@ -43,6 +43,7 @@ class Myxi.Connection
     @websocket.onclose = (event)=>
       if @connected
         @_runCallbacks('SocketDisconnected')
+      @_runCallbacks('SocketClosed')
       @connected = false
       @authenticated = false
       @_markAllSubscriptionsAsUnsubscribed()

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: myxi
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.2
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.5.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
@@ -26,30 +26,64 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.5.1
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: em-websocket
+  name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 1.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: nio4r
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: timers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: A RabbitMQ-based web socket server & framework
 email:
 - me@adamcooke.io
@@ -61,7 +95,9 @@ files:
 - lib/myxi/action.rb
 - lib/myxi/default_actions.rb
 - lib/myxi/environment.rb
+- lib/myxi/eventable_socket.rb
 - lib/myxi/exchange.rb
+- lib/myxi/listener.rb
 - lib/myxi/railtie.rb
 - lib/myxi/server.rb
 - lib/myxi/session.rb