em-websocket-server 0.1.1 → 0.1.2

data/README.markdown

@@ -33,7 +33,7 @@ Not yet... coming soon
 	#create a channel for pub sub
 	$chatroom = EM::Channel.new
 	
-	class ChatServer < WebSocketServer
+	class ChatServer < WebSocket::Server
 	
 		#subscribe to the channel on client connect
 		def on_connect

data/em-websocket-server.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
 	s.name = 'em-websocket-server'
-	s.version = '0.1.1'
+	s.version = '0.1.2'
 	s.date = '2009-12-14'
 	s.summary = 'An evented ruby websocket server built on top of EventMachine'
 	s.email = "dan.simpson@gmail.com"
@@ -16,13 +16,10 @@ spec = Gem::Specification.new do |s|
 	s.files = [
 		"README.markdown",
 		"em-websocket-server.gemspec",
-		"examples/chat.rb",
-		"examples/chat.html",
-		"examples/timesync.html",
-		"examples/timesync.rb",
-		"examples/tictactoe/tictactoe.html",
-		"examples/tictactoe/tictactoe.js",
-		"examples/tictactoe/tictactoe.rb",
-		"lib/em-websocket-server.rb"
+		"lib/web_socket.rb",
+		"lib/web_socket/util.rb",
+		"lib/web_socket/frame.rb",
+		"lib/web_socket/client.rb",
+		"lib/web_socket/server.rb"
 	]
 end

data/lib/web_socket.rb

@@ -0,0 +1,11 @@
+require 'rubygems'
+require 'eventmachine'
+require 'pp'
+
+module WebSocket
+end
+
+require 'web_socket/util.rb'
+require 'web_socket/frame.rb'
+require 'web_socket/server.rb'
+require 'web_socket/client.rb'

data/lib/web_socket/client.rb

@@ -0,0 +1,69 @@
+
+module WebSocket
+
+	class Client < EM::Connection
+
+		def path
+			"/chat"
+		end
+		
+		def host
+			"localhost:8000"
+		end
+
+		def origin
+			"localhost"
+		end
+		
+		# em override
+		def post_init
+			@connected = false
+		end
+		
+		def connection_completed
+			send_headers
+		end
+
+		# em override
+		def unbind
+			on_disconnect
+		end
+
+		def on_disconnect
+		end
+
+		def send_message msg
+			send_data Frame.encode(msg)
+		end
+
+		private
+		
+		def receive_data data
+			unless @connected
+				handshake data
+			else
+				on_receive Frame.decode(data)
+			end
+		end
+
+		def handshake data
+
+			#convert the headers to a hash
+			@headers   = Util.parse_headers(data)
+			@connected = true
+
+			on_connect
+		end
+
+		def send_headers
+			result = "GET #{path} HTTP/1.1\r\n"
+			result << "Upgrade: WebSocket\r\n"
+			result << "Connection: Upgrade\r\n"
+			result << "Host: #{host}\r\n"
+			result << "Origin: #{origin}\r\n\r\n"
+
+			send_data result
+		end
+	end
+
+end

data/lib/web_socket/frame.rb

@@ -0,0 +1,20 @@
+module WebSocket
+
+	class Frame
+
+		# Frames need to start with 0x00-0x7f byte and end with 
+		# an 0xFF byte.  Per spec, we can also set the first
+		# byte to a value betweent 0x80 and 0xFF, followed by
+		# a leading length indicator.  No support yet.
+		def self.encode data
+			"\x00#{data}\xff"
+		end
+
+		# Strip leading and trailing bytes
+		def self.decode data
+			data.gsub(/^(\x00)|(\xff)$/, "")
+		end
+
+	end
+
+end

data/lib/web_socket/server.rb

