websocker 0.0.2 → 0.0.3

data/lib/websocker/client.rb

@@ -10,8 +10,7 @@ require "logger"
 # implement a websocket client that speaks the hybi-10 protocol
 module Websocker
   class Client
-    class NotConnectedError < RuntimeError; end
-
+    class SocketReadError < RuntimeError; end
     class HandshakeNegotiationError < RuntimeError; end
 
     def initialize(opts = {})
@@ -21,14 +20,15 @@ module Websocker
       @path = opts[:path] || "/"
       @connected = false
       @logger = opts[:logger] || Logger.new(STDOUT)
-      @logger.debug "Connecting to #{@host}:#{@port}"
+      @logger.debug "Connecting to #{@host}:#{@port}#{@path}"
     end
 
     def connect
       @sock = TCPSocket.open(@host, @port)
+      @sock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
       @connected = true
       key = generateKey
-      @sock.write handshake(key)
+      write handshake(key)
       headers = read_headers
       received_key = headers['Sec-WebSocket-Accept']
       expected_key = expected_security_key_answer(key)
@@ -39,12 +39,17 @@ module Websocker
     def listen
       @loop = Thread.new do
         while @connected
-          message = read
-          puts "listen: #{message}"
-          @on_message.call(message) unless @on_message.nil?
+          read_once
         end
       end
     end
+    
+    def read_once
+      message = read
+      return unless @connected
+      @logger.debug "received: #{message}"
+      @on_message.call(message) unless @on_message.nil?
+    end
 
     def on_message(&blk)
       @on_message = blk
@@ -59,31 +64,35 @@ module Websocker
       write_byte(byte1)
 
       # write length
-      if data.size <= 125
-        byte2 = data.size
+      byte2 = 0x80 # mask flag set to true
+      length = data.size
+      if length <= 125
+        byte2 = byte2 | length
         write_byte(byte2)
-      elsif data.size <= 65535
-        byte2 = 0b10000000 | 126
+      elsif length <= 65535
+        byte2 = byte2 | 126
         write_byte(byte2)
         # write length in next two bytes
-        @sock.write [length].pack('n') # 16-bit unsigned
+        write [length].pack('n') # 16-bit unsigned
       else
-        byte2 = 0b10000000 | 127
+        byte2 = byte2 | 127
         write_byte(byte2)
         # write length in next eight bytes
-        @sock.write [length].pack('Q') # 64-bit unsigned
+        write [length].pack('Q') # 64-bit unsigned
       end
-
-      @sock.write(data)
-      @sock.flush
-
-      puts "Writing #{byte1}, #{byte2}, #{data}"
+      # masking is required from the client to the server
+      masking_key = Array.new(4){ rand(256) }
+      write(masking_key.pack("C*"))
+      masked_data = apply_mask(data, masking_key)
+      # write masked message payload
+      write(masked_data)
+      @logger.debug "wrote: #{data}"
     end
 
     def close
       @logger.debug "Connection closed"
       @connected = false
-      @on_closed unless @on_closed.nil?
+      @on_closed.call unless @on_closed.nil?
     end
 
     private
@@ -139,14 +148,14 @@ module Websocker
 
     # write an unsigned byte
     def write_byte(byte)
-      @sock.write [byte].pack("C")
+      write [byte].pack("C")
     end
 
     # fin: 1 bit, indicates this is the final fragment in a message
     # rsv1, rsv2, rsv3: 1 bit, reserved, usually zero unless used by websocket extensions
     # opcode: 4 bits; 0 continuation, 1 text, 2 bin, 8 closed
     # mask: 1 bit, indicates payload is masked
-    # len: 7 bits, payload length
+    # len: 7 bits, payload length, may also use next 2 bytes if len==126, or next 8 bytes if len==127
     # payload: variable
     def read_frame
       byte = read_and_unpack_byte
@@ -179,7 +188,6 @@ module Websocker
       end
 
       if mask then
-        @logger.debugmask
         masking_key = @sock.read(4).unpack("C*")
       end
 
@@ -201,8 +209,13 @@ module Websocker
     # reads a byte and returns an 8-bit unsigned integer
     def read_and_unpack_byte
       byte = @sock.read(1)
-      @logger.debug "read_and_unpack_byte: #{byte}"
+      raise SocketReadError if byte.nil?
       byte = byte.unpack('C')[0]
     end
+    
+    def write(data)
+      @sock.write(data)
+      @sock.flush
+    end
   end
 end

data/lib/websocker/version.rb

@@ -1,3 +1,3 @@
 module Websocker 
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: websocker
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lawrence Mcalpin
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-24 00:00:00 Z
+date: 2012-02-27 00:00:00 Z
 dependencies: []
 
 description: A simple implementation of a Websocket client.
 email: 
-- lmcalpin+turntable_api@gmail.com
+- lmcalpin+websocker@gmail.com
 executables: []
 
 extensions: []
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: websocker
-rubygems_version: 1.8.16
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Library for communicating with Websocket servers.