faye 0.8.11 → 1.0.0

data/lib/faye/transport/local.rb

@@ -2,17 +2,17 @@ module Faye
 
   class Transport::Local < Transport
     def self.usable?(client, endpoint, &callback)
-      callback.call(endpoint.is_a?(Server))
+      callback.call(Server === endpoint)
     end
 
     def batching?
       false
     end
 
-    def request(message, timeout)
-      message = Faye.copy_object(message)
-      @endpoint.process(message, true) do |responses|
-        receive(Faye.copy_object(responses))
+    def request(envelopes)
+      messages = Faye.copy_object(envelopes.map { |e| e.message })
+      @endpoint.process(messages, nil) do |responses|
+        receive(envelopes, Faye.copy_object(responses))
       end
     end
   end

data/lib/faye/transport/transport.rb

@@ -5,9 +5,10 @@ module Faye
     include Publisher
     include Timeouts
 
-    attr_accessor :cookies, :endpoint, :headers
+    attr_reader :endpoint
 
     def initialize(client, endpoint)
+      super()
       @client   = client
       @endpoint = endpoint
       @outbox   = []
@@ -20,17 +21,22 @@ module Faye
     def close
     end
 
+    def encode(envelopes)
+      ''
+    end
+
     def connection_type
       self.class.connection_type
     end
 
-    def send(message, timeout)
-      debug('Client ? sending message to ?: ?', @client.client_id, @endpoint, message)
+    def send(envelope)
+      message = envelope.message
+      client_id = @client.instance_eval { @client_id }
+      debug('Client ? sending message to ?: ?', client_id, @endpoint, message)
 
-      return request([message], timeout) unless batching?
+      return request([envelope]) unless batching?
 
-      @outbox << message
-      @timeout = timeout
+      @outbox << envelope
 
       if message['channel'] == Channel::HANDSHAKE
         return add_timeout(:publish, 0.01) { flush }
@@ -40,6 +46,7 @@ module Faye
         @connection_message = message
       end
 
+      flush_large_batch
       add_timeout(:publish, Engine::MAX_DELAY) { flush }
     end
 
@@ -50,20 +57,43 @@ module Faye
         @connection_message['advice'] = {'timeout' => 0}
       end
 
-      request(@outbox, @timeout)
+      request(@outbox)
 
       @connection_message = nil
       @outbox = []
     end
 
-    def receive(responses)
-      debug('Client ? received from ?: ?', @client.client_id, @endpoint, responses)
+    def flush_large_batch
+      string = encode(@outbox)
+      return if string.size < @client.max_request_size
+      last = @outbox.pop
+      flush(@outbox)
+      @outbox.push(last) if last
+    end
+
+    def receive(envelopes, responses)
+      envelopes.each { |e| e.set_deferred_status(:succeeded) }
+      responses = [responses].flatten
+      client_id = @client.instance_eval { @client_id }
+      debug('Client ? received from ?: ?', client_id, @endpoint, responses)
       responses.each { |response| @client.receive_message(response) }
     end
 
-    def retry_block(message, timeout)
-      lambda do
-        EventMachine.add_timer(@client.retry) { request(message, timeout) }
+    def handle_error(envelopes, immediate = false)
+      envelopes.each { |e| e.set_deferred_status(:failed, immediate) }
+    end
+
+  private
+
+    def get_cookies
+      return @client.cookies
+      @client.cookies.get_cookies(@endpoint.to_s) * ';'
+    end
+
+    def store_cookies(set_cookie)
+      return @client.cookies
+      [*set_cookie].compact.each do |cookie|
+        @client.cookies.set_cookie(@endpoint.to_s, cookie)
       end
     end
 

data/lib/faye/transport/web_socket.rb

@@ -5,7 +5,12 @@ module Faye
     CONNECTING  = 2
     CONNECTED   = 3
 
-    include EventMachine::Deferrable
+    PROTOCOLS = {
+      'http'  => 'ws',
+      'https' => 'wss'
+    }
+
+    include Deferrable
 
     def self.usable?(client, endpoint, &callback)
       create(client, endpoint).usable?(&callback)
@@ -13,7 +18,7 @@ module Faye
 
     def self.create(client, endpoint)
       sockets = client.transports[:websocket] ||= {}
