64b0967292
Fix abstract renderer signatures and add small stubs so type checkers can
see expected attributes (e.g. username, _decrypt). This removes several
mypy false-positives that were caused by mixin/ABC mismatches.
Preserve message text containing ':' by using split(':', 1) in both
DefaultClientRenderer and RichClientRenderer.
Normalize renderer APIs: print_chat(...) now takes the response mapping
and returns None (matches runtime behavior).
Make RSA symmetric-key request more robust: read r.content instead of a
fixed-size r.raw.read(999), avoiding truncated key material.
Improve _connect_ws exception handling in client to ensure a valid
Exception is re-raised if connection attempts fail.
Correct server/service typing: memory_msgs is now typed as
list[Message] and we null-check incoming payload text before creating a
new Message.
Replace manual package list in setup.py with setuptools.find_packages()
so packaging uses valid Python package names.
Installed types-requests in the project venv so mypy no longer flags the
requests import.
Verification: ran python -m compileall and mypy cmd_chat — no issues
remain.
Notes:
Wire format still uses Python literal evaluation in some places (existing
behavior); switching to JSON for client/server payloads is recommended as a
follow-up for robustness and security.
78 lines
2.5 KiB
Python
78 lines
2.5 KiB
Python
import os
|
|
import platform
|
|
|
|
from rich.text import Text
|
|
from rich.style import Style
|
|
from rich.console import Console
|
|
|
|
from rich.table import Table
|
|
from cmd_chat.client.core.abs.abs_renderer import ClientRenderer
|
|
from cmd_chat.client.config import MESSAGES_TO_SHOW
|
|
|
|
|
|
console = Console(width=75)
|
|
|
|
|
|
class RichClientRenderer(ClientRenderer):
|
|
|
|
def __get_os(self) -> str:
|
|
""" checking what kind of platform you need
|
|
"""
|
|
if "Linux" in str(platform.platform()):
|
|
return "Linux"
|
|
return "Windows"
|
|
|
|
def print_message(self, message: str) -> Text:
|
|
""" generating string with message in required format
|
|
"""
|
|
# split only on the first ':' so message bodies containing ':' are preserved
|
|
parts = message.split(":", 1)
|
|
if parts[0] == self.username:
|
|
return \
|
|
Text(text=parts[0], style="bold") + \
|
|
Text(text=": ", style="bold") + \
|
|
Text(text=parts[1], style="underline")
|
|
return \
|
|
Text(text=parts[0], style="bold") + \
|
|
Text(text=": ", style="bold") + \
|
|
Text(text=parts[1], style="underline")
|
|
|
|
def clear_console(self):
|
|
# For windows clear command its cls
|
|
# For linux clear command its clear
|
|
if self.__get_os() == "Linux":
|
|
os.system("clear")
|
|
else:
|
|
os.system("cls")
|
|
|
|
def print_ip(
|
|
self,
|
|
ip: str
|
|
) -> str:
|
|
return ip
|
|
|
|
def print_username(
|
|
self,
|
|
username: str
|
|
) -> str:
|
|
return username
|
|
|
|
def print_chat(self, response) -> None:
|
|
self.clear_console()
|
|
for i, msg in enumerate(response["messages"][-MESSAGES_TO_SHOW:]):
|
|
actual_message = self._decrypt(msg)
|
|
if i == 0:
|
|
console.print("Users in chat:", justify="left")
|
|
table = Table(show_header=True, header_style="bold magenta")
|
|
table.add_column("IP", style="dim", width=12)
|
|
table.add_column("USERNAME")
|
|
for user in response["users_in_chat"]:
|
|
table.add_row(
|
|
self.print_ip(user.split(',')[0]),
|
|
self.print_username(user.split(",")[1])
|
|
)
|
|
console.print(table)
|
|
console.print("Write 'q' to quit from chat", justify="left")
|
|
console.print(f"\n{self.print_message(actual_message)}")
|
|
else:
|
|
console.print(f"{self.print_message(actual_message)}") |