Skip to content

Commit

Permalink
Fix Server
Browse files Browse the repository at this point in the history
  • Loading branch information
realshouzy committed May 16, 2024
1 parent 865d87f commit 7741268
Showing 1 changed file with 22 additions and 16 deletions.
38 changes: 22 additions & 16 deletions nrw/network/_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,19 @@ def send(self, message: str) -> None:
def client_ip(self) -> str | None:
if self._client_socket is None:
return None
return self._client_socket.getpeername()[0] # type: ignore[no-any-return]
try:
return self._client_socket.getpeername()[0] # type: ignore[no-any-return]
except OSError:
return None

@property
def client_port(self) -> int:
if self._client_socket is None:
return 0
return self._client_socket.getpeername()[1] # type: ignore[no-any-return]
try:
return self._client_socket.getpeername()[1] # type: ignore[no-any-return]
except OSError:
return 0

def close(self) -> None:
if self._client_socket is not None:
Expand Down Expand Up @@ -140,22 +146,22 @@ def run(self) -> None:
message = self._socket_wrapper.receive()
client_ip: str | None = self._socket_wrapper.client_ip
client_port: int = self._socket_wrapper.client_port
if message is not None:
try:
try:
if message is not None:
self._server.process_message(client_ip, client_port, message)
except ReferenceError:
self.close()
else:
message_handler: _ClientMessageHandler | None = (
self._server._find_client_message_handler(
client_ip,
client_port,
else:
message_handler: _ClientMessageHandler | None = (
self._server._find_client_message_handler(
client_ip,
client_port,
)
)
)
if message_handler is not None:
message_handler.close()
self._server._remove_client_message_handler(message_handler)
self._server.process_closing_connection(client_ip, client_port)
if message_handler is not None:
message_handler.close()
self._server._remove_client_message_handler(message_handler)
self._server.process_closing_connection(client_ip, client_port)
except ReferenceError:
self.close()

def send(self, message: str) -> None:
if self._active:
Expand Down

0 comments on commit 7741268

Please sign in to comment.