faye 1.0.4 → 1.1.0

data/lib/faye/transport/local.rb

@@ -1,7 +1,7 @@
 module Faye
 
   class Transport::Local < Transport
-    def self.usable?(client, endpoint, &callback)
+    def self.usable?(dispatcher, endpoint, &callback)
       callback.call(Server === endpoint)
     end
 
@@ -9,10 +9,9 @@ module Faye
       false
     end
 
-    def request(envelopes)
-      messages = Faye.copy_object(envelopes.map { |e| e.message })
-      @endpoint.process(messages, nil) do |responses|
-        receive(envelopes, Faye.copy_object(responses))
+    def request(messages)
+      @endpoint.process(messages, nil) do |replies|
+        receive(Faye.copy_object(replies))
       end
     end
   end

data/lib/faye/transport/transport.rb

@@ -5,13 +5,21 @@ module Faye
     include Publisher
     include Timeouts
 
+    DEFAULT_PORTS    = {'http' => 80, 'https' => 433, 'ws' => 80, 'wss' => 443}
+    SECURE_PROTOCOLS = ['https', 'wss']
+
     attr_reader :endpoint
 
-    def initialize(client, endpoint)
+    def initialize(dispatcher, endpoint)
       super()
-      @client   = client
-      @endpoint = endpoint
-      @outbox   = []
+      @dispatcher = dispatcher
+      @endpoint   = endpoint
+      @outbox     = []
+      @proxy      = @dispatcher.proxy.dup
+
+      @proxy[:origin] ||= SECURE_PROTOCOLS.include?(@endpoint.scheme) ?
+                          (ENV['HTTPS_PROXY'] || ENV['https_proxy']) :
+                          (ENV['HTTP_PROXY']  || ENV['http_proxy'])
     end
 
     def batching?
@@ -21,7 +29,7 @@ module Faye
     def close
     end
 
-    def encode(envelopes)
+    def encode(messages)
       ''
     end
 
@@ -29,27 +37,35 @@ module Faye
       self.class.connection_type
     end
 
-    def send(envelope)
-      message = envelope.message
-      client_id = @client.instance_eval { @client_id }
-      debug('Client ? sending message to ?: ?', client_id, @endpoint, message)
+    def send_message(message)
+      client_id = @dispatcher.client_id
+      debug('Client ? sending message to ? via ?: ?', client_id, @endpoint, connection_type, message)
 
-      return request([envelope]) unless batching?
+      unless batching?
+        promise = EventMachine::DefaultDeferrable.new
+        promise.succeed(request([message]))
+        return promise
+      end
 
-      @outbox << envelope
+      @outbox << message
+      flush_large_batch
+      @promise ||= EventMachine::DefaultDeferrable.new
 
       if message['channel'] == Channel::HANDSHAKE
-        return add_timeout(:publish, 0.01) { flush }
+        add_timeout(:publish, 0.01) { flush }
+        return @promise
       end
 
       if message['channel'] == Channel::CONNECT
         @connection_message = message
       end
 
-      flush_large_batch
       add_timeout(:publish, Engine::MAX_DELAY) { flush }
+      @promise
     end
 
+  private
+
     def flush
       remove_timeout(:publish)
 
@@ -57,7 +73,8 @@ module Faye
         @connection_message['advice'] = {'timeout' => 0}
       end
 
-      request(@outbox)
+      @promise.succeed(request(@outbox))
+      @promise = nil
 
       @connection_message = nil
       @outbox = []
@@ -65,35 +82,36 @@ module Faye
 
     def flush_large_batch
       string = encode(@outbox)
-      return if string.size < @client.max_request_size
+      return if string.size < @dispatcher.max_request_size
       last = @outbox.pop
       flush
       @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) }
+    def receive(replies)
+      replies = [replies].flatten
+      client_id = @dispatcher.client_id
+      debug('Client ? received from ? via ?: ?', client_id, @endpoint, connection_type, replies)
+      replies.each do |reply|
+        @dispatcher.handle_response(reply)
+      end
     end
 
-    def handle_error(envelopes, immediate = false)
-      envelopes.each { |e| e.set_deferred_status(:failed, immediate) }
+    def handle_error(messages, immediate = false)
+      client_id = @dispatcher.client_id
+      debug('Client ? failed to send to ? via ?: ?', client_id, @endpoint, connection_type, messages)
+      messages.each do |message|
+        @dispatcher.handle_error(message, immediate)
+      end
     end
 
-  private
-
     def get_cookies
-      return @client.cookies
-      @client.cookies.get_cookies(@endpoint.to_s) * ';'
+      @dispatcher.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)
+        @dispatcher.cookies.set_cookie(@endpoint.to_s, cookie)
       end
     end
 
@@ -102,24 +120,24 @@ module Faye
     class << self
       attr_accessor :connection_type
 
-      def get(client, allowed, disabled, &callback)
-        endpoint = client.endpoint
+      def get(dispatcher, allowed, disabled, &callback)
+        endpoint = dispatcher.endpoint
 
         select = lambda do |(conn_type, klass), resume|
-          conn_endpoint = client.endpoints[conn_type] || endpoint
+          conn_endpoint = dispatcher.endpoint_for(conn_type)
 
           if disabled.include?(conn_type)
             next resume.call
           end
 
           unless allowed.include?(conn_type)
-            klass.usable?(client, conn_endpoint) { |u| }
+            klass.usable?(dispatcher, conn_endpoint) { |u| }
             next resume.call
           end
 
