websocket-client 0.1.5 → 0.1.6

data/lib/websocket_client/client.rb

@@ -42,7 +42,9 @@ module WebSocketClient
   
     def connect(&block)
       @socket = TCPSocket.open(uri.host, uri.port)
+      puts "> handshaking"
       @handshake = @handshake_class.new( uri, @socket )
+      puts "> handshook"
       
       start_handler
   
@@ -74,6 +76,7 @@ module WebSocketClient
       if ( block ) 
         @on_message_handler = block
       else
+        puts "> on_message #{msg}"
         @on_message_handler.call( msg ) if @on_message_handler
       end
     end

data/lib/websocket_client/ietf_00.rb

@@ -7,9 +7,11 @@ module WebSocketClient
   class Ietf00
 
     def initialize(uri, socket)
+      puts "initialize for #{socket}"
       @socket = socket
       key1, key2, key3, solution = generate_keys()
 
+      puts "> sending prolog"
       @socket.puts "GET #{uri.path} HTTP/1.1"
       @socket.puts "Host: #{uri.host}"
       @socket.puts "Connection: upgrade"
@@ -24,10 +26,14 @@ module WebSocketClient
       @socket.flush
       
       while ( ! @socket.eof? ) 
-        line = @socket.gets
+        line = readline( socket )
+        puts ">> #{line}"
         break if ( line.strip == '' ) 
       end
+
       challenge = @socket.read( 16 ) 
+
+      puts "> challenge-response #{challenge}"
       if ( challenge == solution )
         puts "success!"
       end
@@ -35,6 +41,25 @@ module WebSocketClient
       #dump 'challenge', challenge
     end
 
+    def readline(socket)
+      line = ''
+      while ( ! socket.eof? )
+        if ( socket.respond_to? :getbyte )
+          c = socket.getbyte
+        else
+          c = socket.getc
+        end
+        puts "> #{c} #{c.class} #{c == '\n'}"
+
+        line << c
+
+        if ( c == 10 )
+          break
+        end
+      end
+      line
+    end
+
     def encode_text_message(msg)
       @socket.putc 0x00
       @socket.print msg

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: websocket-client
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - The TorqueBox Team