-      sockets[endpoint] ||= new(client, endpoint)
+      sockets[endpoint.to_s] ||= new(client, endpoint)
     end
 
     def batching?
@@ -26,64 +31,92 @@ module Faye
       connect
     end
 
-    def request(messages, timeout = nil)
-      return if messages.empty?
-      @messages ||= {}
-      messages.each { |message| @messages[message['id']] = message }
-      callback { |socket| socket.send(Faye.to_json(messages)) }
+    def request(envelopes)
+      callback do |socket|
+        next unless socket
+        envelopes.each { |envelope| @pending.add(envelope) }
+        messages = envelopes.map { |e| e.message }
+        socket.send(Faye.to_json(messages))
+      end
       connect
     end
 
-    def close
-      return unless @socket
-      @socket.onclose = @socket.onerror = nil
-      @socket.close
-      @socket = nil
-      set_deferred_status(:deferred)
-      @state = UNCONNECTED
-    end
-
     def connect
       @state ||= UNCONNECTED
       return unless @state == UNCONNECTED
-
       @state = CONNECTING
 
-      @socket = Faye::WebSocket::Client.new(@endpoint.gsub(/^http(s?):/, 'ws\1:'))
+      headers = @client.headers.dup
+      headers['Cookie'] = get_cookies
+
+      url = @endpoint.dup
+      url.scheme = PROTOCOLS[url.scheme]
+      socket = Faye::WebSocket::Client.new(url.to_s, [], :headers => headers)
 
-      @socket.onopen = lambda do |*args|
+      socket.onopen = lambda do |*args|
+        store_cookies(socket.headers['Set-Cookie'])
+        @socket = socket
+        @pending = Set.new
         @state = CONNECTED
         @ever_connected = true
-        set_deferred_status(:succeeded, @socket)
-        trigger(:up)
+        ping
+        set_deferred_status(:succeeded, socket)
       end
 
-      @socket.onmessage = lambda do |event|
-        messages = Yajl::Parser.parse(event.data)
-        next if messages.nil?
-        messages = [messages].flatten
-        messages.each { |message| @messages.delete(message['id']) }
-        receive(messages)
-      end
+      closed = false
+      socket.onclose = socket.onerror = lambda do |*args|
+        return if closed
+        closed = true
 
-      @socket.onclose = @socket.onerror = lambda do |*args|
         was_connected = (@state == CONNECTED)
-        set_deferred_status(:deferred)
+        socket.onopen = socket.onclose = socket.onerror = socket.onmessage = nil
+
+        @socket = nil
         @state = UNCONNECTED
+        remove_timeout(:ping)
+        set_deferred_status(:unknown)
+
+        pending  = @pending ? @pending.to_a : []
+        @pending = nil
+
+        if was_connected
+          handle_error(pending, true)
+        elsif @ever_connected
+          handle_error(pending)
+        else
+          set_deferred_status(:failed)
+        end
+      end
 
-        close
+      socket.onmessage = lambda do |event|
+        messages  = MultiJson.load(event.data)
+        envelopes = []
 
-        next resend if was_connected
-        next set_deferred_status(:failed) unless @ever_connected
+        next if messages.nil?
+        messages = [messages].flatten
 
-        EventMachine.add_timer(@client.retry) { connect }
-        trigger(:down)
+        messages.each do |message|
+          next unless message.has_key?('successful')
+          next unless envelope = @pending.find { |e| e.id == message['id'] }
+          @pending.delete(envelope)
+          envelopes << envelope
+        end
+        receive(envelopes, messages)
       end
     end
 
-    def resend
-      return unless @messages
-      request(@messages.values)
+    def close
+      return unless @socket
+      @socket.close
+    end
+
+  private
+
+    def ping
+      return unless @socket
+      @socket.send('[]')
+      timeout = @client.instance_eval { @advice['timeout'] }
+      add_timeout(:ping, timeout/2000.0) { ping }
     end
   end
 

metadata

@@ -1,384 +1,416 @@
 --- !ruby/object:Gem::Specification
 name: faye
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2013-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cookiejar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: websocket-driver
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
-  name: jake
+  name: puma
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rainbows
+  name: RedCloth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: RedCloth
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: staticmatic
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: staticmatic
+  name: rainbows
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.0
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
-  name: testswarm-client
+  name: goliath
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: passenger
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.0.0
 description: 
 email: jcoglan@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