@@ -0,0 +1,146 @@
+module WebSocket
+
+	class Server < EM::Connection
+	
+		@@logger			= nil
+		@@num_connections	= 0
+		@@callbacks 		= {}
+		@@accepted_origins	= []
+	
+		attr_accessor	:connected,
+						:headers
+	
+		def initialize *args
+			super
+			@connected = false
+		end
+	
+		def valid_origin?
+			@@accepted_origins.empty? || @@accepted_origins.include?(origin)
+		end
+	
+		#not doing anything with this yet
+		def valid_path?
+			true
+		end
+	
+		def valid_upgrade?
+			@headers[:upgrade] =~ /websocket/i
+		end
+	
+		def origin
+			@headers[:origin]
+		end
+	
+		def host
+			@headers[:host]
+		end
+		
+		def path
+			@headers[:path]
+		end
+		
+		def cookies
+			@headers[:cookie]
+		end
+
+		def self.path name, &block
+			@@callbacks[name] = block
+		end
+	
+		#tcp connection established
+		def post_init
+			@@num_connections += 1
+		end
+	
+		#must be public for em
+		def unbind
+			@@num_connections -= 1
+			on_disconnect
+		end
+
+		def send_message msg
+			send_data Frame.encode(msg)
+		end
+
+		protected
+
+		#override this method
+		def on_receive msg
+			log msg
+		end
+	
+		#override this method
+		def on_connect
+			log "connected"
+		end
+	
+		#override this method
+		def on_disconnect
+			log "disconnected"
+		end
+	
+		def log msg
+			if @@logger
+				@@logger.info msg
+			else
+				puts msg
+			end
+		end
+	
+		private
+	
+		# when the connection receives data from the client
+		# we either handshake or handle the message at 
+		# the app layer
+		def receive_data data
+			unless @connected
+				handshake data
+			else
+				on_receive Frame.decode(data)
+			end
+		end
+	
+		# parse the headers, validate the origin and path
+		# and respond with appropiate headers for a 
+		# healthy relationship with the client
+		def handshake data
+	
+			#convert the headers to a hash
+			@headers = Util.parse_headers(data)
+	    
+			# close the connection if the connection
+			# originates from an invalid source
+			close_connection unless valid_origin?
+	
+			# close the connection if a callback
+			# is not registered for the path
+			close_connection unless valid_path?
+	
+			# don't respond to non-websocket HTTP requests
+			close_connection unless valid_upgrade?
+	
+			#complete the handshake
+			send_headers
+	
+			@connected = true
+	
+			on_connect
+		end
+	
+		# send the handshake response headers to
+		# complete the initial com
+		def send_headers
+
+			response = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
+			response << "Upgrade: WebSocket\r\n"
+			response << "Connection: Upgrade\r\n"
+			response << "WebSocket-Origin: #{origin}\r\n"
+			response << "WebSocket-Location: ws://#{host}#{path}\r\n\r\n"
+
+			send_data response
+		end
+
+	end
+
+end

data/lib/web_socket/util.rb

@@ -0,0 +1,50 @@
+module WebSocket
+
+	class Util
+
+		@@path_regex    = /^GET (\/[^\s]*) HTTP\/1\.1$/
+		@@hs_regex      = /^HTTP\/1\.1 101 Web Socket Protocol Handshake$/
+		@@header_regex  = /^([^:]+):\s*([^$]+)/
+
+		# Parse http style headers into a ruby hash
+		def self.parse_headers data
+			lines = data.split("\r\n")
+      line  = lines.shift
+      
+			headers = {}
+      
+      case line
+      when @@path_regex
+        headers[:path] = @@path_regex.match(line)[1]
+      when @@hs_regex
+        #do nothing
+      else
+        throw "Unrecognized Header!"
+      end
+      
+      
+			lines.each do |line|
+				kvp = @@header_regex.match(line)
+				headers[kvp[1].strip.downcase.to_sym] = kvp[2].strip
+			end
+
+			headers
+		end
+
+		# encode ruby hash into HTTP style headers
+		def self.encode_headers data
+			result = ""
+
+			data.each_pair do |k,v|
+				result << k.to_s
+				result << ": "
+				result << v.to_s
+				result << "\r\n"
+			end
+
+			result << "\r\n"
+			result
+		end
+	  
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: em-websocket-server
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Dan Simpson
@@ -33,14 +33,11 @@ extra_rdoc_files: []
 files: 
 - README.markdown
 - em-websocket-server.gemspec
-- examples/chat.rb
-- examples/chat.html
-- examples/timesync.html
-- examples/timesync.rb
-- examples/tictactoe/tictactoe.html
-- examples/tictactoe/tictactoe.js
-- examples/tictactoe/tictactoe.rb
-- lib/em-websocket-server.rb
+- lib/web_socket.rb
+- lib/web_socket/util.rb
+- lib/web_socket/frame.rb
+- lib/web_socket/client.rb
+- lib/web_socket/server.rb
 has_rdoc: true
 homepage: http://github.com/dansimpson/em-websocket-server
 licenses: []

