faye-websocket 0.10.8 → 0.10.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628a479aab315c020df8a057cf2533e2b2572b92cd81cdaff4006eae24ac3200
-  data.tar.gz: 0df9233725d24bf5ce905090b99271bcd4f47d598eb98912d9eef810cec950be
+  metadata.gz: f7b7147b0be962c2d274d1483bc8f20804afc187033055ca76b46830b5380a01
+  data.tar.gz: 54c1b097b2f21b5ad2ba0ccfe15c2b935de6b2e924c6ccd27635dceaae885e36
 SHA512:
-  metadata.gz: 439970962dd6c8198885d242d3165dde1f1d41c81e5b0ac2f11be97fa45e8f73d89cf94a97ef2f53521515a048bd2300357396645261609c63905a82cc7af55e
-  data.tar.gz: 8dffa7a809059080bf01c07104936c7b25dafc40e7a9e57782438c685ed9c686c2771d7d784863861395b75a4887e9ef5358b325007fa5200a5c4819903fc84f
+  metadata.gz: 70c5f89236c7204ca9af93f9f7e3e965fe16092dcc6160ddbe1a97bfaf7f85206586383e020e3fba729a18819607df87eb3cd0010b391cd15c7599720fedb60b
+  data.tar.gz: 7a945496751f19145a63088efe91d8b06866e2cda8ff56c7fd00f5670fbd192d9437db338a20a33b92c1b69c11f454cf2fb4a55be515b54ebec78c82c5532a6d

data/CHANGELOG.md

@@ -1,9 +1,15 @@
+### 0.10.9 / 2019-06-13
+
+- Use the EventMachine API rather than `IO#write` to write data; this uses the
+  event loop and avoids getting blocked by slow clients
+
 ### 0.10.8 / 2019-06-10
 
 - In the case of a close timeout, don't block on waiting for writing to the
   socket to complete
 - Fix a race condition that caused a timeout not to be cancelled immediately
   when the WebSocket is closed
+- Change license from MIT to Apache 2.0
 
 ### 0.10.7 / 2017-02-22
 

data/README.md

@@ -60,7 +60,7 @@ App = lambda do |env|
 
   else
     # Normal HTTP request
-    [200, {'Content-Type' => 'text/plain'}, ['Hello']]
+    [200, { 'Content-Type' => 'text/plain' }, ['Hello']]
   end
 end
 ```
@@ -128,7 +128,7 @@ including any authorization information and custom headers you require:
 ws = Faye::WebSocket::Client.new('ws://www.example.com/', [], {
   :proxy => {
     :origin  => 'http://username:password@proxy.example.com',
-    :headers => {'User-Agent' => 'ruby'}
+    :headers => { 'User-Agent' => 'ruby' }
   }
 })
 ```
@@ -256,7 +256,7 @@ App = lambda do |env|
 
   else
     # Normal HTTP request
-    [200, {'Content-Type' => 'text/plain'}, ['Hello']]
+    [200, { 'Content-Type' => 'text/plain' }, ['Hello']]
   end
 end
 ```
@@ -293,7 +293,7 @@ every 15 seconds and is retryable every 10 seconds if the connection is broken:
 
 ```ruby
 es = Faye::EventSource.new(es,
-  :headers => {'Access-Control-Allow-Origin' => '*'},
+  :headers => { 'Access-Control-Allow-Origin' => '*' },
   :ping    => 15,
   :retry   => 10
 )

data/examples/app.rb

@@ -3,7 +3,7 @@ require 'permessage_deflate'
 require 'rack'
 
 static  = Rack::File.new(File.dirname(__FILE__))
-options = {:extensions => [PermessageDeflate], :ping => 5}
+options = { :extensions => [PermessageDeflate], :ping => 5 }
 
 App = lambda do |env|
   if Faye::WebSocket.websocket?(env)
@@ -29,7 +29,7 @@ App = lambda do |env|
 
     loop = EM.add_periodic_timer(2) do
       time += 1
-      es.send("Time: #{time}")
+      es.send("Time: #{ time }")
       EM.add_timer(1) do
         es.send('Update!!', :event => 'update', :id => time) if es
       end

data/examples/autobahn_client.rb

