lib/pusher-client/websocket.rb in pusher-client-0.2.2 vs lib/pusher-client/websocket.rb in pusher-client-0.3.0

@@ -1,84 +1,92 @@
 require 'rubygems'
 require 'socket'
-require 'libwebsocket'
+require 'websocket'
 require 'openssl'
+require 'openssl/nonblock' if RUBY_VERSION == '1.8.7'
 
 module PusherClient
-  class WebSocket
+  class PusherWebSocket
+    WAIT_EXCEPTIONS  = [Errno::EAGAIN, Errno::EWOULDBLOCK]
+    WAIT_EXCEPTIONS << IO::WaitReadable if defined?(IO::WaitReadable)
+    
+    attr_accessor :socket
 
     def initialize(url, params = {})
-      @hs ||= LibWebSocket::OpeningHandshake::Client.new(:url => url, :version => params[:version])
-      @frame ||= LibWebSocket::Frame.new
+      @hs ||= WebSocket::Handshake::Client.new(:url => url, :version => params[:version])
+      @frame ||= WebSocket::Frame::Incoming::Server.new(:version => @hs.version)
+      @socket = TCPSocket.new(@hs.host, @hs.port || 80)
 
-      @socket = TCPSocket.new(@hs.url.host, @hs.url.port || 80)
-
       if params[:ssl] == true
-
         ctx = OpenSSL::SSL::SSLContext.new
         ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER|OpenSSL::SSL::VERIFY_FAIL_IF_NO_PEER_CERT
         # http://curl.haxx.se/ca/cacert.pem
         ctx.ca_file = path_to_cert()
 
         ssl_sock = OpenSSL::SSL::SSLSocket.new(@socket, ctx)
         ssl_sock.sync_close = true
         ssl_sock.connect
 
         @socket = ssl_sock
-
       end
 
       @socket.write(@hs.to_s)
       @socket.flush
 
       loop do
         data = @socket.getc
         next if data.nil?
 
-        result = @hs.parse(data.chr)
+        @hs << data
 
-        raise @hs.error unless result
-
-        if @hs.done?
+        if @hs.finished?
+          raise Exception unless @hs.valid?
           @handshaked = true
           break
         end
       end
     end
 
     def path_to_cert
       File.join(File.dirname(File.expand_path(__FILE__)), '../../certs/cacert.pem')
     end
 
-    def send(data)
+    def send(data, type = :text)
       raise "no handshake!" unless @handshaked
 
-      data = @frame.new(data).to_s
+      data = WebSocket::Frame::Outgoing::Server.new(:version => @hs.version, :data => data, :type => type).to_s
       @socket.write data
       @socket.flush
     end
 
     def receive
       raise "no handshake!" unless @handshaked
 
-      data = @socket.gets("\xff")
-      @frame.append(data)
+      begin
+        data = @socket.read_nonblock(1024)
+      rescue *WAIT_EXCEPTIONS
+        IO.select([@socket])
+        retry
+      end
+      @frame << data
 
       messages = []
       while message = @frame.next
-        messages << message
+        if message.type === :ping
+          send(message.data, :pong)
+          return messages
+        end
+        messages << message.to_s
       end
       messages
+    rescue IOError, Errno::EBADF => error
+      PusherClient.logger.debug error.message
+      []
     end
 
-    def socket
-      @socket
-    end
-
     def close
       @socket.close
+    rescue IOError => error
+      PusherClient.logger.debug error.message
     end
-
   end
 end
-
-