data/examples/chat.html

@@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<title>em-websocket-server test</title>
-</head>
-<body>
-
-
-<h1>em-websocket-server chat demo</h1>
-<div id="chat">connecting....</div>
-
-
-
-<script>
-
-	var webSocket = new WebSocket('ws://192.168.0.2:8000/time');
-
-	webSocket.onopen = function(event){
-		document.getElementById('chat').innerHTML = 'connected';
-	};
-
-	webSocket.onmessage = function(event){
-		var object = JSON.parse(event.data);
-		document.getElementById('chat').innerHTML += "<b>" + object.user + "</b>" + object.message;
-	};
-
-	webSocket.onclose = function(event){
-		document.getElementById('chat').innerHTML = 'socket closed';
-	};
-	
-	document.getElementById('chatty').addEventListener("onkeypress", function() {
-		alert("X")
-	});
-	
-</script>
-
-<input type="text" onkeypress="webSocket.send('hi');" />
-
-</body>
-</html>

data/examples/chat.rb

@@ -1,33 +0,0 @@
-$:.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'rubygems'
-require 'em-websocket-server'
-require 'json'
-
-$chatroom = EM::Channel.new
-
-class ChatServer < WebSocketServer
-
-	def on_connect
-		@sid = $chatroom.subscribe do |msg|
-			send_message msg
-		end
-	end
-
-	def on_disconnect
-		$chatroom.unsubscribe(@sid)
-	end
-
-	def on_receive msg
-		$chatroom.push msg
-	end
-
-end
-
-
-EM.epoll
-EM.set_descriptor_table_size(10240)
-
-EM.run do
-	EM.start_server "0.0.0.0", 8000, ChatServer
-end

data/examples/tictactoe/tictactoe.html

@@ -1,51 +0,0 @@
-<!doctype html>
-
-<html>
-<head>
-  <title>Tic Tac Toe</title>
-  <meta name="author" content="Jordan Fowler (TheBreeze)">
-
-  <style type="text/css" media="screen">
-    #navigation ul {
-      list-style-type: none;
-      padding: 0;
-      margin: 25px 0px;
-    }
-
-    #navigation ul li {
-      display: inline;
-      padding: 0;
-      margin: 0;
-      margin-right: 10px;
-    }
-
-    #game-board .cell {
-      width: 100px;
-      height: 100px;
-      padding: 5px;
-      background: #000;
-      color: #FFF;
-      font-size: 100px;
-      text-align: center;
-      vertical-align: middle;
-    }
-  </style>
-</head>
-<body>
-
-<h1>Tic Tac Toe</h1>
-
-<div id="user-count"></div>
-<div id="game-stats"></div>
-<div id="status"></div>
-
-<table id="game-board">
-  <tr><td id="cell-0-0" class="cell"></td><td id="cell-1-0" class="cell"></td><td id="cell-2-0" class="cell"></td></tr>
-  <tr><td id="cell-0-1" class="cell"></td><td id="cell-1-1" class="cell"></td><td id="cell-2-1" class="cell"></td></tr>
-  <tr><td id="cell-0-2" class="cell"></td><td id="cell-1-2" class="cell"></td><td id="cell-2-2" class="cell"></td></tr>
-</table>
-
-<script type="text/javascript" charset="utf-8" src="mootools-1.2.4-core-nc.js"></script>
-<script type="text/javascript" charset="utf-8" src="tictactoe.js"></script>
-</body>
-</html>

data/examples/tictactoe/tictactoe.js

