Compare commits
43 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9c1aee6bba | ||
| 7a4e062c04 | |||
| ddb55dc462 | |||
|
38d663a501
|
|||
|
bc62dbed66
|
|||
|
a28c724145
|
|||
|
54d2ba0083
|
|||
|
5458281186
|
|||
|
99e94e2f5a
|
|||
|
fcaa7dae70
|
|||
|
00d1d869d5
|
|||
|
3a46ed197a
|
|||
|
53912ed339
|
|||
|
8646388851
|
|||
|
b8333b6408
|
|||
| ae69e9e956 | |||
|
431d8bb3bb
|
|||
|
a00668ecf3
|
|||
|
9b077c8c48
|
|||
|
7ce32855c4
|
|||
|
b887525cf1
|
|||
|
3512608dd1
|
|||
|
5261ad8e9f
|
|||
|
b7562703dd
|
|||
|
cf78a4b05b
|
|||
|
3c86a5fefd
|
|||
|
014c4296e0
|
|||
|
1182e089bc
|
|||
|
cc1145a4ac
|
|||
|
21bc86fa8a
|
|||
|
b9d0fd92a6
|
|||
|
35b3af31be
|
|||
|
|
e54996937b | ||
| f407d5c2ba | |||
|
9d751b4fac
|
|||
|
bce62f6973
|
|||
|
6953922b3b
|
|||
|
c63b7f9f4d
|
|||
|
30b2305dd1
|
|||
|
a25908bf46
|
|||
|
8d06775c27
|
|||
|
5d5dbd371f
|
|||
|
6efc7754f9
|
77
CHANGELOG.md
77
CHANGELOG.md
@@ -2,6 +2,83 @@
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
## [0.3.0] - 2025-11-30
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- [`431d8bb`](https://gitea.pufereq.pl/judas/judas_client/commit/431d8bb3bb5171a4d12ea306bfc767776bf6fb2a) **__main__.py**: fix wrong import
|
||||
- [`a00668e`](https://gitea.pufereq.pl/judas/judas_client/commit/a00668ecf3e99cf0453a7c333de4f6ab57cbcac3) **client.py**: fix wrong import
|
||||
- [`b756270`](https://gitea.pufereq.pl/judas/judas_client/commit/b7562703ddc82456859cb72da59e74b4bddf2dc9) **connector.py**: handle multiple messages in one packet
|
||||
|
||||
### Documentation
|
||||
|
||||
- [`3a46ed1`](https://gitea.pufereq.pl/judas/judas_client/commit/3a46ed197a1e700cf4cd66ec3accd96431873772) **connector.py**: add docstrings
|
||||
|
||||
### Features
|
||||
|
||||
- [`bc62dbe`](https://gitea.pufereq.pl/judas/judas_client/commit/bc62dbed66b08990a9aca790a831b07d8b5afcdb) **connector.py**: handle `self.selector.unregister` exceptions in `Connector.close()`
|
||||
- [`54d2ba0`](https://gitea.pufereq.pl/judas/judas_client/commit/54d2ba0083194ba2d6ea2df07372050f03d8182f) **connector.py**: add `pending_acks` and handle inbound/outbound ACKs
|
||||
- [`5458281`](https://gitea.pufereq.pl/judas/judas_client/commit/54582811864da1df0526763ef74b79544c695d01) **connector.py**: add `Connector.send()` method
|
||||
- [`99e94e2`](https://gitea.pufereq.pl/judas/judas_client/commit/99e94e2f5a3e89396e0a1140665edc1ba48cb0f2) **connector.py**: add `Connector.running` attribute
|
||||
- [`b887525`](https://gitea.pufereq.pl/judas/judas_client/commit/b887525cf1f6295b41c92dc8415d73c70b51a667) **__init__.py**: import `Client` and `Connector`
|
||||
- [`5261ad8`](https://gitea.pufereq.pl/judas/judas_client/commit/5261ad8e9fe6a07033395e6936713b48c29ae30c) **connector.py**: call `on_message()` on receive
|
||||
- [`3c86a5f`](https://gitea.pufereq.pl/judas/judas_client/commit/3c86a5fefd04ae03cc1503aa552cb3b5e846017b) **connector.py**: add `on_message` handler function argument to init
|
||||
- [`cc1145a`](https://gitea.pufereq.pl/judas/judas_client/commit/cc1145a4acb9b96e75e327d0060706f5f7f871ac) **connector.py**: get mac address from init argument
|
||||
- [`21bc86f`](https://gitea.pufereq.pl/judas/judas_client/commit/21bc86fa8aab7e2fae1b966ee8b831187e7e24e2) **client.py**: add `Client` class
|
||||
|
||||
### Miscellaneous Tasks
|
||||
|
||||
- [`3512608`](https://gitea.pufereq.pl/judas/judas_client/commit/3512608dd19480499e7e03592db6af88c1866e65) **connector.py**: reduce loop interval to 0.1 s in `_loop()`
|
||||
- [`cf78a4b`](https://gitea.pufereq.pl/judas/judas_client/commit/cf78a4b05b356fda9d31d31002af69143f5121d4) **connector.py**: clarify debug message for connector loop
|
||||
|
||||
### Refactor
|
||||
|
||||
- [`53912ed`](https://gitea.pufereq.pl/judas/judas_client/commit/53912ed3394b0b1909f15976bd149b3a023c210c) **connector.py**: rewrite `Connector` to use selectors
|
||||
- [`b8333b6`](https://gitea.pufereq.pl/judas/judas_client/commit/b8333b64088916dbef6c965566b0c3e38741e634) **connector.py**: avoid recursion in `connect()`
|
||||
- [`7ce3285`](https://gitea.pufereq.pl/judas/judas_client/commit/7ce32855c49435f31b0c82c7690754ae668f8709) **__main__.py**: use `Client`
|
||||
- [`014c429`](https://gitea.pufereq.pl/judas/judas_client/commit/014c4296e0cd91f0920d83e2f0993ba87166a118) **connector.py**: remove unused `Connector._get_mac_address()` method
|
||||
- [`1182e08`](https://gitea.pufereq.pl/judas/judas_client/commit/1182e089bcd74c1811faac2d6514832ba037ab42) **connector.py**: make `connect_timeout` and `ack_timeout` keyword-only
|
||||
- [`35b3af3`](https://gitea.pufereq.pl/judas/judas_client/commit/35b3af31bef60fda7549d229fa818a2a5b607e7d) **connector.py**: fix typing of `Connector.ack_timeout`
|
||||
|
||||
### Revert
|
||||
|
||||
- [`9b077c8`](https://gitea.pufereq.pl/judas/judas_client/commit/9b077c8c4868e7ef020cb2b25203b04b3fb42554) "feat(__init__.py): import `Client` and `Connector`"
|
||||
|
||||
### Styling
|
||||
|
||||
- [`38d663a`](https://gitea.pufereq.pl/judas/judas_client/commit/38d663a50178523304df0c0eff0714aef5066c74) **connector.py**: add typing to variables
|
||||
- [`a28c724`](https://gitea.pufereq.pl/judas/judas_client/commit/a28c724145534982d56b2d4b47b429af9f7eb275) **connector.py**: add blank line
|
||||
|
||||
### Build
|
||||
|
||||
- [`fcaa7da`](https://gitea.pufereq.pl/judas/judas_client/commit/fcaa7dae70abe1139ac9e7f5d1d9e7947c0814e3) **uv.lock**: update judas_protocol to 0.5.0
|
||||
- [`00d1d86`](https://gitea.pufereq.pl/judas/judas_client/commit/00d1d869d59e4bf5014a0c2baa5c0d9e3cc0fef5) **uv.lock**: update judas_protocol to 0.4.3
|
||||
- [`8646388`](https://gitea.pufereq.pl/judas/judas_client/commit/8646388851c0276616610550326e81ea9974f579) **uv.lock**: update judas_protocol to 0.3.0
|
||||
- [`b9d0fd9`](https://gitea.pufereq.pl/judas/judas_client/commit/b9d0fd92a65bd88c5069fd5e5961b1b968ab7039) **uv.lock**: update judas_protocol to 0.2.0
|
||||
|
||||
## [0.2.0] - 2025-09-19
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
- [`30b2305`](https://gitea.pufereq.pl/judas/judas_client/commit/30b2305dd1c988bfd6c7b38d125a6382bc75c84b) **connector.py**: fix hanging ACK double check in `send_hello()`
|
||||
- [`6efc775`](https://gitea.pufereq.pl/judas/judas_client/commit/6efc7754f998e3b27e7dda736c8f1a5fafe55d1d) **connector.py**: avoid recursion on failure in `send()`
|
||||
|
||||
### Features
|
||||
|
||||
- [`8d06775`](https://gitea.pufereq.pl/judas/judas_client/commit/8d06775c276089667d9bcdf679e89d9063834036) **connector.py**: add `no_check_ack` arg to `send()`
|
||||
- [`5d5dbd3`](https://gitea.pufereq.pl/judas/judas_client/commit/5d5dbd371f60f6049a3abb397a8254a9e72305bc) **connector.py**: ensure sent data is ACK'd in `send()`
|
||||
|
||||
### Styling
|
||||
|
||||
- [`bce62f6`](https://gitea.pufereq.pl/judas/judas_client/commit/bce62f6973aa357e308d976e52c3000c3070d608) **connector.py**: order imports
|
||||
- [`6953922`](https://gitea.pufereq.pl/judas/judas_client/commit/6953922b3b5f8f7f5013b820d0a0c4e5ff4c6b8d) **__main__.py**: order imports
|
||||
- [`a25908b`](https://gitea.pufereq.pl/judas/judas_client/commit/a25908bf46aa47446cc9354bf1c60f23a3f01cea) **connector.py**: add empty line for clarity
|
||||
|
||||
### Build
|
||||
|
||||
- [`9d751b4`](https://gitea.pufereq.pl/judas/judas_client/commit/9d751b4fac67940240fdf429ec05ed50d6f63266) add ruff lint depedency
|
||||
- [`c63b7f9`](https://gitea.pufereq.pl/judas/judas_client/commit/c63b7f9f4d7e69abdcd574e08a49831013cbe551) add isort lint depedency
|
||||
|
||||
## [0.1.0] - 2025-08-28
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
@@ -4,7 +4,7 @@ build-backend = "uv_build"
|
||||
|
||||
[project]
|
||||
name = "judas_client"
|
||||
version = "0.1.0"
|
||||
version = "0.3.0"
|
||||
description = "A client for judas, a remote PC fleet management system."
|
||||
readme = "README.md"
|
||||
authors = []
|
||||
@@ -16,6 +16,10 @@ license = { text = "GPL-3.0+" }
|
||||
|
||||
[dependency-groups]
|
||||
bump = ["git-cliff>=2.9.1", "python-semantic-release>=10.2.0"]
|
||||
lint = [
|
||||
"isort>=6.0.1",
|
||||
"ruff>=0.13.1",
|
||||
]
|
||||
test = [
|
||||
"pytest>=4.2.1",
|
||||
"pytest-cov>=6.2.1",
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
from __future__ import annotations
|
||||
|
||||
|
||||
import logging as lg
|
||||
|
||||
from judas_client.connector import Connector
|
||||
from judas_client.client import Client
|
||||
|
||||
if __name__ == "__main__":
|
||||
lg.basicConfig(
|
||||
@@ -13,5 +12,5 @@ if __name__ == "__main__":
|
||||
)
|
||||
logger = lg.getLogger(__name__)
|
||||
|
||||
connector = Connector("127.0.0.1", 3692)
|
||||
connector.run()
|
||||
client = Client(server_host="localhost", server_port=3692)
|
||||
client.run()
|
||||
|
||||
67
src/judas_client/client.py
Normal file
67
src/judas_client/client.py
Normal file
@@ -0,0 +1,67 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""Client module for handling messages."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging as lg
|
||||
import uuid
|
||||
|
||||
from judas_protocol import Message
|
||||
|
||||
from judas_client.connector import Connector
|
||||
|
||||
|
||||
class Client:
|
||||
"""Client class for handling messages."""
|
||||
|
||||
def __init__(self, server_host: str, server_port: int) -> None:
|
||||
"""Initialize the Client.
|
||||
|
||||
Args:
|
||||
server_host (str): The server host address.
|
||||
server_port (int): The server port number.
|
||||
"""
|
||||
self.logger: lg.Logger = lg.getLogger(
|
||||
f"{__name__}.{self.__class__.__name__}"
|
||||
)
|
||||
self.logger.debug("Initializing Client...")
|
||||
|
||||
self.server_host: str = server_host
|
||||
self.server_port: int = server_port
|
||||
|
||||
self.mac_address: str = self._get_mac_address()
|
||||
self.logger.debug(f"MAC address: {self.mac_address}")
|
||||
|
||||
self.connector: Connector = Connector(
|
||||
mac_address=self.mac_address,
|
||||
host=self.server_host,
|
||||
port=self.server_port,
|
||||
on_message=self.handle_message,
|
||||
)
|
||||
|
||||
def _get_mac_address(self) -> str:
|
||||
"""Get the MAC address of the client.
|
||||
|
||||
Returns:
|
||||
str: The MAC address in standard lowercase format (e.g., "0a:1b:2c:3d:4e:5f").
|
||||
"""
|
||||
mac_address: str = ":".join(
|
||||
[
|
||||
"{:02x}".format((uuid.getnode() >> ele) & 0xFF)
|
||||
for ele in range(0, 8 * 6, 8)
|
||||
][::-1]
|
||||
)
|
||||
return mac_address
|
||||
|
||||
def handle_message(self, message: Message) -> None:
|
||||
"""Handle incoming messages.
|
||||
|
||||
Args:
|
||||
message (Message): The incoming message to handle.
|
||||
"""
|
||||
self.logger.info(f"[v] Received message: {message}")
|
||||
|
||||
def run(self) -> None:
|
||||
"""Run the client."""
|
||||
self.logger.info(f"Starting Client ({self.mac_address})...")
|
||||
self.connector.run()
|
||||
@@ -2,22 +2,33 @@
|
||||
from __future__ import annotations
|
||||
|
||||
import logging as lg
|
||||
|
||||
import selectors
|
||||
import socket
|
||||
import uuid
|
||||
import time
|
||||
from typing import Callable
|
||||
|
||||
from judas_protocol import Message
|
||||
from judas_protocol import Category, ControlAction, Message
|
||||
|
||||
|
||||
class Connector:
|
||||
"""Connector class for managing TCP connection and message exchange."""
|
||||
|
||||
def __init__(
|
||||
self,
|
||||
mac_address: str,
|
||||
host: str,
|
||||
port: int,
|
||||
connect_timeout: float = 5.0,
|
||||
ack_timeout: float = None,
|
||||
*,
|
||||
on_message: Callable[[Message], None],
|
||||
) -> None:
|
||||
"""Initialize the Connector.
|
||||
|
||||
Args:
|
||||
mac_address (str): The MAC address of the client.
|
||||
host (str): The server host address.
|
||||
port (int): The server port number.
|
||||
on_message (Callable[[Message], None]): Callback for handling incoming messages.
|
||||
"""
|
||||
self.logger: lg.Logger = lg.getLogger(
|
||||
f"{__name__}.{self.__class__.__name__}"
|
||||
)
|
||||
@@ -25,152 +36,170 @@ class Connector:
|
||||
|
||||
self.host: str = host
|
||||
self.port: int = port
|
||||
self.socket_timeout: None = None
|
||||
self.connect_timeout: float = connect_timeout
|
||||
self.ack_timeout: float = ack_timeout
|
||||
|
||||
self.selector = selectors.DefaultSelector()
|
||||
self.socket: socket.socket = socket.socket(
|
||||
socket.AF_INET, socket.SOCK_STREAM
|
||||
)
|
||||
self.socket.setblocking(False)
|
||||
|
||||
self.mac_address: str = self._get_mac_address()
|
||||
|
||||
def _get_mac_address(self) -> str:
|
||||
mac_address: str = ":".join(
|
||||
[
|
||||
"{:02x}".format((uuid.getnode() >> ele) & 0xFF)
|
||||
for ele in range(0, 8 * 6, 8)
|
||||
][::-1]
|
||||
self.selector.register(
|
||||
self.socket,
|
||||
selectors.EVENT_READ | selectors.EVENT_WRITE,
|
||||
data=None,
|
||||
)
|
||||
self.logger.debug(f"MAC address: {mac_address}")
|
||||
return mac_address
|
||||
|
||||
def _send_ack(self) -> None:
|
||||
self.logger.debug("[>] Sending ACK...")
|
||||
try:
|
||||
self.socket.sendall(Message.ack().to_bytes())
|
||||
self.logger.debug("[<] ACK sent")
|
||||
except socket.error as e:
|
||||
self.logger.error(f"[!] Failed to send ACK: {e}")
|
||||
self.mac_address: str = mac_address
|
||||
|
||||
def _check_ack(self) -> bool:
|
||||
self.logger.debug("[.] Waiting for ACK...")
|
||||
try:
|
||||
self.socket.settimeout(self.ack_timeout)
|
||||
ack: bytes = self.socket.recv(1024)
|
||||
self.socket.settimeout(self.socket_timeout)
|
||||
self.inbound_buffer: bytes = b""
|
||||
self.outbound_buffer: bytes = b""
|
||||
|
||||
if ack == Message.ack().to_bytes():
|
||||
self.logger.debug("[<] ACK received")
|
||||
return True
|
||||
else:
|
||||
self.logger.error(f"[!] Invalid ACK received: {ack}")
|
||||
self.pending_acks: dict[str, tuple[Message, float]] = {}
|
||||
|
||||
except TimeoutError as e:
|
||||
self.logger.error(f"[!] ACK timeout: {e}")
|
||||
self.running: bool = True
|
||||
|
||||
except socket.error as e:
|
||||
self.logger.error(f"[!] Failed to receive ACK: {e}")
|
||||
self.on_message: Callable[[Message], None] = on_message
|
||||
|
||||
return False
|
||||
def _send_outbound(self) -> None:
|
||||
"""Send data from the outbound buffer."""
|
||||
while self.outbound_buffer:
|
||||
try:
|
||||
sent = self.socket.send(self.outbound_buffer)
|
||||
self.logger.debug(
|
||||
f"[>] Sent {sent} bytes: {self.outbound_buffer[:sent]!r}"
|
||||
)
|
||||
|
||||
def connect(self, retry_interval: int = 1) -> None:
|
||||
self.logger.debug(
|
||||
f"Connecting to {self.host}:{self.port} with timeout {self.connect_timeout}s..."
|
||||
)
|
||||
try:
|
||||
self.socket.settimeout(self.connect_timeout)
|
||||
self.socket.connect((self.host, self.port))
|
||||
self.socket.settimeout(self.socket_timeout)
|
||||
self.logger.info(f"[+] Connected to {self.host}:{self.port}")
|
||||
self.send_hello()
|
||||
except (
|
||||
socket.timeout,
|
||||
ConnectionRefusedError,
|
||||
ConnectionAbortedError,
|
||||
) as e:
|
||||
self.logger.error(
|
||||
f"[!] Connection to {self.host}:{self.port} failed: {e}"
|
||||
)
|
||||
self.logger.info(
|
||||
f"[.] Retrying connection in {retry_interval} s..."
|
||||
)
|
||||
time.sleep(retry_interval)
|
||||
self.connect(retry_interval=min(30, retry_interval * 2))
|
||||
self.outbound_buffer = self.outbound_buffer[sent:]
|
||||
except BlockingIOError:
|
||||
# OS buffer full, wait for next EVENT_WRITE
|
||||
break
|
||||
except socket.error as e:
|
||||
self.logger.error(f"[!] Socket error: {e}")
|
||||
self.reconnect()
|
||||
break
|
||||
|
||||
def send(self, data: bytes) -> None:
|
||||
self.logger.debug(f"[>] Sending data: {data}")
|
||||
try:
|
||||
self.socket.sendall(data)
|
||||
self.logger.info("[>] Data sent")
|
||||
self._send_ack()
|
||||
except BrokenPipeError as e:
|
||||
self.logger.error(f"[!] Broken pipe: {e}")
|
||||
self.logger.info("[.] Reconnecting...")
|
||||
self.connect()
|
||||
self.send(data)
|
||||
except (socket.error, ValueError) as e:
|
||||
self.logger.error(f"[!] Failed to send data: {e}")
|
||||
|
||||
def receive(self) -> bytes:
|
||||
self.logger.debug("[.] Waiting to receive data...")
|
||||
def _receive_inbound(self) -> None:
|
||||
"""Receive data into the inbound buffer."""
|
||||
try:
|
||||
data: bytes = self.socket.recv(4096)
|
||||
if not data:
|
||||
self.logger.warning("[!] Received empty message")
|
||||
return b""
|
||||
self.logger.debug(f"[<] Received data: {data}")
|
||||
return data
|
||||
if data:
|
||||
self.logger.debug(f"[<] Received {len(data)} bytes: {data!r}")
|
||||
self.inbound_buffer += data
|
||||
else:
|
||||
self.logger.debug("[!] Connection closed by the server.")
|
||||
self.reconnect()
|
||||
except socket.error as e:
|
||||
self.logger.error(f"[!] Failed to receive data: {e}")
|
||||
return b""
|
||||
self.logger.error(f"[!] Socket error: {e}")
|
||||
self.reconnect()
|
||||
|
||||
def close(self) -> None:
|
||||
self.logger.debug("Closing connection...")
|
||||
self.socket.close()
|
||||
self.logger.info("Connection closed.")
|
||||
def send(self, message: Message) -> None:
|
||||
"""Send a message to the server.
|
||||
|
||||
def reconnect(self) -> None:
|
||||
self.logger.debug("Reconnecting...")
|
||||
self.close()
|
||||
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.connect()
|
||||
Args:
|
||||
message (Message): The message to send.
|
||||
"""
|
||||
self.logger.debug(f"[>] Queueing message to send: {message}")
|
||||
if message.ack_required:
|
||||
self.pending_acks[message.id] = (message, time.time())
|
||||
self.outbound_buffer += message.to_bytes()
|
||||
|
||||
def send_hello(self) -> None:
|
||||
self.logger.debug("[.] Sending hello message...")
|
||||
"""Send a HELLO message to the server."""
|
||||
self.logger.debug("[*] Sending HELLO message...")
|
||||
hello_message: Message = Message.hello(self.mac_address)
|
||||
acknowledged: bool = False
|
||||
while not acknowledged:
|
||||
self.send(hello_message.to_bytes())
|
||||
self.logger.debug("[.] Hello message sent, waiting for ACK...")
|
||||
acknowledged = self._check_ack()
|
||||
if not acknowledged:
|
||||
self.logger.warning(
|
||||
"[!] Hello message not acknowledged, retrying..."
|
||||
)
|
||||
time.sleep(1)
|
||||
self.send(hello_message)
|
||||
|
||||
def _loop(self) -> None:
|
||||
self.logger.debug("Starting main loop...")
|
||||
while True:
|
||||
time.sleep(1)
|
||||
data: bytes = self.receive()
|
||||
if not data:
|
||||
self.reconnect()
|
||||
continue
|
||||
message = Message.from_bytes(data.strip())
|
||||
self.logger.info(f"[<] Message received: {message}")
|
||||
# if self._check_ack():
|
||||
# self.logger.debug("[.] ACK verified")
|
||||
# else:
|
||||
# self.logger.error("[!] ACK verification failed")
|
||||
def close(self) -> None:
|
||||
"""Close the connection and clean up resources."""
|
||||
self.logger.debug("[*] Closing connection...")
|
||||
try:
|
||||
self.selector.unregister(self.socket)
|
||||
except Exception as e:
|
||||
self.logger.error(f"[!] Error unregistering socket: {e}")
|
||||
self.socket.close()
|
||||
self.logger.debug("[.] Connection closed.")
|
||||
|
||||
def reconnect(self) -> None:
|
||||
"""Reconnect to the server."""
|
||||
self.logger.debug("[*] Reconnecting...")
|
||||
self.close()
|
||||
|
||||
# reinit socket
|
||||
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
self.socket.setblocking(False)
|
||||
self.selector.register(
|
||||
self.socket,
|
||||
selectors.EVENT_READ | selectors.EVENT_WRITE,
|
||||
data=None,
|
||||
)
|
||||
self.connect()
|
||||
|
||||
def connect(self) -> None:
|
||||
"""Establish a connection to the server."""
|
||||
self.logger.debug(f"Connecting to {self.host}:{self.port}...")
|
||||
connected: bool = False
|
||||
delay: float = 1.0
|
||||
while not connected:
|
||||
try:
|
||||
self.socket.connect((self.host, self.port))
|
||||
connected = True
|
||||
except BlockingIOError:
|
||||
# Connection in progress
|
||||
time.sleep(0.1)
|
||||
except socket.error as e:
|
||||
self.logger.error(f"[!] Connection error: {e}")
|
||||
self.logger.debug(f"[.] Retrying in {delay} seconds...")
|
||||
time.sleep(delay)
|
||||
delay = min(delay * 2, 30) # exponential backoff
|
||||
|
||||
self.logger.debug("[*] Connected, sending HELLO...")
|
||||
self.send_hello()
|
||||
|
||||
def run(self) -> None:
|
||||
self.logger.debug("Running Connector...")
|
||||
"""Run the main event loop."""
|
||||
self.connect()
|
||||
try:
|
||||
self.connect()
|
||||
self._loop()
|
||||
while self.running:
|
||||
events = self.selector.select(timeout=1)
|
||||
for key, mask in events:
|
||||
if mask & selectors.EVENT_READ:
|
||||
self._receive_inbound()
|
||||
if mask & selectors.EVENT_WRITE:
|
||||
self._send_outbound()
|
||||
|
||||
# Process inbound buffer for complete messages
|
||||
while b"\n" in self.inbound_buffer:
|
||||
message_bytes, self.inbound_buffer = (
|
||||
self.inbound_buffer.split(b"\n", 1)
|
||||
)
|
||||
try:
|
||||
message: Message = Message.from_bytes(message_bytes)
|
||||
# handle incoming ACKs
|
||||
if (
|
||||
message.category == Category.CONTROL
|
||||
and message.action == ControlAction.ACK
|
||||
):
|
||||
if (
|
||||
message.payload.get("target_id")
|
||||
in self.pending_acks
|
||||
):
|
||||
target_id = message.payload["target_id"]
|
||||
self.logger.debug(
|
||||
f"[.] Received ACK for message ID {target_id}"
|
||||
)
|
||||
del self.pending_acks[target_id]
|
||||
else:
|
||||
self.on_message(message)
|
||||
|
||||
if message.ack_required:
|
||||
ack_message: Message = Message.ack(message.id)
|
||||
self.send(ack_message)
|
||||
self._send_outbound()
|
||||
except Exception as e:
|
||||
self.logger.error(f"[!] Failed to parse message: {e}")
|
||||
|
||||
time.sleep(0.1)
|
||||
except KeyboardInterrupt:
|
||||
self.logger.info("Interrupted by user.")
|
||||
self.logger.debug("[*] Interrupted by user.")
|
||||
finally:
|
||||
self.close()
|
||||
|
||||
49
uv.lock
generated
49
uv.lock
generated
@@ -226,6 +226,15 @@ wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/2c/e1/e6716421ea10d38022b952c159d5161ca1193197fb744506875fbb87ea7b/iniconfig-2.1.0-py3-none-any.whl", hash = "sha256:9deba5723312380e77435581c6bf4935c94cbfab9b1ed33ef8d238ea168eb760", size = 6050, upload-time = "2025-03-19T20:10:01.071Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "isort"
|
||||
version = "6.0.1"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/b8/21/1e2a441f74a653a144224d7d21afe8f4169e6c7c20bb13aec3a2dc3815e0/isort-6.0.1.tar.gz", hash = "sha256:1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450", size = 821955, upload-time = "2025-02-26T21:13:16.955Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/c1/11/114d0a5f4dabbdcedc1125dee0888514c3c3b16d3e9facad87ed96fad97c/isort-6.0.1-py3-none-any.whl", hash = "sha256:2dc5d7f65c9678d94c88dfc29161a320eec67328bc97aad576874cb4be1e9615", size = 94186, upload-time = "2025-02-26T21:13:14.911Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "jinja2"
|
||||
version = "3.1.6"
|
||||
@@ -240,7 +249,7 @@ wheels = [
|
||||
|
||||
[[package]]
|
||||
name = "judas-client"
|
||||
version = "0.1.0"
|
||||
version = "0.3.0"
|
||||
source = { editable = "." }
|
||||
dependencies = [
|
||||
{ name = "judas-protocol" },
|
||||
@@ -251,6 +260,10 @@ bump = [
|
||||
{ name = "git-cliff" },
|
||||
{ name = "python-semantic-release" },
|
||||
]
|
||||
lint = [
|
||||
{ name = "isort" },
|
||||
{ name = "ruff" },
|
||||
]
|
||||
test = [
|
||||
{ name = "pytest" },
|
||||
{ name = "pytest-cov" },
|
||||
@@ -266,6 +279,10 @@ bump = [
|
||||
{ name = "git-cliff", specifier = ">=2.9.1" },
|
||||
{ name = "python-semantic-release", specifier = ">=10.2.0" },
|
||||
]
|
||||
lint = [
|
||||
{ name = "isort", specifier = ">=6.0.1" },
|
||||
{ name = "ruff", specifier = ">=0.13.1" },
|
||||
]
|
||||
test = [
|
||||
{ name = "pytest", specifier = ">=4.2.1" },
|
||||
{ name = "pytest-cov", specifier = ">=6.2.1" },
|
||||
@@ -275,8 +292,8 @@ test = [
|
||||
|
||||
[[package]]
|
||||
name = "judas-protocol"
|
||||
version = "0.1.0"
|
||||
source = { git = "https://gitea.pufereq.pl/judas/judas_protocol.git#fd070b176347a0f7b81f937b189d8f50736f3514" }
|
||||
version = "0.5.0"
|
||||
source = { git = "https://gitea.pufereq.pl/judas/judas_protocol.git#c48b69ecee16f5824ffd8bce8921341d5fa326b7" }
|
||||
|
||||
[[package]]
|
||||
name = "markdown-it-py"
|
||||
@@ -528,6 +545,32 @@ wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/e3/30/3c4d035596d3cf444529e0b2953ad0466f6049528a879d27534700580395/rich-14.1.0-py3-none-any.whl", hash = "sha256:536f5f1785986d6dbdea3c75205c473f970777b4a0d6c6dd1b696aa05a3fa04f", size = 243368, upload-time = "2025-07-25T07:32:56.73Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ruff"
|
||||
version = "0.13.1"
|
||||
source = { registry = "https://pypi.org/simple" }
|
||||
sdist = { url = "https://files.pythonhosted.org/packages/ab/33/c8e89216845615d14d2d42ba2bee404e7206a8db782f33400754f3799f05/ruff-0.13.1.tar.gz", hash = "sha256:88074c3849087f153d4bb22e92243ad4c1b366d7055f98726bc19aa08dc12d51", size = 5397987, upload-time = "2025-09-18T19:52:44.33Z" }
|
||||
wheels = [
|
||||
{ url = "https://files.pythonhosted.org/packages/f3/41/ca37e340938f45cfb8557a97a5c347e718ef34702546b174e5300dbb1f28/ruff-0.13.1-py3-none-linux_armv6l.whl", hash = "sha256:b2abff595cc3cbfa55e509d89439b5a09a6ee3c252d92020bd2de240836cf45b", size = 12304308, upload-time = "2025-09-18T19:51:56.253Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/ff/84/ba378ef4129415066c3e1c80d84e539a0d52feb250685091f874804f28af/ruff-0.13.1-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:4ee9f4249bf7f8bb3984c41bfaf6a658162cdb1b22e3103eabc7dd1dc5579334", size = 12937258, upload-time = "2025-09-18T19:52:00.184Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/8d/b6/ec5e4559ae0ad955515c176910d6d7c93edcbc0ed1a3195a41179c58431d/ruff-0.13.1-py3-none-macosx_11_0_arm64.whl", hash = "sha256:5c5da4af5f6418c07d75e6f3224e08147441f5d1eac2e6ce10dcce5e616a3bae", size = 12214554, upload-time = "2025-09-18T19:52:02.753Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/70/d6/cb3e3b4f03b9b0c4d4d8f06126d34b3394f6b4d764912fe80a1300696ef6/ruff-0.13.1-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:80524f84a01355a59a93cef98d804e2137639823bcee2931f5028e71134a954e", size = 12448181, upload-time = "2025-09-18T19:52:05.279Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/d2/ea/bf60cb46d7ade706a246cd3fb99e4cfe854efa3dfbe530d049c684da24ff/ruff-0.13.1-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ff7f5ce8d7988767dd46a148192a14d0f48d1baea733f055d9064875c7d50389", size = 12104599, upload-time = "2025-09-18T19:52:07.497Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/2d/3e/05f72f4c3d3a69e65d55a13e1dd1ade76c106d8546e7e54501d31f1dc54a/ruff-0.13.1-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c55d84715061f8b05469cdc9a446aa6c7294cd4bd55e86a89e572dba14374f8c", size = 13791178, upload-time = "2025-09-18T19:52:10.189Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/81/e7/01b1fc403dd45d6cfe600725270ecc6a8f8a48a55bc6521ad820ed3ceaf8/ruff-0.13.1-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:ac57fed932d90fa1624c946dc67a0a3388d65a7edc7d2d8e4ca7bddaa789b3b0", size = 14814474, upload-time = "2025-09-18T19:52:12.866Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/fa/92/d9e183d4ed6185a8df2ce9faa3f22e80e95b5f88d9cc3d86a6d94331da3f/ruff-0.13.1-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c366a71d5b4f41f86a008694f7a0d75fe409ec298685ff72dc882f882d532e36", size = 14217531, upload-time = "2025-09-18T19:52:15.245Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/3b/4a/6ddb1b11d60888be224d721e01bdd2d81faaf1720592858ab8bac3600466/ruff-0.13.1-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f4ea9d1b5ad3e7a83ee8ebb1229c33e5fe771e833d6d3dcfca7b77d95b060d38", size = 13265267, upload-time = "2025-09-18T19:52:17.649Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/81/98/3f1d18a8d9ea33ef2ad508f0417fcb182c99b23258ec5e53d15db8289809/ruff-0.13.1-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b0f70202996055b555d3d74b626406476cc692f37b13bac8828acff058c9966a", size = 13243120, upload-time = "2025-09-18T19:52:20.332Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/8d/86/b6ce62ce9c12765fa6c65078d1938d2490b2b1d9273d0de384952b43c490/ruff-0.13.1-py3-none-manylinux_2_31_riscv64.whl", hash = "sha256:f8cff7a105dad631085d9505b491db33848007d6b487c3c1979dd8d9b2963783", size = 13443084, upload-time = "2025-09-18T19:52:23.032Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/a1/6e/af7943466a41338d04503fb5a81b2fd07251bd272f546622e5b1599a7976/ruff-0.13.1-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:9761e84255443316a258dd7dfbd9bfb59c756e52237ed42494917b2577697c6a", size = 12295105, upload-time = "2025-09-18T19:52:25.263Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/3f/97/0249b9a24f0f3ebd12f007e81c87cec6d311de566885e9309fcbac5b24cc/ruff-0.13.1-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:3d376a88c3102ef228b102211ef4a6d13df330cb0f5ca56fdac04ccec2a99700", size = 12072284, upload-time = "2025-09-18T19:52:27.478Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/f6/85/0b64693b2c99d62ae65236ef74508ba39c3febd01466ef7f354885e5050c/ruff-0.13.1-py3-none-musllinux_1_2_i686.whl", hash = "sha256:cbefd60082b517a82c6ec8836989775ac05f8991715d228b3c1d86ccc7df7dae", size = 12970314, upload-time = "2025-09-18T19:52:30.212Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/96/fc/342e9f28179915d28b3747b7654f932ca472afbf7090fc0c4011e802f494/ruff-0.13.1-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:dd16b9a5a499fe73f3c2ef09a7885cb1d97058614d601809d37c422ed1525317", size = 13422360, upload-time = "2025-09-18T19:52:32.676Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/37/54/6177a0dc10bce6f43e392a2192e6018755473283d0cf43cc7e6afc182aea/ruff-0.13.1-py3-none-win32.whl", hash = "sha256:55e9efa692d7cb18580279f1fbb525146adc401f40735edf0aaeabd93099f9a0", size = 12178448, upload-time = "2025-09-18T19:52:35.545Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/64/51/c6a3a33d9938007b8bdc8ca852ecc8d810a407fb513ab08e34af12dc7c24/ruff-0.13.1-py3-none-win_amd64.whl", hash = "sha256:3a3fb595287ee556de947183489f636b9f76a72f0fa9c028bdcabf5bab2cc5e5", size = 13286458, upload-time = "2025-09-18T19:52:38.198Z" },
|
||||
{ url = "https://files.pythonhosted.org/packages/fd/04/afc078a12cf68592345b1e2d6ecdff837d286bac023d7a22c54c7a698c5b/ruff-0.13.1-py3-none-win_arm64.whl", hash = "sha256:c0bae9ffd92d54e03c2bf266f466da0a65e145f298ee5b5846ed435f6a00518a", size = 12437893, upload-time = "2025-09-18T19:52:41.283Z" },
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shellingham"
|
||||
version = "1.5.4"
|
||||
|
||||
Reference in New Issue
Block a user