faye-websocket 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0df4257b3a1f898577eb787b6f1fc8f5c0fae4
-  data.tar.gz: 75def6662b64d516ee753ccd78003a445c9dca11
+  metadata.gz: 85557a18bc39ccf7f19ea25d9bb97778e4976a3c
+  data.tar.gz: ac8c769136548e7c8355fb01f7c79e6928fb0c32
 SHA512:
-  metadata.gz: 9054661c65b66682fea05e779d785b142f7005f323228ffdbd3429570ba4df9055b2c7b6516a6c7f046c929387133574ffa39a142121b1871bdcfe99e52ff828
-  data.tar.gz: 7eb1cb4a544824ffa191270c665ed70c87d5a131e54f597f090d71a23802691bdce18e9cc46f62c39d3283e031af42c27bec6bae552519c2c7e4a4630fde64cf
+  metadata.gz: 6e259cae366b3bc1995380905504677be7ec4ba2cc498c6ad01e0c9fc53157e910161635199d3fda017d1fb82263514a4c39ccc224fce920ac65b312a9664385
+  data.tar.gz: e922b280a0dd8ef81a0c5f0664af26459f921ace8dab435afbe1650505dac2c6c04b08605436b8ffd9ddb1351554ccd23fc5612e11f2999bd7b332c773993f73

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 0.10.1 / 2015-11-06
+
+* Make sure errors can be safely emitted if creating the driver fails
+* Prevent a race condition when binding `EM.attach` to the socket
+
 ### 0.10.0 / 2015-07-08
 
 * Add the standard `code` and `reason` parameters to the `close` method

data/README.md

@@ -372,7 +372,7 @@ WebSocket performance in Passenger. This is
 [documented in the Passenger manual](https://www.phusionpassenger.com/documentation/Users%20guide%20Nginx.html#tuning_sse_websockets).
 
 ```ruby
-if defined?(PhusionPasseneger)
+if defined?(PhusionPassenger)
   PhusionPassenger.advertised_concurrency_level = 0
 end
 ```

data/lib/faye/rack_stream.rb

@@ -15,21 +15,39 @@ module Faye
       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
+    def initialize(socket)
+      @socket_object = socket
+      @connection    = socket.env['em.connection']
+      @stream_send   = socket.env['stream.send']
+
+      hijack_rack_socket
+
+      @connection.socket_stream = self if @connection.respond_to?(:socket_stream)
+    end
+
+    def hijack_rack_socket
+      return unless @socket_object.env['rack.hijack']
+
+      @socket_object.env['rack.hijack'].call
+      @rack_hijack_io = @socket_object.env['rack.hijack_io']
+      queue = Queue.new
+
+      EventMachine.schedule do
+        begin
+          EventMachine.attach(@rack_hijack_io, Reader) do |reader|
+            reader.stream = self
+            if @rack_hijack_io
+              @rack_hijack_io_reader = reader
+            else
+              reader.close_connection_after_writing
+            end
+          end
+        ensure
+          queue.push(nil)
         end
       end
 
-      @connection.socket_stream = self if @connection.respond_to?(:socket_stream)
+      queue.pop if EventMachine.reactor_running?
     end
 
     def clean_rack_hijack

data/lib/faye/websocket/api.rb

@@ -18,9 +18,12 @@ module Faye
       attr_reader :url, :ready_state, :buffered_amount
 
       def initialize(options = {})
+        @ready_state = CONNECTING
         super()
         ::WebSocket::Driver.validate_options(options, [:headers, :extensions, :max_length, :ping, :proxy, :tls])
 
+        @driver = yield
+
         if headers = options[:headers]
           headers.each { |name, value| @driver.set_header(name, value) }
         end
@@ -31,7 +34,6 @@ module Faye
 
         @ping            = options[:ping]
         @ping_id         = 0
-        @ready_state     = CONNECTING
         @buffered_amount = 0
 
         @driver.on(:open)    { |e| open }

data/lib/faye/websocket/client.rb

@@ -10,8 +10,8 @@ module Faye
       attr_reader :headers, :status
 
       def initialize(url, protocols = nil, options = {})
-        @url    = url
-        @driver = ::WebSocket::Driver.client(self, :max_length => options[:max_length], :protocols => protocols)
+        @url = url
+        super(options) { ::WebSocket::Driver.client(self, :max_length => options[:max_length], :protocols => protocols) }
 
         [:open, :error].each do |event|
           @driver.on(event) do
@@ -20,8 +20,6 @@ module Faye
           end
         end
 
-        super(options)
-
         proxy       = options.fetch(:proxy, {})
         endpoint    = URI.parse(proxy[:origin] || @url)
         port        = endpoint.port || DEFAULT_PORTS[endpoint.scheme]

data/lib/faye/websocket.rb

@@ -64,20 +64,26 @@ module Faye
     def initialize(env, protocols = nil, options = {})
       WebSocket.ensure_reactor_running
 
-      @env    = env
-      @url    = WebSocket.determine_url(@env)
-      @driver = ::WebSocket::Driver.rack(self, :max_length => options[:max_length], :protocols => protocols)
+      @env = env
+      @url = WebSocket.determine_url(@env)
+
+      super(options) { ::WebSocket::Driver.rack(self, :max_length => options[:max_length], :protocols => protocols) }
+
       @stream = Stream.new(self)
 
       if callback = @env['async.callback']
         callback.call([101, {}, @stream])
       end
+    end
 
-      super(options)
-      @driver.start
+    def start_driver
+      return if @driver.nil? || @driver_started
+      @driver_started = true
+      EventMachine.schedule { @driver.start }
     end
 
     def rack_response
+      start_driver
       [ -1, {}, [] ]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-08 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Standards-compliant WebSocket server and client