@@ -7,30 +7,30 @@ require 'progressbar'
 EM.run {
   ruby    = RUBY_PLATFORM =~ /java/ ? 'jruby' : 'mri-ruby'
   version = defined?(RUBY_ENGINE_VERSION) ? RUBY_ENGINE_VERSION : RUBY_VERSION
-  version += " (#{RUBY_VERSION})" if ruby == 'jruby'
+  version += " (#{ RUBY_VERSION })" if ruby == 'jruby'
 
   host    = 'ws://0.0.0.0:9001'
-  agent   = CGI.escape("#{ruby}-#{version}")
+  agent   = CGI.escape("#{ ruby }-#{ version }")
   cases   = 0
-  options = {:extensions => [PermessageDeflate]}
+  options = { :extensions => [PermessageDeflate] }
 
-  socket   = Faye::WebSocket::Client.new("#{host}/getCaseCount")
+  socket   = Faye::WebSocket::Client.new("#{ host }/getCaseCount")
   progress = nil
 
   socket.onmessage = lambda do |event|
-    puts "Total cases to run: #{event.data}"
+    puts "Total cases to run: #{ event.data }"
     cases = event.data.to_i
     progress = ProgressBar.create(:title => 'Autobahn', :total => cases)
   end
 
   run_case = lambda do |n|
     if n > cases
-      socket = Faye::WebSocket::Client.new("#{host}/updateReports?agent=#{agent}")
+      socket = Faye::WebSocket::Client.new("#{ host }/updateReports?agent=#{ agent }")
       socket.onclose = lambda { |e| EM.stop }
       next
     end
 
-    url = "#{host}/runCase?case=#{n}&agent=#{agent}"
+    url = "#{ host }/runCase?case=#{ n }&agent=#{ agent }"
     socket = Faye::WebSocket::Client.new(url, [], options)
 
     socket.onmessage = lambda do |event|

data/examples/client.rb

@@ -8,8 +8,8 @@ EM.run {
   proxy = ARGV[1]
 
   ws = Faye::WebSocket::Client.new(url, [],
-    :proxy      => {:origin => proxy, :headers => {'User-Agent' => 'Echo'}},
-    :headers    => {'Origin' => 'http://faye.jcoglan.com'},
+    :proxy      => { :origin => proxy, :headers => { 'User-Agent' => 'Echo' } },
+    :headers    => { 'Origin' => 'http://faye.jcoglan.com' },
     :extensions => [PermessageDeflate]
   )
 

data/examples/server.rb

@@ -24,7 +24,7 @@ when 'puma'
   require 'puma/events'
   events = Puma::Events.new($stdout, $stderr)
   binder = Puma::Binder.new(events)
-  binder.parse(["tcp://0.0.0.0:#{port}"], App)
+  binder.parse(["tcp://0.0.0.0:#{ port }"], App)
   server = Puma::Server.new(App, events)
   server.binder = binder
   server.run.join

data/lib/faye/eventsource.rb

@@ -63,7 +63,7 @@ module Faye
     end
 
   private
-    
+
     def open
       return unless @ready_state == WebSocket::API::CONNECTING
 
@@ -83,9 +83,9 @@ module Faye
                 gsub(/(\r\n|\r|\n)/, '\1data: ')
 
       frame  = ""
-      frame << "event: #{options[:event]}\r\n" if options[:event]
-      frame << "id: #{options[:id]}\r\n" if options[:id]
-      frame << "data: #{message}\r\n\r\n"
+      frame << "event: #{ options[:event] }\r\n" if options[:event]
+      frame << "id: #{ options[:id] }\r\n" if options[:id]
+      frame << "data: #{ message }\r\n\r\n"
 
       @stream.write(frame)
       true

data/lib/faye/rack_stream.rb

@@ -79,6 +79,7 @@ module Faye
     end
 
     def write(data)
+      return @rack_hijack_io_reader.send_data(data) if @rack_hijack_io_reader
       return @rack_hijack_io.write(data) if @rack_hijack_io
       return @stream_send.call(data) if @stream_send
     rescue => e

data/lib/faye/websocket.rb

@@ -44,7 +44,7 @@ module Faye
     def self.load_adapter(backend)
       const = Kernel.const_get(ADAPTERS[backend]) rescue nil
       require(backend) unless const
-      path = File.expand_path("../adapters/#{backend}.rb", __FILE__)
+      path = File.expand_path("../adapters/#{ backend }.rb", __FILE__)
       require(path) if File.file?(path)
     end
 

data/lib/faye/websocket/api.rb

@@ -83,7 +83,7 @@ module Faye
         unless code == 1000 or (code >= 3000 and code <= 4999)
           raise ArgumentError, "Failed to execute 'close' on WebSocket: " +
                                "The code must be either 1000, or between 3000 and 4999. " +
-                               "#{code} is neither."
+                               "#{ code } is neither."
         end
 
         @ready_state = CLOSING unless @ready_state == CLOSED

data/lib/faye/websocket/api/event.rb

@@ -10,7 +10,7 @@ module Faye::WebSocket::API
 
     def initialize(event_type, options)
       @type = event_type
-      options.each { |key, value| instance_variable_set("@#{key}", value) }
+      options.each { |key, value| instance_variable_set("@#{ key }", value) }
     end
 
     def init_event(event_type, can_bubble, cancelable)

data/lib/faye/websocket/api/event_target.rb

@@ -5,10 +5,10 @@ module Faye::WebSocket::API
     events = %w[open message error close]
 
     events.each do |event_type|
-      define_method "on#{event_type}=" do |handler|
+      define_method "on#{ event_type }=" do |handler|
         EventMachine.next_tick do
           flush(event_type, handler)
-          instance_variable_set("@on#{event_type}", handler)
+          instance_variable_set("@on#{ event_type }", handler)
         end
       end
     end

data/lib/faye/websocket/client.rb

@@ -7,7 +7,7 @@ module Faye
       extend Forwardable
       include API
 
-      DEFAULT_PORTS    = {'http' => 80, 'https' => 443, 'ws' => 80, 'wss' => 443}
+      DEFAULT_PORTS    = { 'http' => 80, 'https' => 443, 'ws' => 80, 'wss' => 443 }
       SECURE_PROTOCOLS = ['https', 'wss']
 
       def_delegators :@driver, :headers, :status
@@ -29,7 +29,7 @@ module Faye
           conn.parent = self
         end
       rescue => error
-        emit_error("Network error: #{url}: #{error.message}")
+        emit_error("Network error: #{ url }: #{ error.message }")
         finalize_close
       end
 
@@ -51,7 +51,7 @@ module Faye
           @proxy = nil
 
           if secure
-            origin_tls = {:sni_hostname => uri.host}.merge(@origin_tls)
+            origin_tls = { :sni_hostname => uri.host }.merge(@origin_tls)
             @stream.start_tls(origin_tls)
           end
 
@@ -63,7 +63,7 @@ module Faye
         @stream = stream
 
         if @secure
-          socket_tls = {:sni_hostname => URI.parse(@url).host}.merge(@socket_tls)
+          socket_tls = { :sni_hostname => URI.parse(@url).host }.merge(@socket_tls)
           @stream.start_tls(socket_tls)
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faye-websocket
 version: !ruby/object:Gem::Version
-  version: 0.10.8
+  version: 0.10.9
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine