pakyow-realtime 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3af56bba7d1aa3e3b121eb2b542d0dc4f85d35d
-  data.tar.gz: 33f0af0198c31f0b2b728d07a63635a2f85ad79a
+  metadata.gz: 7de6d6caa97ff92eb8c07092eb9438e952ceb4c2
+  data.tar.gz: dc8d6705e39160414dea747275e53bf351ddfaa5
 SHA512:
-  metadata.gz: bf7e58a486cdef598237a63744c06069c9df16bf70c39d206d9bd18e2272e8a2035007ac3cd50d7dec232488ad89deb122d1b369a1230a229b2e6f09818dc968
-  data.tar.gz: 2ab01fe491a66614a021fefea6e674f68cf614fb970742b57ba2a3adca12c4dfae3716dc0c25c51ff3e3b147985730e0f657cd586fa784fdcd9da4e59aba7520
+  metadata.gz: 562149cc4659759ae9a6154dfd5e6c5d02cab93723e50b15b188b7e240e85b24604011acceb40ac972e5a233d1a5bb82c352b1821cee86fe420ecbbf00a17072
+  data.tar.gz: ea8d69bf0efe8e29018d36835ab14c3d0b73b7e7707fd949a0e78d34eece2e3d013726b251e80c14b83b9de24b17be3ab72defaf478a8f9aefe42a2828617a71

data/pakyow-realtime/CHANGELOG.md

@@ -1,3 +1,17 @@
+# 0.11.0
+
+  * Gracefully shuts down WebSocket when something bad happens
+  * Fixes a bug calling the root route over a WebSocket
+  * Fixes a bug causing join events to be fired before the connection is registered
+  * Fixes a bug causing session to not be serialized in redis
+  * Fixes a bug causing redis subscriptions to never unsubscribe
+  * Properly disconnects from redis as necessary to avoid eating up connections
+  * Moves everything into the Pakyow namespace
+  * Improves subscriber management in production environments
+  * Fixes a memory leak caused by converting channel names to symbols
+  * Replaces `websocket_parser` gem with `websocket`
+  * Fixes a bug causing websocket failures in Internet Explorer
+
 # 0.10.2 / 2015-11-15
 
   * Adds ability to return only a partial in call-route response

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/config.rb

@@ -1,7 +1,7 @@
 require_relative 'registries/simple_registry'
 require_relative 'registries/redis_registry'
 
