faye 1.0.4 → 1.1.0

data/lib/faye.rb

@@ -14,30 +14,31 @@ require 'time'
 require 'uri'
 
 module Faye
-  VERSION = '1.0.4'
+  VERSION = '1.1.0'
 
   ROOT = File.expand_path(File.dirname(__FILE__))
 
-  autoload :Publisher,    File.join(ROOT, 'faye', 'mixins', 'publisher')
   autoload :Deferrable,   File.join(ROOT, 'faye', 'mixins', 'deferrable')
-  autoload :Timeouts,     File.join(ROOT, 'faye', 'mixins', 'timeouts')
   autoload :Logging,      File.join(ROOT, 'faye', 'mixins', 'logging')
+  autoload :Publisher,    File.join(ROOT, 'faye', 'mixins', 'publisher')
+  autoload :Timeouts,     File.join(ROOT, 'faye', 'mixins', 'timeouts')
 
   autoload :Namespace,    File.join(ROOT, 'faye', 'util', 'namespace')
 
   autoload :Engine,       File.join(ROOT, 'faye', 'engines', 'proxy')
 
-  autoload :Grammar,      File.join(ROOT, 'faye', 'protocol', 'grammar')
-  autoload :Extensible,   File.join(ROOT, 'faye', 'protocol', 'extensible')
   autoload :Channel,      File.join(ROOT, 'faye', 'protocol', 'channel')
-  autoload :Envelope,     File.join(ROOT, 'faye', 'protocol', 'envelope')
-  autoload :Subscription, File.join(ROOT, 'faye', 'protocol', 'subscription')
-  autoload :Publication,  File.join(ROOT, 'faye', 'protocol', 'publication')
   autoload :Client,       File.join(ROOT, 'faye', 'protocol', 'client')
+  autoload :Dispatcher,   File.join(ROOT, 'faye', 'protocol', 'dispatcher')
+  autoload :Scheduler,    File.join(ROOT, 'faye', 'protocol', 'scheduler')
+  autoload :Extensible,   File.join(ROOT, 'faye', 'protocol', 'extensible')
+  autoload :Grammar,      File.join(ROOT, 'faye', 'protocol', 'grammar')
+  autoload :Publication,  File.join(ROOT, 'faye', 'protocol', 'publication')
   autoload :Server,       File.join(ROOT, 'faye', 'protocol', 'server')
+  autoload :Subscription, File.join(ROOT, 'faye', 'protocol', 'subscription')
 
-  autoload :Transport,    File.join(ROOT, 'faye', 'transport', 'transport')
   autoload :Error,        File.join(ROOT, 'faye', 'error')
+  autoload :Transport,    File.join(ROOT, 'faye', 'transport', 'transport')
 
   autoload :RackAdapter,  File.join(ROOT, 'faye', 'adapters', 'rack_adapter')
   autoload :StaticServer, File.join(ROOT, 'faye', 'adapters', 'static_server')
@@ -125,4 +126,3 @@ module Faye
     resume.call
   end
 end
-

data/lib/faye/adapters/rack_adapter.rb

@@ -22,11 +22,14 @@ module Faye
     # down. Better suggestions welcome.
     HTTP_X_NO_CONTENT_LENGTH = 'HTTP_X_NO_CONTENT_LENGTH'
 
-    def initialize(app = nil, options = nil)
+    def initialize(app = nil, options = nil, &block)
       @app     = app if app.respond_to?(:call)
       @options = [app, options].grep(Hash).first || {}
 
+      ::WebSocket::Driver.validate_options(@options, [:engine, :mount, :ping, :timeout, :extensions, :websocket_extensions])
+
       @endpoint    = @options[:mount] || DEFAULT_ENDPOINT
+      @extensions  = []
       @endpoint_re = Regexp.new('^' + @endpoint.gsub(/\/$/, '') + '(/[^/]*)*(\\.[^\\.]+)?$')
       @server      = Server.new(@options)
 
