em-websocket-request 0.0.3 → 0.0.4

data/.gitmodules

@@ -1,3 +1,3 @@
 [submodule "lib/em-ws-request/vendor/web-socket-ruby"]
 	path = lib/em-ws-request/vendor/web-socket-ruby
-	url = git@github.com:rykov/web-socket-ruby.git
+	url = git://github.com/gimite/web-socket-ruby.git

data/lib/em-ws-request/vendor/web-socket-ruby/lib/web_socket.rb

@@ -79,7 +79,7 @@ class WebSocket
         end
 
         @path = (uri.path.empty? ? "/" : uri.path) + (uri.query ? "?" + uri.query : "")
-        host = uri.host + (uri.port == default_port ? "" : ":#{uri.port}")
+        host = uri.host + ((!uri.port || uri.port == default_port) ? "" : ":#{uri.port}")
         origin = params[:origin] || "http://#{uri.host}"
         key1 = generate_key()
         key2 = generate_key()
@@ -186,47 +186,51 @@ class WebSocket
           if packet =~ /\A\x00(.*)\xff\z/nm
             return force_encoding($1, "UTF-8")
           elsif packet == "\xff" && read(1) == "\x00" # closing
-            close(true)
+            close(1005, "", :peer)
             return nil
           else
             raise(WebSocket::Error, "input must be either '\\x00...\\xff' or '\\xff\\x00'")
           end
         
         else
-          bytes = read(2).unpack("C*")
-          fin = (bytes[0] & 0x80) != 0
-          opcode = bytes[0] & 0x0f
-          mask = (bytes[1] & 0x80) != 0
-          plength = bytes[1] & 0x7f
-          if plength == 126
-            bytes = read(2)
-            plength = bytes.unpack("n")[0]
-          elsif plength == 127
-            bytes = read(8)
-            (high, low) = bytes.unpack("NN")
-            plength = high * (2 ** 32) + low
-          end
-          if @server && !mask
-            # Masking is required.
-            @socket.close()
-            raise(WebSocket::Error, "received unmasked data")
-          end
-          mask_key = mask ? read(4).unpack("C*") : nil
-          payload = read(plength)
-          payload = apply_mask(payload, mask_key) if mask
-          case opcode
-            when OPCODE_TEXT
-              return force_encoding(payload, "UTF-8")
-            when OPCODE_BINARY
-              raise(WebSocket::Error, "received binary data, which is not supported")
-            when OPCODE_CLOSE
-              close(true)
-              return nil
-            when OPCODE_PING
-              raise(WebSocket::Error, "received ping, which is not supported")
-            when OPCODE_PONG
-            else
-              raise(WebSocket::Error, "received unknown opcode: %d" % opcode)
+          begin
+            bytes = read(2).unpack("C*")
+            fin = (bytes[0] & 0x80) != 0
+            opcode = bytes[0] & 0x0f
+            mask = (bytes[1] & 0x80) != 0
+            plength = bytes[1] & 0x7f
+            if plength == 126
+              bytes = read(2)
+              plength = bytes.unpack("n")[0]
+            elsif plength == 127
+              bytes = read(8)
+              (high, low) = bytes.unpack("NN")
+              plength = high * (2 ** 32) + low
+            end
+            if @server && !mask
+              # Masking is required.
+              @socket.close()
+              raise(WebSocket::Error, "received unmasked data")
+            end
+            mask_key = mask ? read(4).unpack("C*") : nil
+            payload = read(plength)
+            payload = apply_mask(payload, mask_key) if mask
+            case opcode
+              when OPCODE_TEXT
+                return force_encoding(payload, "UTF-8")
+              when OPCODE_BINARY
+                raise(WebSocket::Error, "received binary data, which is not supported")
+              when OPCODE_CLOSE
+                close(1005, "", :peer)
+                return nil
+              when OPCODE_PING
+                raise(WebSocket::Error, "received ping, which is not supported")
+              when OPCODE_PONG
+              else
+                raise(WebSocket::Error, "received unknown opcode: %d" % opcode)
+            end
+          rescue EOFError
+            return nil
           end
         
       end
@@ -259,16 +263,21 @@ class WebSocket
     end
     
     # Does closing handshake.
-    def close(by_peer = false)
+    def close(code = 1005, reason = "", origin = :self)
       if !@closing_started
         case @web_socket_version
           when "hixie-75", "hixie-76"
             write("\xff\x00")
           else
-            send_frame(OPCODE_CLOSE, "", false)
+            if code == 1005
+              payload = ""
+            else
+              payload = [code].pack("n") + force_encoding(reason.dup(), "ASCII-8BIT")
+            end
+            send_frame(OPCODE_CLOSE, payload, false)
         end
       end
-      @socket.close() if by_peer
+      @socket.close() if origin == :peer
       @closing_started = true
     end
     
@@ -332,7 +341,11 @@ class WebSocket
     def read(num_bytes)
       str = @socket.read(num_bytes)
       $stderr.printf("recv> %p\n", str) if WebSocket.debug
-      return str
+      if str && str.bytesize == num_bytes
+        return str
+      else
+        raise(EOFError)
+      end
     end
 
     def write(data)

data/lib/em-ws-request/version.rb

@@ -1,3 +1,3 @@
 module EventMachine
-  WS_REQUEST_VERSION = "0.0.3"
+  WS_REQUEST_VERSION = "0.0.4"
 end

data/lib/em-ws-request/wrapper.rb

@@ -8,9 +8,9 @@ module EventMachine
       @web_socket_version = version
     end
 