@@ -1,130 +0,0 @@
-// Author: Jordan Fowler (TheBreeze)
-
-var TicTacToe = new Class({
-  wins: 0,
-  loses: 0,
-  draws: 0,
-  methodMap: {
-    'queued': 'onQueued',
-    'start': 'onStart',
-    'turn': 'onTurn',
-    'move': 'onMove',
-    'game_over': 'onGameOver',
-    'win': 'onWin',
-    'loss': 'onLoss',
-    'draw': 'onDraw',
-    'user_count': 'onUserCount'
-  },
-
-  initialize: function() {
-    if (TicTacToe.connection == null) {
-      TicTacToe.connection = new WebSocket('ws://192.168.0.2:8000/tictactoe');
-    };
-
-    TicTacToe.connection.onopen = this.join.bind(this);
-    TicTacToe.connection.onmessage = this.onMessage.bind(this);
-    TicTacToe.connection.onclose = this.onGameOver.bind(this);
-
-    this.setGameStats();
-  },
-
-  onMessage: function(event) {
-    var command = JSON.decode(event.data);
-
-    console.log('[RCV] ' + command.msg);
-
-    this[this.methodMap[command.msg]].call(this, command);
-  },
-
-  message: function(msg, options) {
-    var command = JSON.encode({msg: msg, data: options});
-
-    console.log('[SENT] ' + msg);
-
-    TicTacToe.connection.send(command);
-  },
-
-  setStatus: function(status) {
-    $('status').set('text', status);
-  },
-
-  setGameStats: function() {
-    $('game-stats').set('text', 'Wins: '+this.wins+' / Losses: '+this.wins+' / Draws: '+this.draws);
-  },
-
-  setUserCount: function(userCount) {
-    $('user-count').set('text', 'Number of players: ' + userCount);
-  },
-
-  join: function(event) {
-    this.message('join');
-
-    this.setStatus('Connecting you to a game...');
-  },
-
-  reset: function() {
-    $$('.cell').set('text', '');
-
-    this.join();
-  },
-
-  onQueued: function(command) {
-    this.setStatus('Waiting for another player...');
-  },
-
-  onStart: function(command) {
-    this.setStatus('Game found! Their turn first...');
-  },
-
-  onTurn: function(command) {
-    this.setStatus('Your turn...');
-  },
-
-  onMove: function(command) {
-    $('cell-'+command.data.x+'-'+command.data.y).set('text', command.key);
-
-    this.setStatus('Their turn...');
-  },
-
-  move: function(x, y) {
-    this.message('move', {x: x, y: y});
-  },
-
-  onGameOver: function(command) {
-    this.setStatus('Game over.');
-    this.setGameStats();
-    this.reset();
-  },
-
-  onWin: function(command) {
-    this.wins += 1;
-    this.setStatus('Game over. You win!');
-    this.setGameStats();
-  },
-
-  onLoss: function(command) {
-    this.losses += 1;
-    this.setStatus('Game over. You lose!');
-    this.setGameStats();
-  },
-
-  onDraw: function(command) {
-    this.draws += 1;
-    this.setStatus('Game over. It was a draw!');
-    this.setGameStats();
-  },
-
-  onUserCount: function(command) {
-    this.setUserCount(command.data);
-  }
-});
-
-$$('.cell').addEvent('click', function(event) {
-  try {
-    currentGame.move($(this).get('id').split('-')[1], $(this).get('id').split('-')[2]);
-  } catch(error) {
-    alert('Please wait while we connect you to a game...');
-  }
-});
-
-currentGame = new TicTacToe();

data/examples/tictactoe/tictactoe.rb