-- History.txt
-- README.rdoc
+- CHANGELOG.md
+- README.md
+- lib/faye-browser.js
 - lib/faye-browser-min.js
 - lib/faye-browser-min.js.map
-- lib/faye-browser.js
 - lib/faye.rb
-- lib/faye/adapters/rack_adapter.rb
-- lib/faye/adapters/static_server.rb
-- lib/faye/engines/connection.rb
-- lib/faye/engines/memory.rb
-- lib/faye/engines/proxy.rb
-- lib/faye/error.rb
-- lib/faye/mixins/logging.rb
-- lib/faye/mixins/publisher.rb
-- lib/faye/mixins/timeouts.rb
+- lib/faye/protocol/grammar.rb
+- lib/faye/protocol/socket.rb
 - lib/faye/protocol/channel.rb
-- lib/faye/protocol/client.rb
 - lib/faye/protocol/extensible.rb
-- lib/faye/protocol/grammar.rb
 - lib/faye/protocol/publication.rb
-- lib/faye/protocol/server.rb
-- lib/faye/protocol/socket.rb
 - lib/faye/protocol/subscription.rb
+- lib/faye/protocol/envelope.rb
+- lib/faye/protocol/server.rb
+- lib/faye/protocol/client.rb
+- lib/faye/engines/memory.rb
+- lib/faye/engines/proxy.rb
+- lib/faye/engines/connection.rb
+- lib/faye/util/namespace.rb
+- lib/faye/adapters/static_server.rb
+- lib/faye/adapters/rack_adapter.rb
+- lib/faye/mixins/timeouts.rb
+- lib/faye/mixins/logging.rb
+- lib/faye/mixins/deferrable.rb
+- lib/faye/mixins/publisher.rb
+- lib/faye/error.rb
+- lib/faye/transport/web_socket.rb
 - lib/faye/transport/http.rb
 - lib/faye/transport/local.rb
 - lib/faye/transport/transport.rb
-- lib/faye/transport/web_socket.rb
-- lib/faye/util/namespace.rb
-- spec/browser.html
-- spec/encoding_helper.rb
-- spec/install.sh
-- spec/javascript/channel_spec.js
-- spec/javascript/client_spec.js
-- spec/javascript/dispatcher_spec.js
-- spec/javascript/engine/memory_spec.js
-- spec/javascript/engine_spec.js
-- spec/javascript/faye_spec.js
-- spec/javascript/grammar_spec.js
-- spec/javascript/node_adapter_spec.js
-- spec/javascript/publisher_spec.js
-- spec/javascript/server/connect_spec.js
-- spec/javascript/server/disconnect_spec.js
-- spec/javascript/server/extensions_spec.js
-- spec/javascript/server/handshake_spec.js
-- spec/javascript/server/integration_spec.js
-- spec/javascript/server/publish_spec.js
-- spec/javascript/server/subscribe_spec.js
-- spec/javascript/server/unsubscribe_spec.js
-- spec/javascript/server_spec.js
-- spec/javascript/transport_spec.js
-- spec/node.js
-- spec/phantom.js
-- spec/ruby/channel_spec.rb
-- spec/ruby/client_spec.rb
-- spec/ruby/engine/memory_spec.rb
-- spec/ruby/engine_examples.rb
-- spec/ruby/faye_spec.rb
-- spec/ruby/grammar_spec.rb
-- spec/ruby/publisher_spec.rb
-- spec/ruby/rack_adapter_spec.rb
-- spec/ruby/server/connect_spec.rb
-- spec/ruby/server/disconnect_spec.rb
-- spec/ruby/server/extensions_spec.rb
-- spec/ruby/server/handshake_spec.rb
-- spec/ruby/server/integration_spec.rb
-- spec/ruby/server/publish_spec.rb
-- spec/ruby/server/subscribe_spec.rb
-- spec/ruby/server/unsubscribe_spec.rb
-- spec/ruby/server_spec.rb
-- spec/ruby/transport_spec.rb
-- spec/spec_helper.rb
-- spec/testswarm
-- spec/thin_proxy.rb
 homepage: http://faye.jcoglan.com
-licenses: []
-metadata: {}
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
-- "--main"
-- README.rdoc
+- --main
+- README.md
+- --markup
+- markdown
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple pub/sub messaging for the web
 test_files: []