@@ -34,8 +37,15 @@ module Faye
       @static.map(File.basename(@endpoint) + '.js', SCRIPT_PATH)
       @static.map('client.js', SCRIPT_PATH)
 
-      return unless extensions = @options[:extensions]
-      [*extensions].each { |extension| add_extension(extension) }
+      if extensions = @options[:extensions]
+        [*extensions].each { |extension| add_extension(extension) }
+      end
+
+      if websocket_extensions = @options[:websocket_extensions]
+        [*websocket_extensions].each { |ext| add_websocket_extension(ext) }
+      end
+
+      block.call(self) if block
     end
 
     def listen(*args)
@@ -50,6 +60,10 @@ module Faye
       @server.remove_extension(extension)
     end
 
+    def add_websocket_extension(extension)
+      @extensions << extension
+    end
+
     def close
       @server.close
     end
@@ -89,7 +103,12 @@ module Faye
         return [400, TYPE_TEXT, ['Bad request']]
       end
 
-      debug "Received message via HTTP #{request.request_method}: ?", json_msg
+      unless json_msg.force_encoding('UTF-8').valid_encoding?
+        error 'Received request with invalid encoding: ?', format_request(request)
+        return [400, TYPE_TEXT, ['Bad request']]
+      end
+
+      debug("Received message via HTTP #{request.request_method}: ?", json_msg)
 
       message  = MultiJson.load(json_msg)
       jsonp    = request.params['jsonp'] || JSONP_CALLBACK
@@ -120,7 +139,7 @@ module Faye
 
           headers['Content-Length'] = response.bytesize.to_s unless request.env[HTTP_X_NO_CONTENT_LENGTH]
           headers['Connection'] = 'close'
-          debug 'HTTP response: ?', response
+          debug('HTTP response: ?', response)
           send_response([200, headers, [response]], hijack, callback)
         end
       end
@@ -169,17 +188,18 @@ module Faye
     end
 
     def handle_websocket(request)
-      ws        = Faye::WebSocket.new(request.env, nil, :ping => @options[:ping])
+      options   = {:extensions => @extensions, :ping => @options[:ping]}
+      ws        = Faye::WebSocket.new(request.env, [], options)
       client_id = nil
 
       ws.onmessage = lambda do |event|
         begin
-          debug "Received message via WebSocket[#{ws.version}]: ?", event.data
+          debug("Received message via WebSocket[#{ws.version}]: ?", event.data)
 
           message = MultiJson.load(event.data)
           cid     = Faye.client_id_from_messages(message)
 
-          @server.close_socket(client_id) if client_id and cid and cid != client_id
+          @server.close_socket(client_id, false) if client_id and cid and cid != client_id
           @server.open_socket(cid, ws, request)
           client_id = cid
 
@@ -203,7 +223,7 @@ module Faye
       es        = Faye::EventSource.new(request.env, :ping => @options[:ping])
       client_id = es.url.split('/').pop
 
-      debug 'Opened EventSource connection for ?', client_id
+      debug('Opened EventSource connection for ?', client_id)
       @server.open_socket(client_id, es, request)
 
       es.onclose = lambda do |event|
@@ -238,4 +258,3 @@ module Faye
 
   end
 end
-

data/lib/faye/engines/connection.rb

@@ -15,7 +15,8 @@ module Faye
       end
 
       def deliver(message)
-        return socket.send(message) if socket
+        message.delete('clientId')
+        return @socket.send(message) if @socket
         return unless @inbox.add?(message)
         begin_delivery_timeout
       end
@@ -31,28 +32,27 @@ module Faye
         begin_connection_timeout(timeout)
       end
 
-      def flush!(force = false)
-        @engine.close_connection(@id) if force or socket.nil?
-
+      def flush
         remove_timeout(:connection)
         remove_timeout(:delivery)
 
         set_deferred_status(:succeeded, @inbox.entries)
         @inbox = []