@@ -1,215 +0,0 @@
-$:.unshift File.dirname(__FILE__) + '/../../lib'
-
-require 'rubygems'
-require 'em-websocket-server'
-require 'json'
-require 'uuid'
-require 'pp'
-
-$games   = {}
-$waiting = nil
-$status  = nil
-
-class StatusChannel < EM::Channel
-
-	def initialize
-		super
-		@count = 0
-	end
-	
-	def increment
-		@count += 1
-		push @count
-	end
-	
-	def decrement
-		@count -= 1
-		push @count
-	end
-end
-
-class Game < EM::Channel
-
-	attr_accessor :id, :player1, :player2, :current, :matrix
-
-	
-
-	def initialize player1, player2
-		super()
-		@id 		= UUID.new
-		@player1 	= player1
-		@player2 	= player2
-		@matrix 	= (0..2).collect { [false, false, false] }
-	end
-	
-	def set_turn p
-		@current = p
-		@current.turn!
-	end
-	
-	def start!
-		@current = nil
-		@player1.start!
-		@player2.start!
-		toggle
-	end
-	
-	def move p, data
-		if @current == p
-			unless @matrix[data["x"].to_i][data["y"].to_i]
-				@matrix[data["x"].to_i][data["y"].to_i] = p.key
-			
-				@player1.send_move(p.key, data)
-				@player2.send_move(p.key, data)
-				
-				
-				winner  = has_winner?
-				full	= full?
-				
-				if winner || full
-					@player1.send_command("game_over")
-					@player2.send_command("game_over")
-					if winner
-						p.send_command("win")
-						opponent(p).send_command("loss")
-					else full?
-						@player1.send_command("draw")
-						@player2.send_command("draw")
-					end
-				else
-					toggle
-				end
-			end
-		end
-	end
-
-	def full?
-		@matrix.each do |row|
-			row.each do |col|
-				return false unless col
-			end
-		end
-		return true
-	end
-
-	def has_winner?
-		return true if @matrix[1][1] && (@matrix[0][0] == @matrix[1][1]) && (@matrix[1][1] == @matrix[2][2])
-		return true if @matrix[1][1] && (@matrix[0][2] == @matrix[1][1]) && (@matrix[1][1] == @matrix[2][0])
-		@matrix.each do |row|
-			return true if row[1] && (row[0] == row[1]) && (row[1] == row[2])
-		end
-		return false
-	end
-
-	def opponent p
-		@player1 == p ? @player2 : @player1
-	end
-
-	def toggle
-		set_turn(@current == @player1 ? @player2 : @player1)
-	end
-end
-
-class TickTackToeServer < WebSocketServer
-
-	attr_accessor :game_id, :key, :status_key
-	
-	def on_connect
-		@status_key = $status.subscribe do |c|
-			send_user_count c
-		end
-		$status.increment
-	end
-
-	def on_disconnect
-		$status.unsubscribe @status_key
-		$status.decrement
-		delete_game!
-	end
-
-	def on_receive data
-
-		begin
-			msg = JSON.parse(data)
-		rescue
-			send_command "error"
-			return
-		end
-
-		case msg["msg"]
-		when "join"
-			if $waiting.empty?
-				$waiting.push(self)
-				send_command "queued"
-			else
-				$waiting.pop do |opponent|
-					game = Game.new(self, opponent)
-					self.key = "X"
-					opponent.key = "O"
-					self.game_id = opponent.game_id = game.id
-					game.start!
-					$games[game_id] = game
-				end
-			end
-		when "move"
-			if game
-				game.move self, msg["data"]
-				
-			else
-				log "Cannot move on a nil game!"
-			end
-		end
-	end
-
-	def delete_game!
-		if $games.key?(game_id)
-			$games.delete(game_id)
-		end
-	end
-	
-	def game
-		$games[game_id]
-	end
-
-	def turn!
-		send_command "turn"
-	end
-
-	def game_over!
-		delete_game!
-		send_command "game_over"
-	end
-	
-	def start!
-		send_command "start"
-	end
-	
-	def send_move key, data
-		send_message({:msg => "move", :key => key, :data => data}.to_json)
-	end
-
-	def send_command cmd
-		send_message({:msg => cmd}.to_json)
-	end
-	
-	def send_user_count count
-		send_message({:msg => :user_count, :data => count}.to_json)
-	end
-	
-	
-	def send_message msg
-		super msg
-		puts "Sent: #{msg}"
-	end
-end
-
-
-EM.epoll
-EM.set_descriptor_table_size(10240)
-
-EM.run do
-	$waiting  = EM::Queue.new
-	$status = StatusChannel.new
-
-	EM.start_server "0.0.0.0", 8000, TickTackToeServer
-end

data/examples/timesync.html

@@ -1,29 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<title>em-websocket-server test</title>
-</head>
-<body>
-
-<h1>em-websocket-server timesync demo</h1>
-<h2 id="time">opening socket</h2>
-
-<script>
-	var webSocket = new WebSocket('ws://192.168.0.2:8000/time');
-	
-	webSocket.onopen = function(event){
-		document.getElementById('time').innerHTML = 'waiting for socket';
-	};
-	
-	webSocket.onmessage = function(event){
-		var object = JSON.parse(event.data);
-		document.getElementById('time').innerHTML = object.time;
-	};
-	
-	webSocket.onclose = function(event){
-		document.getElementById('time').innerHTML = 'socket closed';
-	};
-</script>
-
-</body>
-</html>

data/examples/timesync.rb