-Pakyow::Config.register(:realtime) { |config|
+Pakyow::Config.register :realtime do |config|
   # The registry to use when keeping up with connections.
   config.opt :registry, Pakyow::Realtime::SimpleRegistry
 
@@ -13,10 +13,8 @@ Pakyow::Config.register(:realtime) { |config|
 
   # Whether or not realtime should be enabled.
   config.opt :enabled, true
-}.env(:development) { |opts|
+end.env :development do |opts|
   opts.registry = Pakyow::Realtime::SimpleRegistry
-}.env(:staging) { |opts|
+end.env :production do |opts|
   opts.registry = Pakyow::Realtime::RedisRegistry
-}.env(:production) { |opts|
-  opts.registry = Pakyow::Realtime::RedisRegistry
-}
+end

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/context.rb

@@ -49,6 +49,14 @@ module Pakyow
         delegate.push(msg, channels)
       end
 
+      # Push a message down a channel directed at a specific client,
+      # identified by key.
+      #
+      # @api public
+      def push_message_to_socket_with_key(msg, channel, key, propagated = false)
+        delegate.push_message_to_socket_with_key(msg, channel, key, propagated)
+      end
+
       # Returns an instance of the connection delegate.
       #
       # @api private

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/delegate.rb

@@ -29,7 +29,7 @@ module Pakyow
           @channels[channel] << connection
         end
 
-        registry.subscribe_for_propagation(channels) if registry.propagates?
+        registry.subscribe_for_propagation(channels, key) if registry.propagates?
       end
 
       # Unregisters a connection by its key.
@@ -73,6 +73,23 @@ module Pakyow
         end
       end
 
+      # Pushes a message down a channel to a specific client (identified by key).
+      def push_message_to_socket_with_key(message, channel, key, propagated = false)
+        return if key.nil? || key.empty?
+
+        if registry.propagates? && !propagated
+          return registry.push_message_to_socket_with_key(message, channel, key)
+        else
+          connection = @connections.find { |_, connection|
+            connection and connection.key == key
+          }
+
+          if connection
+            connection[1].push(payload: message, channel: channel)
+          end
+        end
+      end
+
       private
 
       def propagate(message, channels)
@@ -80,7 +97,7 @@ module Pakyow
       end
 
       def propagated?(message)
-        message.include?(:__propagated)
+        message.include?(:__propagated) || message.include?('__propagated')
       end
 
       def connections_for_channel(channel_query)

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/helpers.rb

@@ -29,5 +29,12 @@ module Pakyow
     def socket_digest(socket_connection_id)
       Digest::SHA1.hexdigest("--#{socket_key}--#{socket_connection_id}--")
     end
+
+    module App
+      # @api private
+      def socket
+        Realtime::Context.new(self)
+      end
+    end
   end
 end

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/hooks.rb

@@ -1,15 +1,24 @@
 Pakyow::App.before :route do
   # we want to hijack websocket requests
   #
-  if req.env['HTTP_UPGRADE'] == 'websocket'
+  if req.env['HTTP_UPGRADE'] && req.env['HTTP_UPGRADE'].casecmp('websocket') == 0
     if Pakyow::Config.realtime.enabled
       socket_connection_id = params[:socket_connection_id]
       socket_digest = socket_digest(socket_connection_id)
 
-      conn = Pakyow::Realtime::Websocket.new(req, socket_digest)
+      begin
+        conn = Pakyow::Realtime::Websocket.new(req, socket_digest)
+      rescue Pakyow::Realtime::HandshakeError => e
+        logger.error e.message
+        res.status = 400
+        halt
+      end
 
       # register the connection with a unique key
       Pakyow::Realtime::Delegate.instance.register(socket_digest, conn)
+
+      # tell the connection that it's registered
+      conn.registered
     end
 
     halt
@@ -20,8 +29,10 @@ Pakyow::App.after :process do
   # mixin the socket connection id into the body tag
   # this id is used by pakyow.js to idenfity itself with the server
   #
-  if response.header['Content-Type'] == 'text/html' && Pakyow::Config.realtime.enabled
-    body = response.body[0]
+  if response.header['Content-Type'].include?('text/html') && Pakyow::Config.realtime.enabled
+    next if !response.body.is_a?(Array)
+
+    body = response.body.first
     next if body.nil?
 
     mixin = '<body data-socket-connection-id="' + socket_connection_id + '"'

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/message_handlers/call_route.rb

@@ -1,12 +1,7 @@
 # Calls an app route and returns a response, just like an HTTP request!
 #
 Pakyow::Realtime.handler :'call-route' do |message, session, response|
-  path, qs = message['uri'].split('?')
-  path_parts = path.split('/')
-  path_parts[-1] += '.json'
-  uri = [path_parts.join('/'), qs].join('?')
-
-  env = Rack::MockRequest.env_for(uri, method: message['method'])
+  env = Rack::MockRequest.env_for(message['uri'], method: message['method'])
   env['pakyow.socket'] = true
   env['pakyow.data'] = message['input']
   env['rack.session'] = session
@@ -14,13 +9,15 @@ Pakyow::Realtime.handler :'call-route' do |message, session, response|
   # TODO: in production we want to push the message to a queue and
   # let the next available app instance pick it up, rather than
   # the current instance to handle all traffic on this socket
-  app = Pakyow.app.dup
-  res = app.process(env)
+
+  context = Pakyow::CallContext.new(env)
+  context.process
+  res = context.finish
 
   container = message['container']
   partial = message['partial']
 
-  composer = app.presenter.composer
+  composer = context.presenter.composer
 
   if container
     body = composer.container(container.to_sym).includes(composer.partials).to_s
@@ -32,6 +29,6 @@ Pakyow::Realtime.handler :'call-route' do |message, session, response|
 
   response[:status]  = res[0]
   response[:headers] = res[1]
-  response[:body]    = body
+  response[:body]    = body.is_a?(StringIO) ? body.read : body
   response
 end

data/pakyow-realtime/lib/pakyow/realtime/redis_subscription.rb

@@ -0,0 +1,61 @@
+require 'redis'
+require 'concurrent'
+
+module Pakyow
+  module Realtime
+    # Manages channel subscriptions for this application instance's WebSockets.
+    #
+    # @api private
+    class RedisSubscription
+      SIGNAL_UNSUBSCRIBE = 'unsubscribe'
+
+      def initialize
+        @redis = ::Redis.new(Config.realtime.redis)
+      end
+
+      def subscribe(channels = [])
+        channels << signal_channel
+
+        Concurrent::Future.execute {
+          @redis.subscribe(*channels) do |on|
+            on.message do |channel, msg|
+              begin
+                msg = JSON.parse(msg)
+
+                if channel == signal_channel
+                  if msg['signal'] == SIGNAL_UNSUBSCRIBE
+                    @resubscribe_channels = msg['resubscribe_channels']
+                    @redis.unsubscribe
+                  end
+                end
+
+                if msg.is_a?(Hash)
+                  msg[:__propagated] = true
+                elsif msg.is_a?(Array)
+                  msg << :__propagated
+                end
+
+                context = Pakyow::Realtime::Context.new(Pakyow.app)
+
+                if msg.key?('key')
+                  context.push_message_to_socket_with_key(msg['message'], msg['channel'], msg['key'], true)
+                else
+                  context.push(msg, channel)
+                end
+              rescue StandardError => e
+                Pakyow.logger.error "RedisSubscription encountered a fatal error:"
+                Pakyow.logger.error e.message
+              end
+            end
+          end
+
+          subscribe(@resubscribe_channels) if @resubscribe_channels
+        }
+      end
+
+      def signal_channel
+        "pw:#{object_id}:signal"
+      end
+    end
+  end
+end

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/registries/redis_registry.rb

@@ -2,7 +2,8 @@ require 'json'
 require 'redis'
 require 'singleton'
 
-require_relative '../redis_subscription'
+require 'pakyow/realtime/redis_subscription'
+require 'pakyow/realtime/registries/simple_registry'
 
 module Pakyow
   module Realtime
@@ -15,37 +16,38 @@ module Pakyow
     # deployments with more than one app instance.
     #
     # @api private
-    class RedisRegistry
-      include Singleton
-
+    class RedisRegistry < SimpleRegistry
       attr_reader :subscriber
 
-      def initialize
-        @channels = []
-      end
-
       def channels_for_key(key)
-        channels(key)
+        value = Pakyow::Realtime.redis.hget(channel_key, key)
+        value ? JSON.parse(value) : []
       end
 
       def unregister_key(key)
+        super
+
         Pakyow::Realtime.redis.hdel(channel_key, key)
+        resubscribe
       end
 
       def subscribe_to_channels_for_key(channels, key)
-        new_channels = channels(key).concat(Array.ensure(channels)).uniq
-        Pakyow::Realtime.redis.hset(channel_key, key, new_channels.to_json)
+        channels << "pw:socket:#{key}"
+        super
 
-        @channels.concat(channels).uniq!
         resubscribe
+
+        new_channels = channels_for_key(key).concat(Array.ensure(channels)).uniq
+        Pakyow::Realtime.redis.hset(channel_key, key, new_channels.to_json)
       end
 
       def unsubscribe_to_channels_for_key(channels, key)
-        new_channels = channels(key) - Array.ensure(channels)
-        Pakyow::Realtime.redis.hset(channel_key, key, new_channels.to_json)
+        super
 
-        channels.each { |channel| @channels.delete(channel) }
         resubscribe
+
+        new_channels = channels_for_key(key) - Array.ensure(channels)
+        Pakyow::Realtime.redis.hset(channel_key, key, new_channels.to_json)
       end
 
       def propagates?
@@ -60,35 +62,46 @@ module Pakyow
         end
       end
 
-      def subscribe_for_propagation(channels)
-        @channels.concat(channels).uniq!
+      def subscribe_for_propagation(channels, key)
+        @channels[key] ||= []
+        @channels[key].concat(Array.ensure(channels)) << "pw:socket:#{key}"
+        @channels[key].uniq!
+
         resubscribe
       end
 
+      def push_message_to_socket_with_key(message, channel, key)
+        propagate({
+            key: key,
+            channel: channel,
+            message: message
+          },
+
+          ["pw:socket:#{key}"])
+      end
+
       private
 
-      # Terminates the current subscriber and creates a new
-      # subscriber with the current channels.
+      # Tells the subscription to unsubscribe from the current
+      # list of channels, then subscribes it to the new list.
       def resubscribe
+        channels = @channels.values.flatten.uniq
+
         if @subscriber
-          Pakyow::Realtime.redis.publish(@subscriber.signal_channel, RedisSubscription::SIGNAL_UNSUBSCRIBE)
+          Pakyow::Realtime.redis.publish(@subscriber.signal_channel, {
+            'signal' => RedisSubscription::SIGNAL_UNSUBSCRIBE,
+            'resubscribe_channels' => channels
+          }.to_json)
         else
           @subscriber = RedisSubscription.new
+          @subscriber.subscribe(channels)
         end
-
-        @subscriber.subscribe(@channels)
       end
 
       # Returns the key used to store channels.
       def channel_key
         Config.realtime.redis_key
       end
-
-      # Returns the channels for a specific key, or all channels.
-      def channels(key)
-        value = Pakyow::Realtime.redis.hget(channel_key, key)
-        (value ? JSON.parse(value) : []).map(&:to_sym)
-      end
     end
   end
 end

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/registries/simple_registry.rb

@@ -24,14 +24,14 @@ module Pakyow
 
       def subscribe_to_channels_for_key(channels, key)
         @channels[key] ||= []
-        @channels[key].concat(Array.ensure(channels.map(&:to_sym))).uniq!
+        @channels[key].concat(Array.ensure(channels)).uniq!
       end
 
       def unsubscribe_to_channels_for_key(channels, key)
         @channels[key] ||= []
-        @channels[key] = @channels[key] - Array.ensure(channels.map(&:to_sym))
+        @channels[key] = @channels[key] - Array.ensure(channels)
       end
-      
+
       def propagates?
         false
       end

data/pakyow-realtime/lib/{pakyow-realtime → pakyow/realtime}/websocket.rb

@@ -1,5 +1,5 @@
 require 'concurrent'
-require 'websocket_parser'
+require 'websocket'
 
 require_relative 'connection'
 
@@ -18,10 +18,13 @@ module Pakyow
         @req = req
         @key = key
 
-        @handshake = handshake!(req)
-        @socket = hijack!(req)
+        @socket = hijack(req)
+        @server = handshake(req)
+        setup
+      end
 
-        handle_handshake
+      def registered
+        handle_ws_join
       end
 
       def shutdown
@@ -41,7 +44,19 @@ module Pakyow
       def push(msg)
         json = JSON.pretty_generate(msg)
         logger.debug "(ws.#{@key}) sending message: #{json}\n"
-        WebSocket::Message.new(json).write(@socket)
+
+        frame = WebSocket::Frame::Outgoing::Server.new(
+          version: @server.version,
+          data: json,
+          type: :text)
+        @socket.write(frame.to_s)
+      rescue StandardError => e
+        logger.error "(#{@key}): WebSocket encountered a fatal error:"
+        logger.error e.message
+
+        # something went wrong (like a broken pipe); shutdown
+        # and let the socket reconnect if it's still around
+        shutdown
       end
 
       def self.on(event, &block)
@@ -50,11 +65,7 @@ module Pakyow
 
       private
 
-      def handshake!(req)
-        WebSocket::ClientHandshake.new(:get, req.url, handshake_headers(req))
-      end
-
-      def hijack!(req)
+      def hijack(req)
         if req.env['rack.hijack']
           req.env['rack.hijack'].call
           return req.env['rack.hijack_io']
@@ -63,75 +74,62 @@ module Pakyow
         end
       end
 
-      def handshake_headers(req)
-        {
-          'Upgrade' => req.env['HTTP_UPGRADE'],
-          'Sec-WebSocket-Version' => req.env['HTTP_SEC_WEBSOCKET_VERSION'],
-          'Sec-Websocket-Key' => req.env['HTTP_SEC_WEBSOCKET_KEY']
-        }
-      end
-
-      def handle_handshake
-        return if @socket.nil?
-
-        if @handshake.valid?
-          accept_handshake
-          setup
-        else
-          fail_handshake
+      def handshake(req)
+        data = "#{req.env['REQUEST_METHOD']} #{req.env['REQUEST_URI']} #{req.env['SERVER_PROTOCOL']}\r\n"
+        req.env.each_pair do |key, val|
+          if key =~ /^HTTP_(.*)/
+            name = rack_env_key_to_http_header_name($1)
+            data << "#{name}: #{val}\r\n"
+          end
         end
-      end
+        data << "\r\n"
 
-      def accept_handshake
-        response = @handshake.accept_response
-        response.render(@socket)
-      end
+        server = WebSocket::Handshake::Server.new
+        server << data
 
-      def fail_handshake
-        error = @handshake.errors.first
+        fail HandshakeError, "(ws.#{@key}) error during handshake" unless server.valid?
+        @socket.write(server.to_s)
 
-        response = Rack::Response.new(400)
-        response.render(@socket)
+        server
+      end
 
-        fail HandshakeError, "(ws.#{@key}) error during handshake: #{error}"
+      def rack_env_key_to_http_header_name(key)
+        name = key.downcase.gsub('_', '-')
+        name[0] = name[0].upcase
+        name.gsub!(/-(.)/) do |chr|
+          chr.upcase
+        end
+        name
       end
 
       def setup
         logger.info "(ws.#{@key}) client established connection"
-        handle_ws_join
 
-        @parser = WebSocket::Parser.new
+        @parser = Parser.new(version: @server.version)
 
-        @parser.on_message do |message|
+        @parser.on :message do |message|
           handle_ws_message(message)
         end
 
-        @parser.on_error do |error|
+        @parser.on :error do |error|
           logger.error "(ws.#{@key}) encountered error #{error}"
           handle_ws_error(error)
         end
 
-        @parser.on_close do |status, message|
+        @parser.on :close do |status, message|
           logger.info "(ws.#{@key}) client closed connection"
           handle_ws_close(status, message)
         end
 
-        @parser.on_ping do |payload|
-          handle_ws_ping(payload)
-        end
-
-        @reader = Concurrent::Future.execute {
+        Concurrent::Future.execute {
           begin
             loop do
               break if shutdown?
-              @parser << @socket.read_nonblock(16_384)
+              @parser << @socket.read_nonblock(1024)
             end
           rescue ::IO::WaitReadable
             IO.select([@socket])
             retry
-          rescue EOFError
-            @parent.delegate.unregister(@key)
-            @parent.shutdown
           end
         }
       end
@@ -158,25 +156,14 @@ module Pakyow
       end
 
       def handle_ws_close(_status, _message)
-        @socket << WebSocket::Message.close.to_data
         shutdown
       end
 
-      def handle_ws_ping(payload)
-        @socket << WebSocket::Message.pong(payload).to_data
-      end
-
       def self.handle_event(event, req)
-        if Pakyow.app
-          app = Pakyow.app.dup
-          app.context = AppContext.new(req)
-
-          ui = Pakyow.app.instance_variable_get(:@ui)
-          app.context.ui = ui.dup if ui
-        end
+        context = CallContext.new(req.env)
 
         event_handlers(event).each do |block|
-          app.instance_exec(&block)
+          context.instance_exec(&block)
         end
       end
 
@@ -184,5 +171,39 @@ module Pakyow
         @event_handlers.fetch(event, [])
       end
     end
+
+    class Parser
+      def initialize(version: nil)
+        @parser = WebSocket::Frame::Incoming::Server.new(version: version)
+        @handlers = {}
+      end
+
+      def on(event, &block)
+        @handlers[event] = block
+      end
+
+      def <<(data)
+        @parser << data
+        process
+      end
+
+      private
+
+      def process
+        while (frame = @parser.next)
+          case frame.type
+          when :text
+            handle :message, frame
+          when :close
+            handle :close, frame
+          end
+        end
+      end
+
+      def handle(event, frame)
+        return unless @handlers.keys.include?(event)
+        @handlers[event].call(frame.data)
+      end
+    end
   end
 end

data/pakyow-realtime/lib/pakyow/realtime.rb

@@ -0,0 +1,19 @@
+require 'securerandom'
+require 'json'
+
+require 'pakyow/support'
+require 'pakyow/core'
+require 'pakyow/realtime/helpers'
+require 'pakyow/realtime/hooks'
+require 'pakyow/realtime/context'
+require 'pakyow/realtime/delegate'
+require 'pakyow/realtime/registries/simple_registry'
+require 'pakyow/realtime/registries/redis_registry'
+require 'pakyow/realtime/redis_subscription'
+require 'pakyow/realtime/websocket'
+require 'pakyow/realtime/config'
+require 'pakyow/realtime/exceptions'
+require 'pakyow/realtime/message_handler'
+require 'pakyow/realtime/message_handlers/call_route'
+require 'pakyow/realtime/message_handlers/ping'
+require 'pakyow/realtime/ext/request'

data/pakyow-realtime/lib/pakyow-realtime.rb

@@ -1,21 +1 @@
-require 'securerandom'
-require 'json'
-
-require 'pakyow-support'
-require 'pakyow-core'
-
-require_relative 'pakyow-realtime/helpers'
-require_relative 'pakyow-realtime/hooks'
-require_relative 'pakyow-realtime/context'
-require_relative 'pakyow-realtime/delegate'
-require_relative 'pakyow-realtime/registries/simple_registry'
-require_relative 'pakyow-realtime/registries/redis_registry'
-require_relative 'pakyow-realtime/redis_subscription'
-require_relative 'pakyow-realtime/websocket'
-require_relative 'pakyow-realtime/config'
-require_relative 'pakyow-realtime/exceptions'
-require_relative 'pakyow-realtime/message_handler'
-require_relative 'pakyow-realtime/message_handlers/call_route'
-require_relative 'pakyow-realtime/message_handlers/ping'
-
-require_relative 'pakyow-realtime/ext/request'
+require 'pakyow/realtime'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-realtime
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-support
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: pakyow-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
-  name: websocket_parser
+  name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -90,21 +90,22 @@ files:
 - pakyow-realtime/LICENSE
 - pakyow-realtime/README.md
 - pakyow-realtime/lib/pakyow-realtime.rb
-- pakyow-realtime/lib/pakyow-realtime/config.rb
-- pakyow-realtime/lib/pakyow-realtime/connection.rb
-- pakyow-realtime/lib/pakyow-realtime/context.rb
-- pakyow-realtime/lib/pakyow-realtime/delegate.rb
-- pakyow-realtime/lib/pakyow-realtime/exceptions.rb
-- pakyow-realtime/lib/pakyow-realtime/ext/request.rb
-- pakyow-realtime/lib/pakyow-realtime/helpers.rb
-- pakyow-realtime/lib/pakyow-realtime/hooks.rb
-- pakyow-realtime/lib/pakyow-realtime/message_handler.rb
-- pakyow-realtime/lib/pakyow-realtime/message_handlers/call_route.rb
-- pakyow-realtime/lib/pakyow-realtime/message_handlers/ping.rb
-- pakyow-realtime/lib/pakyow-realtime/redis_subscription.rb
-- pakyow-realtime/lib/pakyow-realtime/registries/redis_registry.rb
-- pakyow-realtime/lib/pakyow-realtime/registries/simple_registry.rb
-- pakyow-realtime/lib/pakyow-realtime/websocket.rb
+- pakyow-realtime/lib/pakyow/realtime.rb
+- pakyow-realtime/lib/pakyow/realtime/config.rb
+- pakyow-realtime/lib/pakyow/realtime/connection.rb
+- pakyow-realtime/lib/pakyow/realtime/context.rb
+- pakyow-realtime/lib/pakyow/realtime/delegate.rb
+- pakyow-realtime/lib/pakyow/realtime/exceptions.rb
+- pakyow-realtime/lib/pakyow/realtime/ext/request.rb
+- pakyow-realtime/lib/pakyow/realtime/helpers.rb
+- pakyow-realtime/lib/pakyow/realtime/hooks.rb
+- pakyow-realtime/lib/pakyow/realtime/message_handler.rb
+- pakyow-realtime/lib/pakyow/realtime/message_handlers/call_route.rb
+- pakyow-realtime/lib/pakyow/realtime/message_handlers/ping.rb
+- pakyow-realtime/lib/pakyow/realtime/redis_subscription.rb
+- pakyow-realtime/lib/pakyow/realtime/registries/redis_registry.rb
+- pakyow-realtime/lib/pakyow/realtime/registries/simple_registry.rb
+- pakyow-realtime/lib/pakyow/realtime/websocket.rb
 homepage: http://pakyow.org
 licenses:
 - MIT
@@ -125,9 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pakyow Realtime
 test_files: []
-has_rdoc: 

data/pakyow-realtime/lib/pakyow-realtime/redis_subscription.rb

@@ -1,49 +0,0 @@
-require 'redis'
-require 'concurrent'
-
-module Pakyow
-  module Realtime
-    # Manages channel subscriptions for this application instance's WebSockets.
-    #
-    # @api private
-    class RedisSubscription
-      SIGNAL_UNSUBSCRIBE = :unsubscribe
-
-      def initialize
-        @redis = ::Redis.new(Config.realtime.redis)
-      end
-
-      def subscribe(channels = [])
-        channels << signal_channel
-
-        Concurrent::Future.execute {
-          @redis.subscribe(*channels) do |on|
-            on.message do |channel, msg|
-              if channel == signal_channel
-                if msg == SIGNAL_UNSUBSCRIBE
-                  @redis.unsubscribe
-                  return
-                end
-              end
-
-              msg = JSON.parse(msg)
-
-              if msg.is_a?(Hash)
-                msg[:__propagated] = true
-              elsif msg.is_a?(Array)
-                msg << :__propagated
-              end
-
-              context = Pakyow::Realtime::Context.new(Pakyow.app)
-              context.push(msg, channel)
-            end
-          end
-        }
-      end
-
-      def signal_channel
-        "pw:#{object_id}:signal"
-      end
-    end
-  end
-end