Compare commits
6 Commits
0.6.0
...
d7b136851b
| Author | SHA1 | Date | |
|---|---|---|---|
|
d7b136851b
|
|||
|
7e9a9e6eed
|
|||
|
6ed03ab74d
|
|||
|
40c08d0169
|
|||
|
3d13d24116
|
|||
|
28b57b6964
|
@@ -8,11 +8,15 @@ import threading
|
|||||||
import time
|
import time
|
||||||
from typing import TYPE_CHECKING, Any, Final
|
from typing import TYPE_CHECKING, Any, Final
|
||||||
|
|
||||||
|
from judas_protocol.types import TelemetryAction
|
||||||
import yaml
|
import yaml
|
||||||
from judas_protocol import Category, ControlAction, Message
|
from judas_protocol import Category, ControlAction, Message
|
||||||
|
|
||||||
from judas_server.backend.client import Client, ClientStatus
|
from judas_server.backend.client import Client, ClientStatus
|
||||||
from judas_server.backend.handler.hello_handler import HelloHandler
|
from judas_server.backend.handler.hello_handler import HelloHandler
|
||||||
|
from judas_server.backend.handler.telemetry.initial_handler import (
|
||||||
|
InitialTelemetryHandler,
|
||||||
|
)
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
@@ -67,11 +71,16 @@ class BackendServer:
|
|||||||
"""Initialize message handlers."""
|
"""Initialize message handlers."""
|
||||||
|
|
||||||
hello_handler = HelloHandler(self)
|
hello_handler = HelloHandler(self)
|
||||||
|
initial_telemetry_handler = InitialTelemetryHandler(self)
|
||||||
|
|
||||||
self.message_handlers[(Category.CONTROL, ControlAction.HELLO)] = (
|
self.message_handlers[(Category.CONTROL, ControlAction.HELLO)] = (
|
||||||
hello_handler.handle
|
hello_handler.handle
|
||||||
)
|
)
|
||||||
|
|
||||||
|
self.message_handlers[
|
||||||
|
(Category.TELEMETRY, TelemetryAction.INITIAL)
|
||||||
|
] = initial_telemetry_handler.handle
|
||||||
|
|
||||||
def _load_known_clients(self) -> dict[str, dict[str, str | float]]:
|
def _load_known_clients(self) -> dict[str, dict[str, str | float]]:
|
||||||
"""Load the list of known clients from a YAML file and validate."""
|
"""Load the list of known clients from a YAML file and validate."""
|
||||||
known_clients: dict[str, dict[str, str | float]] = {}
|
known_clients: dict[str, dict[str, str | float]] = {}
|
||||||
@@ -108,6 +117,9 @@ class BackendServer:
|
|||||||
client.last_seen = float(
|
client.last_seen = float(
|
||||||
known_clients[client_id].get("last_seen", 0.0)
|
known_clients[client_id].get("last_seen", 0.0)
|
||||||
)
|
)
|
||||||
|
client.initial_telemetry = known_clients[client_id].get( # type: ignore
|
||||||
|
"initial_telemetry", None
|
||||||
|
)
|
||||||
self.clients[client_id] = client
|
self.clients[client_id] = client
|
||||||
|
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
@@ -399,4 +411,5 @@ class BackendServer:
|
|||||||
"addr": client.addr,
|
"addr": client.addr,
|
||||||
"last_seen": client.last_seen,
|
"last_seen": client.last_seen,
|
||||||
"status": client.status,
|
"status": client.status,
|
||||||
|
"initial_telemetry": client.initial_telemetry,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ from __future__ import annotations
|
|||||||
import logging as lg
|
import logging as lg
|
||||||
import socket
|
import socket
|
||||||
import time
|
import time
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
from judas_server.backend.client_status import ClientStatus
|
from judas_server.backend.client_status import ClientStatus
|
||||||
|
|
||||||
@@ -41,6 +42,8 @@ class Client:
|
|||||||
self.inbound: bytes = b""
|
self.inbound: bytes = b""
|
||||||
self.outbound: bytes = b""
|
self.outbound: bytes = b""
|
||||||
|
|
||||||
|
self.initial_telemetry: dict[str, Any] | None = None
|
||||||
|
|
||||||
def __str__(self) -> str:
|
def __str__(self) -> str:
|
||||||
if self.addr:
|
if self.addr:
|
||||||
return f"Client({self.id} ({self.addr[0]}:{self.addr[1]}))"
|
return f"Client({self.id} ({self.addr[0]}:{self.addr[1]}))"
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
"""Initial telemetry handler."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
from judas_protocol import Message
|
||||||
|
|
||||||
|
from judas_server.backend.handler.base_handler import BaseHandler
|
||||||
|
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from judas_server.backend import BackendServer
|
||||||
|
from judas_server.backend.client import Client
|
||||||
|
|
||||||
|
|
||||||
|
class InitialTelemetryHandler(BaseHandler):
|
||||||
|
"""Handles the initial telemetry message from a client."""
|
||||||
|
|
||||||
|
def __init__(self, backend_server: BackendServer) -> None:
|
||||||
|
"""Initialize the handler."""
|
||||||
|
super().__init__(backend_server)
|
||||||
|
|
||||||
|
def handle(self, client: Client, message: Message) -> None:
|
||||||
|
"""Handle the initial telemetry message."""
|
||||||
|
self.logger.debug(
|
||||||
|
f"Handling initial telemetry message from {client}..."
|
||||||
|
)
|
||||||
|
|
||||||
|
client.initial_telemetry = message.payload
|
||||||
|
self.backend_server.known_clients[client.id]["initial_telemetry"] = ( # type: ignore
|
||||||
|
message.payload
|
||||||
|
)
|
||||||
@@ -18,6 +18,10 @@
|
|||||||
<strong>Last Seen:</strong>
|
<strong>Last Seen:</strong>
|
||||||
<span id="last-seen">{{ client.last_seen }}</span>
|
<span id="last-seen">{{ client.last_seen }}</span>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>Initial:</strong>
|
||||||
|
<pre>{{ client.initial_telemetry | tojson(indent=2) }}</pre>
|
||||||
|
</p>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
4
uv.lock
generated
4
uv.lock
generated
@@ -358,8 +358,8 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "judas-protocol"
|
name = "judas-protocol"
|
||||||
version = "0.8.0"
|
version = "0.9.1"
|
||||||
source = { git = "https://gitea.pufereq.pl/judas/judas_protocol.git#a805ccf38edffadc1b8c8b276e60758c86516cd3" }
|
source = { git = "https://gitea.pufereq.pl/judas/judas_protocol.git#085c34f232f95313d66db48a7d17bc25c92a35ae" }
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "judas-server"
|
name = "judas-server"
|
||||||
|
|||||||
Reference in New Issue
Block a user