faye-websocket 0.4.6 → 0.4.7

data/CHANGELOG.txt

@@ -1,3 +1,10 @@
+=== 0.4.7 / 2013-02-14
+
+* Emit the 'close' event if TCP is closed before CLOSE frame is acked
+* Treat the 'Upgrade: websocket' header case-insensitively because of IE10
+* Don't suppress headers in the Thin and Rainbows adapters unless the status is 101
+
+
 === 0.4.6 / 2012-07-09
 
 * Add 'Connection: close' to EventSource response

data/README.rdoc

@@ -40,23 +40,23 @@ and sending messages. For example this is how you'd implement an echo server:
 
     # app.rb
     require 'faye/websocket'
-    
+
     App = lambda do |env|
       if Faye::WebSocket.websocket?(env)
         ws = Faye::WebSocket.new(env)
-        
+
         ws.onmessage = lambda do |event|
           ws.send(event.data)
         end
-        
+
         ws.onclose = lambda do |event|
           p [:close, event.code, event.reason]
           ws = nil
         end
-        
+
         # Return async Rack response
         ws.rack_response
-        
+
       else
         # Normal HTTP request
         [200, {'Content-Type' => 'text/plain'}, ['Hello']]
@@ -104,19 +104,19 @@ browser. On the wire it identifies itself as hybi-13.
 
     require 'faye/websocket'
     require 'eventmachine'