-          klass.usable?(client, conn_endpoint) do |is_usable|
+          klass.usable?(dispatcher, conn_endpoint) do |is_usable|
             next resume.call unless is_usable
-            transport = klass.respond_to?(:create) ? klass.create(client, conn_endpoint) : klass.new(client, conn_endpoint)
+            transport = klass.respond_to?(:create) ? klass.create(dispatcher, conn_endpoint) : klass.new(dispatcher, conn_endpoint)
             callback.call(transport)
           end
         end
@@ -135,6 +153,10 @@ module Faye
         @transports << [type, klass]
         klass.connection_type = type
       end
+
+      def connection_types
+        @transports.map { |t| t[0] }
+      end
     end
 
     %w[local web_socket http].each do |type|
@@ -143,4 +165,3 @@ module Faye
 
   end
 end
-

data/lib/faye/transport/web_socket.rb

@@ -12,13 +12,21 @@ module Faye
 
     include Deferrable
 
-    def self.usable?(client, endpoint, &callback)
-      create(client, endpoint).usable?(&callback)
+    class Request
+      include Deferrable
+
+      def close
+        callback { |socket| socket.close }
+      end
     end
 
-    def self.create(client, endpoint)
-      sockets = client.transports[:websocket] ||= {}
-      sockets[endpoint.to_s] ||= new(client, endpoint)
+    def self.usable?(dispatcher, endpoint, &callback)
+      create(dispatcher, endpoint).usable?(&callback)
+    end
+
+    def self.create(dispatcher, endpoint)
+      sockets = dispatcher.transports[:websocket] ||= {}
+      sockets[endpoint.to_s] ||= new(dispatcher, endpoint)
     end
 
     def batching?
@@ -31,16 +39,20 @@ module Faye
       connect
     end
 
-    def request(envelopes)
+    def request(messages)
       @pending ||= Set.new
-      envelopes.each { |envelope| @pending.add(envelope) }
+      messages.each { |message| @pending.add(message) }
+
+      promise = Request.new
 
       callback do |socket|
         next unless socket
-        messages = envelopes.map { |e| e.message }
         socket.send(Faye.to_json(messages))
+        promise.succeed(socket)
       end
+
       connect
+      promise
     end
 
     def connect
@@ -48,12 +60,16 @@ module Faye
       return unless @state == UNCONNECTED
       @state = CONNECTING
 
-      headers = @client.headers.dup
-      headers['Cookie'] = get_cookies
+      url        = @endpoint.dup
+      headers    = @dispatcher.headers.dup
+      extensions = @dispatcher.ws_extensions
+      cookie     = get_cookies
 
-      url = @endpoint.dup
       url.scheme = PROTOCOLS[url.scheme]
-      socket = Faye::WebSocket::Client.new(url.to_s, [], :headers => headers)
+      headers['Cookie'] = cookie unless cookie == ''
+
+      options = {:extensions => extensions, :headers => headers, :proxy => @proxy}
+      socket  = Faye::WebSocket::Client.new(url.to_s, [], options)
 
       socket.onopen = lambda do |*args|
         store_cookies(socket.headers['Set-Cookie'])
@@ -90,19 +106,16 @@ module Faye
       end
 
       socket.onmessage = lambda do |event|
-        messages  = MultiJson.load(event.data)
-        envelopes = []
-
-        next if messages.nil?
-        messages = [messages].flatten
-
-        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
+        replies = MultiJson.load(event.data)
+        next if replies.nil?
+        replies = [replies].flatten
+
+        replies.each do |reply|
+          next unless reply.has_key?('successful')
+          next unless message = @pending.find { |m| m['id'] == reply['id'] }
+          @pending.delete(message)
         end
-        receive(envelopes, messages)
+        receive(replies)
       end
     end
 
@@ -116,8 +129,7 @@ module Faye
     def ping
       return unless @socket
       @socket.send('[]')
-      timeout = @client.instance_eval { @advice['timeout'] }
-      add_timeout(:ping, timeout/2000.0) { ping }
+      add_timeout(:ping, @dispatcher.timeout / 2) { ping }
     end
   end
 

data/lib/faye/util/namespace.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faye
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cookiejar
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: permessage_deflate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +226,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -357,10 +371,11 @@ files:
 - lib/faye/mixins/timeouts.rb
 - lib/faye/protocol/channel.rb
 - lib/faye/protocol/client.rb
-- lib/faye/protocol/envelope.rb
+- lib/faye/protocol/dispatcher.rb
 - lib/faye/protocol/extensible.rb
 - lib/faye/protocol/grammar.rb
 - lib/faye/protocol/publication.rb
+- lib/faye/protocol/scheduler.rb
 - lib/faye/protocol/server.rb
 - lib/faye/protocol/socket.rb
 - lib/faye/protocol/subscription.rb
@@ -392,7 +407,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple pub/sub messaging for the web

data/lib/faye/protocol/envelope.rb

@@ -1,24 +0,0 @@
-module Faye
-  class Envelope
-
-    include Deferrable
-    attr_reader :id, :message
-
-    def initialize(message, timeout = nil)
-      @id      = message['id']
-      @message = message
-      
-      self.timeout(timeout, false) if timeout
-    end
-
-    def eql?(other)
-      Envelope === other and @id == other.id
-    end
-
-    def hash
-      @id.hash
-    end
-
-  end
-end
-