+
+        @engine.close_connection(@id) unless @socket
       end
 
     private
 
       def begin_delivery_timeout
         return if @inbox.empty?
-        add_timeout(:delivery, MAX_DELAY) { flush! }
+        add_timeout(:delivery, MAX_DELAY) { flush }
       end
 
       def begin_connection_timeout(timeout)
-        add_timeout(:connection, timeout) { flush! }
+        add_timeout(:connection, timeout) { flush }
       end
     end
 
   end
 end
-

data/lib/faye/engines/memory.rb

@@ -28,7 +28,7 @@ module Faye
 
       def create_client(&callback)
         client_id = @namespace.generate
-        @server.debug 'Created new client ?', client_id
+        @server.debug('Created new client ?', client_id)
         ping(client_id)
         @server.trigger(:handshake, client_id)
         callback.call(client_id)
@@ -44,7 +44,7 @@ module Faye
         remove_timeout(client_id)
         @namespace.release(client_id)
         @messages.delete(client_id)
-        @server.debug 'Destroyed client ?', client_id
+        @server.debug('Destroyed client ?', client_id)
         @server.trigger(:disconnect, client_id)
         @server.trigger(:close, client_id)
         callback.call if callback
@@ -57,7 +57,7 @@ module Faye
       def ping(client_id)
         timeout = @server.timeout
         return unless Numeric === timeout
-        @server.debug 'Ping ?, ?', client_id, timeout
+        @server.debug('Ping ?, ?', client_id, timeout)
         remove_timeout(client_id)
         add_timeout(client_id, 2 * timeout) { destroy_client(client_id) }
       end
@@ -69,7 +69,7 @@ module Faye
         @channels[channel] ||= Set.new
         @channels[channel].add(client_id)
 
-        @server.debug 'Subscribed client ? to channel ?', client_id, channel
+        @server.debug('Subscribed client ? to channel ?', client_id, channel)
         @server.trigger(:subscribe, client_id, channel) if should_trigger
         callback.call(true) if callback
       end
@@ -85,13 +85,13 @@ module Faye
           @channels.delete(channel) if @channels[channel].empty?
         end
 
-        @server.debug 'Unsubscribed client ? from channel ?', client_id, channel
+        @server.debug('Unsubscribed client ? from channel ?', client_id, channel)
         @server.trigger(:unsubscribe, client_id, channel) if should_trigger
         callback.call(true) if callback
       end
 
       def publish(message, channels)
-        @server.debug 'Publishing message ?', message
+        @server.debug('Publishing message ?', message)
 
         clients = Set.new
 
@@ -101,7 +101,7 @@ module Faye
         end
 
         clients.each do |client_id|
-          @server.debug 'Queueing for client ?: ?', client_id, message
+          @server.debug('Queueing for client ?: ?', client_id, message)
           @messages[client_id] ||= []
           @messages[client_id] << Faye.copy_object(message)
           empty_queue(client_id)
@@ -119,4 +119,3 @@ module Faye
 
   end
 end
-

data/lib/faye/engines/proxy.rb

@@ -21,7 +21,7 @@ module Faye
 
     def self.random(bitlength = ID_LENGTH)
       limit    = 2 ** bitlength
-      max_size = (limit - 1).to_s(36).size
+      max_size = (bitlength * Math.log(2) / Math.log(36)).ceil
       string   = SecureRandom.random_number(limit).to_s(36)
       string   = '0' + string while string.size < max_size
       string
@@ -48,14 +48,14 @@ module Faye
         @engine      = engine_class.create(self, @options)
 
         bind :close do |client_id|
-          EventMachine.next_tick { flush(client_id) }
+          EventMachine.next_tick { flush_connection(client_id) }
         end
 
-        debug 'Created new engine: ?', @options
+        debug('Created new engine: ?', @options)
       end
 
       def connect(client_id, options = {}, &callback)
-        debug 'Accepting connection from ?', client_id
+        debug('Accepting connection from ?', client_id)
         @engine.ping(client_id)
         conn = connection(client_id, true)
         conn.connect(options, &callback)