-    def send_frame(type, data)
-      opcode = type_to_opcode(type)
-      super(opcode, data, true)
+    def send_frame(opcode, data, mask = true)
+      opcode = type_to_opcode(opcode) if opcode.is_a?(Symbol)
+      super(opcode, data, mask)
     end
 
     def write(data)
@@ -29,8 +29,9 @@ module EventMachine
     end
 
     # Called on a CLOSE frame
-    def close(by_peer = false)
-      super(by_peer)
+    def close(code = 1005, reason = "", origin = :self)
+      origin = :self if origin == :peer # to skip @socket.close
+      super(code, reason, origin)
       @client.unbind
     end
 

data/spec/websocket_spec.rb

@@ -13,7 +13,7 @@ describe EventMachine::WebsocketRequest do
 
     it "should invoke errback on failed upgrade" do
       EventMachine.run {
-        http = EventMachine::WebsocketRequest.new('ws://127.0.0.1:8090/').get :timeout => 0
+        http = websocket_test_request(:timeout => 0)
 
         http.callback { failed(http) }
         http.errback {
@@ -27,14 +27,14 @@ describe EventMachine::WebsocketRequest do
       EventMachine.run {
         MSG = "hello bi-directional data exchange"
 
-        EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8085, :debug => true) do |ws|
+        with_websocket_test_server do |ws|
           ws.onopen { p [:OPENED_WS, ws]}
           ws.onmessage {|msg| ws.send msg}
           ws.onerror {|e| p [:WS_ERROR, e]}
           ws.onclose { p [:WS_CLOSE, ws]}
         end
 
-        http = EventMachine::WebsocketRequest.new('ws://127.0.0.1:8085/').get :keepalive => true
+        http = websocket_test_request
         http.errback { failed(http) }
         http.callback {
           http.response_header.status.should == 101
@@ -55,32 +55,61 @@ describe EventMachine::WebsocketRequest do
     # parser eats up the trailign data
     # [:receive, "HTTP/1.1 101 Web Socket Protocol Handshake\r\nUpgrade: WebSocket\r\nConnection: Upgrade\r\nWebSocket-Origin: 127.0.0.1\r\nWebSocket-Location: ws://127.0.0.1:8085/\r\n\r\n\x001\xFF\x002\xFF", :keep_alive?, "#<HTTP::Parser:0x0000010132d000>"]
 
-    xit "should split multiple messages from websocket server into separate stream callbacks" do
+    it "should split multiple messages from websocket server into separate stream callbacks" do
       EM.run do
         messages = %w[1 2]
         recieved = []
 
-        EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8085) do |ws|
-          ws.onopen {
-            ws.send messages[0]
-            ws.send messages[1]
-          }
+        with_websocket_test_server do |ws|
+          ws.onopen do
+            EventMachine.add_timer(0.1) { ws.send messages[0] }
+            EventMachine.add_timer(0.2) { ws.send messages[1] }
+          end
         end
 
-        EventMachine.add_timer(0.1) do
-          http = EventMachine::WebsocketRequest.new('ws://127.0.0.1:8085/').get :keepalive => true
-          http.errback { failed(http) }
-          http.callback { http.response_header.status.should == 101; p 'WS CONNECTED' }
-          http.stream {|msg|
-            p ['GOT MSG ', msg]
-            msg.should == messages[recieved.size]
-            recieved.push msg
-            p [:MULTI_MESAGE, recieved]
-
-            EventMachine.stop if recieved.size == messages.size
-          }
-        end
+        http = websocket_test_request
+        http.errback { failed(http) }
+        http.callback { http.response_header.status.should == 101; p 'WS CONNECTED' }
+        http.stream {|msg|
+          p ['GOT MSG ', msg]
+          msg.should == messages[recieved.size]
+          recieved.push msg
+          p [:MULTI_MESAGE, recieved]
+          EventMachine.stop if recieved.size == messages.size
+        }
       end
     end
+
+    it "should process close on message correctly " do
+      EM.run {
+        MSG = "hello bi-directional data exchange"
+
+        with_websocket_test_server do |ws|
+          ws.onopen { p [:OPENED_WS, ws] }
+          ws.onmessage { |msg| ws.close_websocket }
+          ws.onerror {|e| p [:WS_ERROR, e] }
+          ws.onclose { p [:WS_CLOSE, ws] }
+        end
+
+        http = websocket_test_request
+        http.errback  { failed(http) }
+        http.callback { http.send(MSG) }
+        http.stream { |chunk|
+          chunk.should be_nil
+          EventMachine.stop
+        }
+
+      }
+    end
+  end
+
+  def with_websocket_test_server(&block)
+    opts = { :host => "0.0.0.0", :port => 8085, :debug => true }
+    EventMachine::WebSocket.start(opts, &block)
+  end
+
+  def websocket_test_request(opts = {})
+    req = EventMachine::WebsocketRequest.new('ws://127.0.0.1:8085/')
+    req.get(opts.merge(:keepalive => true))
   end
 end

metadata

@@ -1,38 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-websocket-request
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Michael Rykov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: em-http-request
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70226843904280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70226843904280
 description: EventMachine WebSocket client
-email: 
+email:
 - mrykov@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .gitmodules
 - Gemfile
@@ -44,32 +40,29 @@ files:
 - lib/em-ws-request/wrapper.rb
 - spec/websocket_spec.rb
 - lib/em-ws-request/vendor/web-socket-ruby/lib/web_socket.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-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
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: EventMachine WebSocket client
-test_files: 
+test_files:
 - spec/websocket_spec.rb