reorganizing oserver.py into proper folder, creating client class for organization and clarity

server/handler.py

@@ -0,0 +1,120 @@
+import json
+import logging
+import random
+import socket
+import time
+import traceback
+import uuid
+from typing import Any, List
+
+import constants
+import helpers
+
+logger = logging.getLogger('handler')
+
+
+class Client:
+    def __init__(self, conn: socket.socket, address: Any, all_clients: List['Client']):
+        self.conn, self.address = conn, address
+        self.all_clients = all_clients
+
+        self.id = str(uuid.uuid4())
+        self.nickname = self.id[:8]
+        self.color = random.choice(constants.Colors.ALL)
+
+        self.first_seen = time.time()
+        self.last_nickname_change = None
+        self.last_message_sent = None
+
+    def request_nickname(self) -> None:
+        """Send a request for the client's nickname information."""
+        self.conn.send(helpers.prepare_request(constants.Requests.REQUEST_NICK))
+
+    def receive_message(self) -> Any:
+        length = int(self.conn.recv(constants.HEADER_LENGTH).decode('utf-8'))
+        logger.debug(f'Header received - Length {length}')
+        message = json.loads(self.conn.recv(length).decode('utf-8'))
+        logger.info(f'Data received/parsed, type: {message["type"]}')
+        return message
+
+    def send(self, message: bytes) -> None:
+        """Sends a pre-encoded message to this client."""
+        self.conn.send(message)
+
+    def send_message(self, message: str) -> None:
+        """Sends a string message as the server to this client."""
+        self.conn.send(helpers.prepare_server_message(
+            nickname='Server', message=message, color=constants.Colors.BLACK
+        ))
+
+    def broadcast_message(self, message: str) -> None:
+        """Sends a string message to all connected clients as the Server."""
+        prepared = helpers.prepare_server_message(
+            nickname='Server', message=message, color=constants.Colors.BLACK
+        )
+        for client in self.all_clients:
+            client.send(prepared)
+
+    def broadcast(self, message: bytes) -> None:
+        """Sends a pre-encoded message to all connected clients"""
+        for client in self.all_clients:
+            client.send(message)
+
+    def handle(self) -> None:
+        while True:
+            try:
+                data = self.receive_message()
+
+                if data['type'] == constants.Types.REQUEST:
+                    if data['request'] == constants.Requests.REFRESH_CONNECTIONS_LIST:
+                        self.conn.send(helpers.prepare_json(
+                            {
+                                'type': constants.Types.USER_LIST,
+                                'users': [
+                                    {
+                                        'nickname': other.nickname,
+                                        'color': other.color
+                                    } for other in self.all_clients
+                                ]
+                            }
+                        ))
+                elif data['type'] == constants.Types.NICKNAME:
+                    nickname = data['nickname']
+                    if self.last_nickname_change is None:
+                        logger.info("Nickname is {}".format(nickname))
+                        self.broadcast(helpers.prepare_server_message(
+                            nickname='Server',
+                            message=f'{nickname} joined!',
+                            color=constants.Colors.BLACK
+                        ))
+                        self.last_nickname_change = time.time()
+                    else:
+                        logger.info(f'{self.nickname} changed their name to {nickname}')
+                    self.nickname = nickname
+                elif data['type'] == constants.Types.MESSAGE:
+                    self.broadcast(helpers.prepare_server_message(
+                        nickname=self.nickname,
+                        message=data['content'],
+                        color=self.color
+                    ))
+
+                    # Basic command processing
+                    if data['content'] == '/reroll':
+                        color = random.choice(constants.Colors.ALL)
+                        colorName = constants.Colors.ALL_NAMES[constants.Colors.ALL.index(color)]
+                        self.color = color
+                        self.broadcast(helpers.prepare_server_message(
+                            nickname='Server',
+                            message=f'Changed your color to {colorName} ({color})',
+                            color=constants.Colors.BLACK
+                        ))
+            except:
+                traceback.print_exc()
+                logger.info(f'Client {self.id} closed. ({self.nickname})')
+                self.conn.close()
+                self.broadcast(helpers.prepare_server_message(
+                    nickname='Server',
+                    message=f'{self.nickname} left!',
+                    color=constants.Colors.BLACK
+                ))
+                break