@@ -75,9 +75,8 @@ module Faye
       end
 
       def close_connection(client_id)
-        debug 'Closing connection for ?', client_id
-        conn = @connections[client_id]
-        return unless conn
+        debug('Closing connection for ?', client_id)
+        return unless conn = @connections[client_id]
         conn.socket.close if conn.socket
         trigger('connection:close', client_id)
         @connections.delete(client_id)
@@ -90,8 +89,7 @@ module Faye
 
       def deliver(client_id, messages)
         return if !messages || messages.empty?
-        conn = connection(client_id, false)
-        return false unless conn
+        return false unless conn = connection(client_id, false)
         messages.each(&conn.method(:deliver))
         true
       end
@@ -100,15 +98,17 @@ module Faye
         Engine.random
       end
 
-      def flush(client_id)
+      def flush_connection(client_id, close = true)
         return unless client_id
-        debug 'Flushing connection for ?', client_id
-        conn = connection(client_id, false)
-        conn.flush!(true) if conn
+        debug('Flushing connection for ?', client_id)
+        return unless conn = connection(client_id, false)
+        conn.socket = nil unless close
+        conn.flush
+        close_connection(client_id)
       end
 
       def close
-        @connections.keys.each { |client_id| flush(client_id) }
+        @connections.keys.each { |client_id| flush_connection(client_id) }
         @engine.disconnect
       end
 
@@ -124,4 +124,3 @@ module Faye
 
   end
 end
-

data/lib/faye/error.rb

@@ -46,4 +46,3 @@ module Faye
 
   end
 end
-

data/lib/faye/mixins/deferrable.rb

@@ -12,4 +12,3 @@ module Faye
 
   end
 end
-

data/lib/faye/mixins/logging.rb

@@ -33,4 +33,3 @@ module Faye
 
   end
 end
-

data/lib/faye/mixins/publisher.rb

@@ -16,4 +16,3 @@ module Faye
 
   end
 end
-

data/lib/faye/mixins/timeouts.rb

@@ -24,4 +24,3 @@ module Faye
     end
   end
 end
-

data/lib/faye/protocol/channel.rb

@@ -75,7 +75,7 @@ module Faye
     end
 
     class Set
-      def initialize(parent = nil, value = nil)
+      def initialize
         @channels = {}
       end
 
@@ -92,10 +92,9 @@ module Faye
       end
 
       def subscribe(names, callback)
-        return unless callback
         names.each do |name|
           channel = @channels[name] ||= Channel.new(name)
-          channel.bind(:message, &callback)
+          channel.bind(:message, &callback) if callback
         end
       end
 
@@ -122,4 +121,3 @@ module Faye
 
   end
 end
-

data/lib/faye/protocol/client.rb

@@ -6,59 +6,42 @@ module Faye
     include Logging
     include Extensible
 
-    UNCONNECTED         = 1
-    CONNECTING          = 2
-    CONNECTED           = 3
-    DISCONNECTED        = 4
+    UNCONNECTED        = 1
+    CONNECTING         = 2
+    CONNECTED          = 3
+    DISCONNECTED       = 4
 
-    HANDSHAKE           = 'handshake'
-    RETRY               = 'retry'
-    NONE                = 'none'
+    HANDSHAKE          = 'handshake'
+    RETRY              = 'retry'
+    NONE               = 'none'
 
-    CONNECTION_TIMEOUT  = 60.0
-    DEFAULT_RETRY       = 5.0
-    MAX_REQUEST_SIZE    = 2048
+    CONNECTION_TIMEOUT = 60.0
 
-    attr_reader :cookies, :endpoint, :endpoints, :headers, :max_request_size, :retry, :transports
+    extend Forwardable
+    def_delegators :@dispatcher, :add_websocket_extension, :disable, :set_header
 
     def initialize(endpoint = nil, options = {})
