Merge branch 'duskCoder-master'

Author: Pithikos

websocket_server/websocket_server.py

@@ -38,9 +38,12 @@
 PAYLOAD_LEN_EXT16 = 0x7e
 PAYLOAD_LEN_EXT64 = 0x7f
 
-OPCODE_TEXT = 0x01
-CLOSE_CONN  = 0x8
-
+OPCODE_CONTINUATION = 0x0
+OPCODE_TEXT         = 0x1
+OPCODE_BINARY       = 0x2
+OPCODE_CLOSE_CONN   = 0x8
+OPCODE_PING         = 0x9
+OPCODE_PONG         = 0xA
 
 # ------------------------------ Logging -------------------------------
 logger = logging.getLogger(__name__)
@@ -102,6 +105,12 @@ def __init__(self, port, host='127.0.0.1'):
 	def _message_received_(self, handler, msg):
 		self.message_received(self.handler_to_client(handler), self, msg)
 
+	def _ping_received_(self, handler, msg):
+		handler.send_pong(msg)
+
+	def _pong_received_(self, handler, msg):
+		pass
+
 	def _new_client_(self, handler):
 		self.id_counter += 1
 		client={
@@ -174,12 +183,28 @@ def read_next_message(self):
 			logger.info("Client closed connection.")
 			self.keep_alive = 0
 			return
-		if opcode == CLOSE_CONN:
+		if opcode == OPCODE_CLOSE_CONN:
 			logger.info("Client asked to close connection.")
 			self.keep_alive = 0
 			return
 		if not masked:
-			logger.info("Client must always be masked.")
+			logger.warn("Client must always be masked.")
+			self.keep_alive = 0
+			return
+		if opcode == OPCODE_CONTINUATION:
+			logger.warn("Continuation frames are not supported.")
+			return
+		elif opcode == OPCODE_BINARY:
+			logger.warn("Binary frames are not supported.")
+			return
+		elif opcode == OPCODE_TEXT:
+			opcode_handler = self.server._message_received_
+		elif opcode == OPCODE_PING:
+			opcode_handler = self.server._ping_received_
+		elif opcode == OPCODE_PONG:
+			opcode_handler = self.server._pong_received_
+		else:
+			logger.warn("Unknown opcode %#x." + opcode)
 			self.keep_alive = 0
 			return
 
@@ -193,12 +218,15 @@ def read_next_message(self):
 		for char in self.read_bytes(payload_length):
 			char ^= masks[len(decoded) % 4]
 			decoded += chr(char)
-		self.server._message_received_(self, decoded)
+		opcode_handler(self, decoded)
 
 	def send_message(self, message):
 		self.send_text(message)
 
-	def send_text(self, message):
+	def send_pong(self, message):
+		self.send_text(message, OPCODE_PONG)
+
+	def send_text(self, message, opcode=OPCODE_TEXT):
 		'''
 		NOTES
 		Fragmented(=continuation) messages are not being used since their usage
@@ -223,18 +251,18 @@ def send_text(self, message):
 
 		# Normal payload
 		if payload_length <= 125:
-			header.append(FIN | OPCODE_TEXT)
+			header.append(FIN | opcode)
 			header.append(payload_length)
 
 		# Extended payload
 		elif payload_length >= 126 and payload_length <= 65535:
-			header.append(FIN | OPCODE_TEXT)
+			header.append(FIN | opcode)
 			header.append(PAYLOAD_LEN_EXT16)
 			header.extend(struct.pack(">H", payload_length))
 
 		# Huge extended payload
 		elif payload_length < 18446744073709551616:
-			header.append(FIN | OPCODE_TEXT)
+			header.append(FIN | opcode)
 			header.append(PAYLOAD_LEN_EXT64)
 			header.extend(struct.pack(">Q", payload_length))