faye-websocket 0.1.1 → 0.1.2

data/examples/haproxy.conf

@@ -0,0 +1,21 @@
+defaults
+   mode http
+   timeout client  5s
+   timeout connect 5s
+   timeout server  5s
+
+frontend all 0.0.0.0:3000
+   mode http
+   timeout client 120s
+
+   option forwardfor
+   option http-server-close
+   option http-pretend-keepalive
+
+   default_backend sockets
+
+backend sockets
+   balance uri depth 2
+   timeout server  120s
+   server socket1 127.0.0.1:7000
+

data/lib/faye/websocket.rb

@@ -80,7 +80,10 @@ module Faye
       event.init_event('open', false, false)
       dispatch_event(event)
       
-      @env[Thin::Request::WEBSOCKET_RECEIVE_CALLBACK] = @parser.method(:parse)
+      @env[Thin::Request::WEBSOCKET_RECEIVE_CALLBACK] = lambda do |data|
+        response = @parser.parse(data)
+        @stream.write(response) if response
+      end
     end
     
   private

data/lib/faye/websocket/draft75_parser.rb

@@ -24,6 +24,7 @@ module Faye
       
       def parse(data)
         data.each_byte(&method(:handle_byte))
+        nil
       end
       
       def frame(data, type = nil, error_type = nil)

data/lib/faye/websocket/draft76_parser.rb

@@ -8,16 +8,7 @@ module Faye
       
       def handshake_response
         env = @socket.env
-        
-        key1   = env['HTTP_SEC_WEBSOCKET_KEY1']
-        value1 = number_from_key(key1) / spaces_in_key(key1)
-        
-        key2   = env['HTTP_SEC_WEBSOCKET_KEY2']
-        value2 = number_from_key(key2) / spaces_in_key(key2)
-        
-        hash = Digest::MD5.digest(big_endian(value1) +
-                                  big_endian(value2) +
-                                  env['rack.input'].read)
+        signature = handshake_signature(env['rack.input'].read)
         
         upgrade =  "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
         upgrade << "Upgrade: WebSocket\r\n"
@@ -25,10 +16,32 @@ module Faye
         upgrade << "Sec-WebSocket-Origin: #{env['HTTP_ORIGIN']}\r\n"
         upgrade << "Sec-WebSocket-Location: #{@socket.url}\r\n"
         upgrade << "\r\n"
-        upgrade << hash
+        upgrade << signature if signature
         upgrade
       end
       
+      def handshake_signature(head)
+        return nil if head.empty?
+        @handshake_complete = true
+        
+        env = @socket.env
+        
+        key1   = env['HTTP_SEC_WEBSOCKET_KEY1']
+        value1 = number_from_key(key1) / spaces_in_key(key1)
+        
+        key2   = env['HTTP_SEC_WEBSOCKET_KEY2']
+        value2 = number_from_key(key2) / spaces_in_key(key2)
+        
+        Digest::MD5.digest(big_endian(value1) +
+                           big_endian(value2) +
+                           head)
+      end
+      
+      def parse(data)
+        return super if @handshake_complete
+        handshake_signature(data)
+      end
+      
     private
       
       def number_from_key(key)

data/lib/faye/websocket/protocol8_parser.rb

@@ -129,6 +129,7 @@ module Faye
           end
           emit_frame if @stage == 4 and @length == 0
         end
+        nil
       end
       
       def frame(data, type = nil, code = nil)

metadata

@@ -1,109 +1,144 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: faye-websocket
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
-authors:
+authors: 
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-05 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: &5563640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 0
+        - 12
+        - 0
         version: 0.12.0
   type: :runtime
-  prerelease: false
-  version_requirements: *5563640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: thin
-  requirement: &5561880 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.2'
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
+        version: "1.2"
   type: :runtime
-  prerelease: false
-  version_requirements: *5561880
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &5559960 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
-  prerelease: false
-  version_requirements: *5559960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rack
-  requirement: &5558480 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *5558480
+  version_requirements: *id004
 description: 
 email: jcoglan@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
-files:
+files: 
 - README.rdoc
+- examples/autobahn_client.rb
 - examples/client.rb
-- examples/server.rb
+- examples/haproxy.conf
 - examples/index.html
-- examples/autobahn_client.rb
-- lib/faye/websocket/draft75_parser.rb
+- examples/server.rb
+- lib/faye/thin_extensions.rb
+- lib/faye/websocket/api.rb
 - lib/faye/websocket/client.rb
-- lib/faye/websocket/protocol8_parser.rb
+- lib/faye/websocket/draft75_parser.rb
 - lib/faye/websocket/draft76_parser.rb
-- lib/faye/websocket/api.rb
+- lib/faye/websocket/protocol8_parser.rb
 - lib/faye/websocket.rb
-- lib/faye/thin_extensions.rb
-- spec/faye/websocket/draft75_parser_spec.rb
 - spec/faye/websocket/client_spec.rb
+- spec/faye/websocket/draft75_parser_spec.rb
 - spec/faye/websocket/protocol8_parser_spec.rb
-- spec/server.key
 - spec/server.crt
+- spec/server.key
 - spec/spec_helper.rb
 homepage: http://github.com/jcoglan/faye-websocket-ruby
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Robust general-purpose WebSocket server and client
 test_files: []
+