+      ::WebSocket::Driver.validate_options(options, [:interval, :timeout, :endpoints, :proxy, :retry, :scheduler, :websocket_extensions])
       super()
       info('New client created for ?', endpoint)
 
-      @options    = options
-      @endpoint   = Faye.parse_url(endpoint || RackAdapter::DEFAULT_ENDPOINT)
-      @endpoints  = @options[:endpoints] || {}
-      @transports = {}
-      @cookies    = CookieJar::Jar.new
-      @headers    = {}
-      @disabled   = []
-      @retry      = @options[:retry] || DEFAULT_RETRY
-
-      @endpoints.each do |key, value|
-        @endpoints[key] = Faye.parse_url(value)
-      end
-
-      @max_request_size = MAX_REQUEST_SIZE
-
-      @state      = UNCONNECTED
+      @endpoint   = endpoint || RackAdapter::DEFAULT_ENDPOINT
       @channels   = Channel::Set.new
+      @dispatcher = Dispatcher.new(self, @endpoint, options)
+
       @message_id = 0
+      @state      = UNCONNECTED
 
       @response_callbacks = {}
 
       @advice = {
         'reconnect' => RETRY,
-        'interval'  => 1000.0 * (@options[:interval] || Engine::INTERVAL),
-        'timeout'   => 1000.0 * (@options[:timeout]  || CONNECTION_TIMEOUT)
+        'interval'  => 1000.0 * (options[:interval] || Engine::INTERVAL),
+        'timeout'   => 1000.0 * (options[:timeout]  || CONNECTION_TIMEOUT)
       }
-    end
-
-    def disable(feature)
-      @disabled << feature
-    end
+      @dispatcher.timeout = @advice['timeout'] / 1000.0
 
-    def set_header(name, value)
-      @headers[name.to_s] = value.to_s
+      @dispatcher.bind(:message, &method(:receive_message))
     end
 
     # Request
@@ -87,29 +70,29 @@ module Faye
       @state = CONNECTING
 
       info('Initiating handshake with ?', @endpoint)
-      select_transport(MANDATORY_CONNECTION_TYPES)
+      @dispatcher.select_transport(MANDATORY_CONNECTION_TYPES)
 
-      send({
-        'channel'                   => Channel::HANDSHAKE,
-        'version'                   => BAYEUX_VERSION,
-        'supportedConnectionTypes'  => [@transport.connection_type]
+      send_message({
+        'channel'                  => Channel::HANDSHAKE,
+        'version'                  => BAYEUX_VERSION,
+        'supportedConnectionTypes' => @dispatcher.connection_types
 
-      }) do |response|
+      }, {}) do |response|
 
         if response['successful']
-          @state     = CONNECTED
-          @client_id = response['clientId']
+          @state = CONNECTED
+          @dispatcher.client_id = response['clientId']
 
-          select_transport(response['supportedConnectionTypes'])
+          @dispatcher.select_transport(response['supportedConnectionTypes'])
 
-          info('Handshake successful: ?', @client_id)
+          info('Handshake successful: ?', @dispatcher.client_id)
 
           subscribe(@channels.keys, true)
           block.call if block_given?
 
         else
           info('Handshake unsuccessful')
-          EventMachine.add_timer(@advice['interval'] / 1000.0) { handshake(&block) }
+          EventMachine.add_timer(@dispatcher.retry) { handshake(&block) }
           @state = UNCONNECTED
         end
       end
@@ -133,21 +116,21 @@ module Faye
       callback(&block)
       return unless @state == CONNECTED
 
-      info('Calling deferred actions for ?', @client_id)
+      info('Calling deferred actions for ?', @dispatcher.client_id)
       set_deferred_status(:succeeded)
       set_deferred_status(:unknown)
 
       return unless @connect_request.nil?
       @connect_request = true
 
-      info('Initiating connection for ?', @client_id)
+      info('Initiating connection for ?', @dispatcher.client_id)
 