@@ -1,35 +0,0 @@
-$:.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'rubygems'
-require 'em-websocket-server'
-require 'json'
-
-class TimeServer < WebSocketServer
-
-	def on_connect
-		@timer = EM.add_periodic_timer(5) do
-			sync_time
-		end
-	end
-
-	def on_disconnect
-		@timer
-	end
-
-	def on_receive msg
-		puts "msg rcv"
-	end
-
-	def sync_time
-		send_message({ :time => Time.now }.to_json)
-	end
-
-end
-
-
-EM.epoll
-EM.set_descriptor_table_size(10240)
-
-EM.run do
-	EM.start_server "0.0.0.0", 8000, TimeServer
-end

data/lib/em-websocket-server.rb

@@ -1,158 +0,0 @@
-require 'rubygems'
-require 'eventmachine'
-
-class WebSocketServer < EM::Connection
-
-	@@logger			= nil
-	@@num_connections	= 0
-	@@path_regex 		= /^GET (\/[^\s]*) HTTP\/1\.1$/
-	@@header_regex 		= /^([^:]+):\s*([^$]+)/
-	@@callbacks 		= {}
-	@@accepted_origins	= []
-
-	attr_accessor	:connected,
-					:headers,
-					:path
-
-	def initialize *args
-		super
-		@connected = false
-	end
-
-	def valid_origin?
-		@@accepted_origins.empty? || @@accepted_origins.include?(origin)
-	end
-
-	#not doing anything with this yet
-	def valid_path?
-		true
-	end
-
-	def valid_upgrade?
-		@headers["Upgrade"] =~ /websocket/i
-	end
-
-	def origin
-		@headers["Origin"]
-	end
-
-	def host
-		@headers["Host"]
-	end
-
-	def self.path name, &block
-		@@callbacks[name] = block
-	end
-
-	#tcp connection established
-	def post_init
-		@@num_connections += 1
-	end
-
-	#must be public for em
-	def unbind
-		@@num_connections -= 1
-		on_disconnect
-	end
-
-	# Frames need to start with 0x00-0x7f byte and end with 
-	# an 0xFF byte.  Per spec, we can also set the first
-	# byte to a value betweent 0x80 and 0xFF, followed by
-	# a leading length indicator.  No support yet
-	def send_message msg
-		send_data "\x00#{msg}\xff"
-	end
-
-	protected
-
-	#override this method
-	def on_receive msg
-		log msg
-	end
-
-	#override this method
-	def on_connect
-		log "connected"
-	end
-
-	#override this method
-	def on_disconnect
-		log "disconnected"
-	end
-
-	def log msg
-		if @@logger
-			@@logger.info msg
-		else
-			puts msg
-		end
-	end
-
-	private
-
-	# when the connection receives data from the client
-	# we either handshake, accept the start command
-	# or handle the message at the app layer
-	def receive_data data
-		unless @connected
-			handshake data
-		else
-			on_receive data.gsub(/^(\x00)|(\xff)$/, "")
-		end
-	end
-
-	# parse the headers, validate the origin and path
-	# and respond with appropiate headers for a 
-	# healthy relationship with the client
-	def handshake data
-
-		#convert the headers to a hash
-		parse_headers data
-
-		# close the connection if the connection
-		# originates from an invalid source
-		close_connection unless valid_origin?
-
-		# close the connection if a callback
-		# is not registered for the path
-		close_connection unless valid_path?
-
-		# don't respond to non-websocket HTTP requests
-		close_connection unless valid_upgrade?
-
-		#complete the handshake
-		send_headers
-
-		@connected = true
-		
-		on_connect
-	end
-
-	# send the handshake response headers to
-	# complete the initial com
-	def send_headers
-
-		response = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n"
-		response << "Upgrade: WebSocket\r\n"
-		response << "Connection: Upgrade\r\n"
-		response << "WebSocket-Origin: #{origin}\r\n"
-		response << "WebSocket-Location: ws://#{host}#{path}\r\n\r\n"
-
-		send_data response
-	end
-
-	# turn http style headers into a ruby hash
-	# TODO: this is probably not done "well"
-	def parse_headers data
-		lines = data.split("\r\n")
-
-		@path 	 = @@path_regex.match(lines.shift)[1]
-		@headers = {}
-
-		lines.each do |line|
-			kvp = @@header_regex.match(line)
-			@headers[kvp[1].strip] = kvp[2].strip
-		end
-	end
-
-end