-    
+
     EM.run {
       ws = Faye::WebSocket::Client.new('ws://www.example.com/')
-      
+
       ws.onopen = lambda do |event|
         p [:open]
         ws.send('Hello, world!')
       end
-      
+
       ws.onmessage = lambda do |event|
         p [:message, event.data]
       end
-      
+
       ws.onclose = lambda do |event|
         p [:close, event.code, event.reason]
         ws = nil
@@ -178,23 +178,23 @@ message has an optional event-type and ID.
 
     # app.rb
     require 'faye/websocket'
-    
+
     App = lambda do |env|
       if Faye::EventSource.eventsource?(env)
         es = Faye::EventSource.new(env)
         p [:open, es.url, es.last_event_id]
-        
+
         # Periodically send messages
         loop = EM.add_periodic_timer(1) { es.send('Hello') }
-        
+
         es.onclose = lambda do |event|
           EM.cancel_timer(loop)
           es = nil
         end
-        
+
         # Return async Rack response
         es.rack_response
-        
+
       else
         # Normal HTTP request
         [200, {'Content-Type' => 'text/plain'}, ['Hello']]
@@ -260,10 +260,10 @@ further in a block passed to +run+:
     require 'rack'
     require 'thin'
     require './app'
-    
+
     EM.run {
       thin = Rack::Handler.get('thin')
-      
+
       thin.run(App, :Port => 9292) do |server|
         # You can set options on the server here, for example to set up SSL:
         server.ssl_options = {
@@ -296,15 +296,15 @@ Rainbows also has a Ruby API for starting a server:
 
     require 'rainbows'
     require './app'
-    
+
     rackup = Unicorn::Configurator::RACKUP
     rackup[:port] = 9292
     rackup[:set_listener] = true
     options = rackup[:options]
     options[:config_file] = 'path/to/rainbows.conf'
-    
+
     server = Rainbows::HttpServer.new(App, options)
-    
+
     # This is non-blocking; use server.start.join to block
     server.start
 
@@ -316,7 +316,7 @@ Goliath can be made to run arbitrary Rack apps by delegating to them from a
 
     require 'goliath'
     require './app'
-    
+
     class EchoServer < Goliath::API
       def response(env)
         App.call(env)
@@ -327,15 +327,15 @@ Goliath can be made to run arbitrary Rack apps by delegating to them from a
 
     require 'goliath'
     require 'faye/websocket'
-    
+
     class EchoServer < Goliath::API
       def response(env)
         ws = Faye::WebSocket.new(env)
-        
+
         ws.onmessage = lambda do |event|
           ws.send(event.data)
         end
-        
+
         ws.rack_response
       end
     end
@@ -345,7 +345,7 @@ Goliath can be made to run arbitrary Rack apps by delegating to them from a
 
 (The MIT License)
 
-Copyright (c) 2009-2012 James Coglan
+Copyright (c) 2009-2013 James Coglan
 
 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

data/examples/app.rb

@@ -7,24 +7,24 @@ App = lambda do |env|
   if Faye::WebSocket.websocket?(env)
     ws = Faye::WebSocket.new(env, ['irc', 'xmpp'], :ping => 5)
     p [:open, ws.url, ws.version, ws.protocol]
-    
+
     ws.onmessage = lambda do |event|
       ws.send(event.data)
     end
-    
+
     ws.onclose = lambda do |event|
       p [:close, event.code, event.reason]
       ws = nil
     end
-    
+
     ws.rack_response
-  
+
   elsif Faye::EventSource.eventsource?(env)
     es   = Faye::EventSource.new(env)
     time = es.last_event_id.to_i
-    
+
     p [:open, es.url, es.last_event_id]
-    
+
     loop = EM.add_periodic_timer(2) do
       time += 1
       es.send("Time: #{time}")
@@ -32,17 +32,17 @@ App = lambda do |env|
         es.send('Update!!', :event => 'update', :id => time) if es
       end
     end
-    
+
     es.send("Welcome!\n\nThis is an EventSource server.")
-    
+
     es.onclose = lambda do |event|
       EM.cancel_timer(loop)
       p [:close, es.url]
       es = nil
     end
-    
+
     es.rack_response
-  
+
   else
     static.call(env)
   end

data/examples/autobahn_client.rb

@@ -1,43 +1,48 @@
 require 'rubygems'
 require File.expand_path('../../lib/faye/websocket', __FILE__)
 require 'cgi'
+require 'progressbar'
 
 EM.run {
   host   = 'ws://localhost:9001'
-  agent  = "Faye (Ruby #{RUBY_VERSION})"
+  agent  = "Ruby #{RUBY_VERSION}"
   cases  = 0
   skip   = []
-  
-  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}"
     cases = event.data.to_i
+    progress = ProgressBar.new('Autobahn', cases)
   end
-  
+
   socket.onclose = lambda do |event|
     run_case = lambda do |n|
+      progress.inc
+
       if n > cases
         socket = Faye::WebSocket::Client.new("#{host}/updateReports?agent=#{CGI.escape agent}")
+        progress.finish
         socket.onclose = lambda { |e| EM.stop }
-        
+
       elsif skip.include?(n)
         EM.next_tick { run_case.call(n+1) }
-        
+
       else
-        puts "Running test case ##{n} ..."
         socket = Faye::WebSocket::Client.new("#{host}/runCase?case=#{n}&agent=#{CGI.escape agent}")
-        
+
         socket.onmessage = lambda do |event|
           socket.send(event.data)
         end
-        
+
         socket.onclose = lambda do |event|
           run_case.call(n + 1)
         end
       end
     end
-    
+
     run_case.call(1)
   end
 }

data/examples/client.rb

@@ -9,19 +9,19 @@ EM.run {
   scheme = secure ? 'wss' : 'ws'
   url    = "#{scheme}://localhost:#{port}/"
   socket = Faye::WebSocket::Client.new(url)
-  
+
   puts "Connecting to #{socket.url}"
-  
+
   socket.onopen = lambda do |event|
     p [:open]
     socket.send("Hello, WebSocket!")
   end
-  
+
   socket.onmessage = lambda do |event|
     p [:message, event.data]
     # socket.close 1002, 'Going away'
   end
-  
+
   socket.onclose = lambda do |event|
     p [:close, event.code, event.reason]
     EM.stop

data/examples/config.ru

@@ -1,12 +1,12 @@
 # Run using your favourite async 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
 
 require 'rubygems'

data/examples/sse.html

@@ -5,35 +5,35 @@
     <title>EventSource test</title>
   </head>
   <body>
-    
+
     <h1>EventSource test</h1>
     <ul></ul>
-    
+
     <script type="text/javascript">
       var logger = document.getElementsByTagName('ul')[0],
           socket = new EventSource('/');
-      
+
       var log = function(text) {
         logger.innerHTML += '<li>' + text + '</li>';
       };
-      
+
       socket.onopen = function() {
         log('OPEN');
       };
-      
+
       socket.onmessage = function(event) {
         log('MESSAGE: ' + event.data);
       };
-      
+
       socket.addEventListener('update', function(event) {
         log('UPDATE(' + event.lastEventId + '): ' + event.data);
       });
-      
+
       socket.onerror = function(event) {
         log('ERROR: ' + event.message);
       };
     </script>
-    
+
   </body>
 </html>
 

data/examples/ws.html

@@ -5,40 +5,40 @@
     <title>WebSocket test</title>
   </head>
   <body>
-    
+
     <h1>WebSocket test</h1>
     <ul></ul>
-    
+
     <script type="text/javascript">
       var logger = document.getElementsByTagName('ul')[0],
           Socket = window.MozWebSocket || window.WebSocket,
           protos = ['foo', 'bar', 'xmpp'],
           socket = new Socket('ws://' + location.hostname + ':' + location.port + '/', protos),
           index  = 0;
-      
+
       var log = function(text) {
         logger.innerHTML += '<li>' + text + '</li>';
       };
-      
+
       socket.addEventListener('open', function() {
         log('OPEN: ' + socket.protocol);
         socket.send('Hello, world');
       });
-      
+
       socket.onerror = function(event) {
         log('ERROR: ' + event.message);
       };
-      
+
       socket.onmessage = function(event) {
         log('MESSAGE: ' + event.data);
         setTimeout(function() { socket.send(++index + ' ' + event.data) }, 2000);
       };
-      
+
       socket.onclose = function(event) {
         log('CLOSE: ' + event.code + ', ' + event.reason);
       };
     </script>
-    
+
   </body>
 </html>
 

data/ext/faye_websocket_mask/FayeWebsocketMaskService.java

@@ -17,39 +17,39 @@ import org.jruby.runtime.load.BasicLibraryService;
 
 public class FayeWebsocketMaskService implements BasicLibraryService {
   private Ruby runtime;
-  
+
   public boolean basicLoad(Ruby runtime) throws IOException {
     this.runtime = runtime;
     RubyModule faye = runtime.defineModule("Faye");
-    
+
     RubyClass webSocketMask = faye.defineClassUnder("WebSocketMask", runtime.getObject(), new ObjectAllocator() {
       public IRubyObject allocate(Ruby runtime, RubyClass rubyClass) {
         return new WebsocketMask(runtime, rubyClass);
       }
     });
-    
+
     webSocketMask.defineAnnotatedMethods(WebsocketMask.class);
     return true;
   }
-  
+
   public class WebsocketMask extends RubyObject {
     public WebsocketMask(final Ruby runtime, RubyClass rubyClass) {
       super(runtime, rubyClass);
     }
-    
+
     @JRubyMethod
     public IRubyObject mask(ThreadContext context, IRubyObject payload, IRubyObject mask) {
       int n = ((RubyArray)payload).getLength(), i;
       long p, m;
       RubyArray unmasked = RubyArray.newArray(runtime, n);
-      
+
       long[] maskArray = {
         (Long)((RubyArray)mask).get(0),
         (Long)((RubyArray)mask).get(1),
         (Long)((RubyArray)mask).get(2),
         (Long)((RubyArray)mask).get(3)
       };
-      
+
       for (i = 0; i < n; i++) {
         p = (Long)((RubyArray)payload).get(i);
         m = maskArray[i % 4];