-      send({
-        'channel'         => Channel::CONNECT,
-        'clientId'        => @client_id,
-        'connectionType'  => @transport.connection_type
+      send_message({
+        'channel'        => Channel::CONNECT,
+        'clientId'       => @dispatcher.client_id,
+        'connectionType' => @dispatcher.connection_type
 
-      }) do
+      }, {}) do
         cycle_connection
       end
     end
@@ -163,18 +146,26 @@ module Faye
       return unless @state == CONNECTED
       @state = DISCONNECTED
 
-      info('Disconnecting ?', @client_id)
+      info('Disconnecting ?', @dispatcher.client_id)
+      promise = Publication.new
 
-      send({
-        'channel'   => Channel::DISCONNECT,
-        'clientId'  => @client_id
+      send_message({
+        'channel'  => Channel::DISCONNECT,
+        'clientId' => @dispatcher.client_id
 
-      }) do |response|
-        @transport.close if response['successful']
+      }, {}) do |response|
+        if response['successful']
+          @dispatcher.close
+          promise.set_deferred_status(:succeeded)
+        else
+          promise.set_deferred_status(:failed, Error.parse(response['error']))
+        end
       end
 
-      info('Clearing channel listeners for ?', @client_id)
+      info('Clearing channel listeners for ?', @dispatcher.client_id)
       @channels = Channel::Set.new
+
+      promise
     end
 
     # Request                              Response
@@ -202,22 +193,22 @@ module Faye
       end
 
       connect {
-        info('Client ? attempting to subscribe to ?', @client_id, channel)
+        info('Client ? attempting to subscribe to ?', @dispatcher.client_id, channel)
         @channels.subscribe([channel], block) unless force
 
-        send({
-          'channel'       => Channel::SUBSCRIBE,
-          'clientId'      => @client_id,
-          'subscription'  => channel
+        send_message({
+          'channel'      => Channel::SUBSCRIBE,
+          'clientId'     => @dispatcher.client_id,
+          'subscription' => channel
 
-        }) do |response|
+        }, {}) do |response|
           unless response['successful']
             subscription.set_deferred_status(:failed, Error.parse(response['error']))
             next @channels.unsubscribe(channel, block)
           end
 
           channels = [response['subscription']].flatten
-          info('Subscription acknowledged for ? to ?', @client_id, channels)
+          info('Subscription acknowledged for ? to ?', @dispatcher.client_id, channels)
           subscription.set_deferred_status(:succeeded)
         end
       }
@@ -243,18 +234,18 @@ module Faye
       return unless dead
 
       connect {
-        info('Client ? attempting to unsubscribe from ?', @client_id, channel)
+        info('Client ? attempting to unsubscribe from ?', @dispatcher.client_id, channel)
 
-        send({
-          'channel'       => Channel::UNSUBSCRIBE,
-          'clientId'      => @client_id,
-          'subscription'  => channel
+        send_message({
+          'channel'      => Channel::UNSUBSCRIBE,
+          'clientId'     => @dispatcher.client_id,
+          'subscription' => channel
 
-        }) do |response|
+        }, {}) do |response|
           next unless response['successful']
 
           channels = [response['subscription']].flatten
-          info('Unsubscription acknowledged for ? from ?', @client_id, channels)
+          info('Unsubscription acknowledged for ? from ?', @dispatcher.client_id, channels)
         end
       }
     end
@@ -265,17 +256,19 @@ module Faye
     # MAY include:   * clientId            MAY include:   * id
     #                * id                                 * error
     #                * ext                                * ext
