faye-websocket 0.4.7 → 0.5.0

data/examples/app.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../lib/faye/websocket', __FILE__)
+require 'faye/websocket'
 require 'rack'
 
 static = Rack::File.new(File.dirname(__FILE__))
@@ -48,3 +48,6 @@ App = lambda do |env|
   end
 end
 
+def App.log(message)
+end
+

data/examples/autobahn_client.rb

@@ -1,13 +1,15 @@
 require 'rubygems'
-require File.expand_path('../../lib/faye/websocket', __FILE__)
+require 'bundler/setup'
+require 'faye/websocket'
 require 'cgi'
 require 'progressbar'
 
 EM.run {
-  host   = 'ws://localhost:9001'
-  agent  = "Ruby #{RUBY_VERSION}"
-  cases  = 0
-  skip   = []
+  host  = 'ws://localhost:9001'
+  ruby  = RUBY_PLATFORM =~ /java/ ? 'JRuby' : 'MRI'
+  agent = "#{ruby} #{RUBY_VERSION}"
+  cases = 0
+  skip  = []
 
   socket   = Faye::WebSocket::Client.new("#{host}/getCaseCount")
   progress = nil
@@ -37,7 +39,7 @@ EM.run {
           socket.send(event.data)
         end
 
-        socket.onclose = lambda do |event|
+        socket.on :close do |event|
           run_case.call(n + 1)
         end
       end

data/examples/client.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
-require File.expand_path('../../lib/faye/websocket', __FILE__)
+require 'bundler/setup'
+require 'faye/websocket'
 require 'eventmachine'
 
 port   = ARGV[0] || 7000

data/examples/config.ru

@@ -1,17 +1,14 @@
-# Run using your favourite async server:
+# Run using your favourite server:
 #
 #     thin start -R examples/config.ru -p 7000
-#     rainbows -c spec/rainbows.conf -E production examples/config.ru -p 7000
-#
-# If you run using one of these commands, the webserver is loaded before this
-# file, so Faye::WebSocket can figure out which adapter to load. If instead you
-# run using `rackup`, you need the `load_adapter` line below.
-#
-#     rackup -E production -s thin examples/config.ru -p 7000
+#     rainbows -c examples/rainbows.conf -E production examples/config.ru -p 7000
 
 require 'rubygems'
+require 'bundler/setup'
 require File.expand_path('../app', __FILE__)
-# Faye::WebSocket.load_adapter('thin')
+
+Faye::WebSocket.load_adapter('thin')
+Faye::WebSocket.load_adapter('rainbows')
 
 run App
 

data/examples/server.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'bundler/setup'
 require 'rack/content_length'
 require 'rack/chunked'
 
@@ -19,12 +20,20 @@ when 'goliath'
     end
   end
 
+when 'puma'
+  events = Puma::Events.new($stdout, $stderr)
+  binder = Puma::Binder.new(events)
+  binder.parse(["tcp://0.0.0.0:#{port}"], App)
+  server = Puma::Server.new(App, events)
+  server.binder = binder
+  server.run.join
+
 when 'rainbows'
   rackup = Unicorn::Configurator::RACKUP
   rackup[:port] = port
   rackup[:set_listener] = true
   options = rackup[:options]
-  options[:config_file] = spec + '/rainbows.conf'
+  options[:config_file] = File.expand_path('../rainbows.conf', __FILE__)
   Rainbows::HttpServer.new(App, options).start.join
 
 when 'thin'

data/lib/faye/adapters/rainbows.rb

@@ -4,24 +4,23 @@
 
 # Copyright (c) 2009-2011 Pratik Naik
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 module Faye
   class WebSocket

data/lib/faye/adapters/rainbows_client.rb

@@ -4,24 +4,23 @@
 
 # Copyright (c) 2009-2011 Pratik Naik
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 module Faye
   class WebSocket

data/lib/faye/adapters/thin.rb

@@ -4,24 +4,23 @@
 
 # Copyright (c) 2009-2011 Pratik Naik
 #
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
 
 class Thin::Connection
   attr_accessor :socket_stream

data/lib/faye/eventsource.rb

@@ -2,40 +2,39 @@ require File.expand_path('../websocket', __FILE__) unless defined?(Faye::WebSock
 
 module Faye
   class EventSource
-    DEFAULT_RETRY = 5
 
-    include WebSocket::API
+    include WebSocket::API::EventTarget
     attr_reader :env, :url, :ready_state
 
+    DEFAULT_RETRY = 5
+
     def self.eventsource?(env)
+      return false unless env['REQUEST_METHOD'] == 'GET'
       accept = (env['HTTP_ACCEPT'] || '').split(/\s*,\s*/)
       accept.include?('text/event-stream')
     end
 
     def self.determine_url(env)
-      secure = if env.has_key?('HTTP_X_FORWARDED_PROTO')
-                 env['HTTP_X_FORWARDED_PROTO'] == 'https'
-               else
-                 env['HTTP_ORIGIN'] =~ /^https:/i
-               end
-
+      secure = Rack::Request.new(env).ssl?
       scheme = secure ? 'https:' : 'http:'
       "#{ scheme }//#{ env['HTTP_HOST'] }#{ env['REQUEST_URI'] }"
     end
 
     def initialize(env, options = {})
+      WebSocket.ensure_reactor_running
+      super()
+
       @env    = env
       @ping   = options[:ping]
       @retry  = (options[:retry] || DEFAULT_RETRY).to_f
       @url    = EventSource.determine_url(env)
       @stream = Stream.new(self)
 
-      @ready_state = CONNECTING
-      @send_buffer = []
-      EventMachine.next_tick { open }
+      @ready_state = WebSocket::API::CONNECTING
 
-      callback = @env['async.callback']
-      callback.call([101, {}, @stream])
+      if callback = @env['async.callback']
+        callback.call([101, {}, @stream])
+      end
 
       @stream.write("HTTP/1.1 200 OK\r\n" +
                     "Content-Type: text/event-stream\r\n" +
@@ -44,7 +43,7 @@ module Faye
                     "\r\n\r\n" +
                     "retry: #{ (@retry * 1000).floor }\r\n\r\n")
 
-      @ready_state = OPEN
+      EventMachine.next_tick { open }
 
       if @ping
         @ping_timer = EventMachine.add_periodic_timer(@ping) { ping }
@@ -59,10 +58,24 @@ module Faye
       [ -1, {}, [] ]
     end
 
+  private
+    
+    def open
+      return unless @ready_state == WebSocket::API::CONNECTING
+
+      @ready_state = WebSocket::API::OPEN
+
+      event = WebSocket::API::Event.new('open')
+      event.init_event('open', false, false)
+      dispatch_event(event)
+    end
+
+  public
+
     def send(message, options = {})
-      return false unless @ready_state == OPEN
+      return false if @ready_state > WebSocket::API::OPEN
 
-      message = WebSocket.encode(message.to_s).
+      message = ::WebSocket::Driver.encode(message.to_s).
                 gsub(/(\r\n|\r|\n)/, '\1data: ')
 
       frame  = ""
@@ -75,50 +88,29 @@ module Faye
     end
 
     def ping(message = nil)
+      return false if @ready_state > WebSocket::API::OPEN
       @stream.write(":\r\n\r\n")
       true
     end
 
     def close
-      return if [CLOSING, CLOSED].include?(@ready_state)
-      @ready_state = CLOSED
+      return if [WebSocket::API::CLOSING, WebSocket::API::CLOSED].include?(@ready_state)
+
+      @ready_state = WebSocket::API::CLOSED
       EventMachine.cancel_timer(@ping_timer)
       @stream.close_connection_after_writing
+
       event = WebSocket::API::Event.new('close')
       event.init_event('close', false, false)
       dispatch_event(event)
     end
-  end
-
-  class EventSource::Stream
-    include EventMachine::Deferrable
-
-    extend Forwardable
-    def_delegators :@connection, :close_connection, :close_connection_after_writing
-
-    def initialize(event_source)
-      @event_source = event_source
-      @connection   = event_source.env['em.connection']
-      @stream_send  = event_source.env['stream.send']
-
-      @connection.socket_stream = self if @connection.respond_to?(:socket_stream)
-    end
-
-    def each(&callback)
-      @stream_send ||= callback
-    end
 
-    def fail
-      @event_source.close
-    end
-
-    def receive(data)
+    class Stream < RackStream
+      def fail
+        @socket_object.close
+      end
     end
 
-    def write(data)
-      return unless @stream_send
-      @stream_send.call(data) rescue nil
-    end
   end
 end
 

data/lib/faye/rack_stream.rb

@@ -0,0 +1,70 @@
+module Faye
+  class RackStream
+
+    include EventMachine::Deferrable
+
+    module Reader
+      attr_accessor :stream
+
+      def receive_data(data)
+        stream.receive(data)
+      end
+
+      def unbind
+        stream.fail
+      end
+    end
+
+    def initialize(socket_object)
+      @socket_object = socket_object
+      @connection    = socket_object.env['em.connection']
+      @stream_send   = socket_object.env['stream.send']
+
+      if socket_object.env['rack.hijack']
+        socket_object.env['rack.hijack'].call
+        @rack_hijack_io = socket_object.env['rack.hijack_io']
+        EventMachine.attach(@rack_hijack_io, Reader) do |reader|
+          @rack_hijack_io_reader = reader
+          reader.stream = self
+        end
+      end
+
+      @connection.socket_stream = self if @connection.respond_to?(:socket_stream)
+    end
+
+    def clean_rack_hijack
+      return unless @rack_hijack_io
+      @rack_hijack_io_reader.close_connection_after_writing
+      @rack_hijack_io = @rack_hijack_io_reader = nil
+    end
+
+    def close_connection
+      clean_rack_hijack
+      @connection.close_connection if @connection
+    end
+
+    def close_connection_after_writing
+      clean_rack_hijack
+      @connection.close_connection_after_writing if @connection
+    end
+
+    def each(&callback)
+      @stream_send ||= callback
+    end
+
+    def fail
+    end
+
+    def receive(data)
+    end
+
+    def write(data)
+      return @rack_hijack_io.write(data) if @rack_hijack_io
+      return @stream_send.call(data) if @stream_send
+    rescue => e
+      fail if EOFError === e
+    end
+
+  end
+end
+