-    def publish(channel, data)
+    def publish(channel, data, options = {})
+      ::WebSocket::Driver.validate_options(options, [:attempts, :deadline])
+
       publication = Publication.new
       connect {
-        info('Client ? queueing published message to ?: ?', @client_id, channel, data)
+        info('Client ? queueing published message to ?: ?', @dispatcher.client_id, channel, data)
 
-        send({
-          'channel'   => channel,
-          'data'      => data,
-          'clientId'  => @client_id
+        send_message({
+          'channel'  => channel,
+          'data'     => data,
+          'clientId' => @dispatcher.client_id
 
-        }) do |response|
+        }, options) do |response|
           if response['successful']
             publication.set_deferred_status(:succeeded)
           else
@@ -286,81 +279,20 @@ module Faye
       publication
     end
 
-    def receive_message(message)
-      id = message['id']
-
-      if message.has_key?('successful')
-        callback = @response_callbacks.delete(id)
-      end
-
-      pipe_through_extensions(:incoming, message, nil) do |message|
-        next unless message
-
-        handle_advice(message['advice']) if message['advice']
-        deliver_message(message)
-
-        callback.call(message) if callback
-      end
-
-      return if @transport_up == true
-      @transport_up = true
-      trigger('transport:up')
-    end
-
-    def message_error(messages, immediate = false)
-      messages.each do |message|
-        id = message['id']
-
-        if immediate
-          transport_send(message)
-        else
-          EventMachine.add_timer(@retry) { transport_send(message) }
-        end
-      end
-
-      return if immediate or @transport_up == false
-      @transport_up = false
-      trigger('transport:down')
-    end
-
   private
 
-    def select_transport(transport_types)
-      Transport.get(self, transport_types, @disabled) do |transport|
-        debug('Selected ? transport for ?', transport.connection_type, transport.endpoint)
-
-        next if transport == @transport
-        @transport.close if @transport
-
-        @transport = transport
-      end
-    end
-
-    def send(message, &callback)
-      return unless @transport
+    def send_message(message, options, &callback)
       message['id'] = generate_message_id
 
-      pipe_through_extensions(:outgoing, message, nil) do |message|
-        next unless message
-        @response_callbacks[message['id']] = callback if callback
-        transport_send(message)
-      end
-    end
-
-    def transport_send(message)
-      return unless @transport
-
       timeout = [nil, 0].include?(@advice['timeout']) ?
-                1.2 * @retry :
+                1.2 * @dispatcher.retry :
                 1.2 * @advice['timeout'] / 1000.0
 
-      envelope = Envelope.new(message, timeout)
-
-      envelope.errback do |immediate|
-        message_error([message], immediate)
+      pipe_through_extensions(:outgoing, message, nil) do |message|
+        next unless message
+        @response_callbacks[message['id']] = callback if callback
+        @dispatcher.send_message(message, timeout, options)
       end
-
-      @transport.send(envelope)
     end
 
     def generate_message_id
@@ -369,30 +301,45 @@ module Faye
       @message_id.to_s(36)
     end
 
+    def receive_message(message)
+      id = message['id']
+
+      if message.has_key?('successful')
+        callback = @response_callbacks.delete(id)
+      end
+
+      pipe_through_extensions(:incoming, message, nil) do |message|
+        next unless message
+        handle_advice(message['advice']) if message['advice']
+        deliver_message(message)
+        callback.call(message) if callback
+      end
+    end
+
     def handle_advice(advice)
       @advice.update(advice)
+      @dispatcher.timeout = @advice['timeout'] / 1000.0
 
       if @advice['reconnect'] == HANDSHAKE and @state != DISCONNECTED
-        @state     = UNCONNECTED
-        @client_id = nil
+        @state = UNCONNECTED
+        @dispatcher.client_id = nil
         cycle_connection
       end
     end
 
     def deliver_message(message)
       return unless message.has_key?('channel') and message.has_key?('data')
-      info('Client ? calling listeners for ? with ?', @client_id, message['channel'], message['data'])
+      info('Client ? calling listeners for ? with ?', @dispatcher.client_id, message['channel'], message['data'])
       @channels.distribute_message(message)
     end
 
     def cycle_connection
       if @connect_request
         @connect_request = nil
-        info('Closed connection for ?', @client_id)
+        info('Closed connection for ?', @dispatcher.client_id)
       end
       EventMachine.add_timer(@advice['interval'] / 1000.0) { connect }
     end
 
   end
 end
-