conson-xp 1.27.0__tar.gz → 1.29.0__tar.gz

{conson_xp-1.27.0 → conson_xp-1.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.27.0
+Version: 1.29.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -417,6 +417,7 @@ xp telegram version
 
 xp term
 xp term protocol
+xp term state
 
 <!-- END CLI HELP -->
 ```

{conson_xp-1.27.0 → conson_xp-1.29.0}/README.md

@@ -364,6 +364,7 @@ xp telegram version
 
 xp term
 xp term protocol
+xp term state
 
 <!-- END CLI HELP -->
 ```

{conson_xp-1.27.0 → conson_xp-1.29.0}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.27.0"
+version = "1.29.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.27.0 → conson_xp-1.29.0}/src/xp/__init__.py

@@ -3,7 +3,7 @@
 conson-xp package.
 """
 
-__version__ = "1.27.0"
+__version__ = "1.29.0"
 __manufacturer__ = "salchichon"
 __model__ = "xp.cli"
 __serial__ = "2025.09.23.000"

{conson_xp-1.27.0 → conson_xp-1.29.0}/src/xp/cli/commands/term/term_commands.py

@@ -25,3 +25,24 @@ def protocol_monitor(ctx: Context) -> None:
 
     # Resolve ProtocolMonitorApp from container and run
     ctx.obj.get("container").get_container().resolve(ProtocolMonitorApp).run()
+
+
+@term.command("state")
+@click.pass_context
+def state_monitor(ctx: Context) -> None:
+    r"""Start TUI for module state monitoring.
+
+    Displays module states from Conson configuration with real-time
+    updates in an interactive terminal interface.
+
+    Args:
+        ctx: Click context object.
+
+    Examples:
+        \b
+        xp term state
+    """
+    from xp.term.state import StateMonitorApp
+
+    # Resolve StateMonitorApp from container and run
+    ctx.obj.get("container").get_container().resolve(StateMonitorApp).run()

{conson_xp-1.27.0 → conson_xp-1.29.0}/src/xp/models/term/__init__.py

@@ -1,11 +1,13 @@
 """Terminal UI models."""
 
+from xp.models.term.module_state import ModuleState
 from xp.models.term.protocol_keys_config import (
     ProtocolKeyConfig,
     ProtocolKeysConfig,
 )
 
 __all__ = [
+    "ModuleState",
     "ProtocolKeyConfig",
     "ProtocolKeysConfig",
 ]

conson_xp-1.29.0/src/xp/models/term/module_state.py

@@ -0,0 +1,30 @@
+"""Module state data model."""
+
+from dataclasses import dataclass
+from datetime import datetime
+from typing import Optional
+
+
+@dataclass
+class ModuleState:
+    """State of a Conson module for TUI display.
+
+    Attributes:
+        name: Module name/identifier (e.g., A01, A02).
+        serial_number: Module serial number.
+        module_type: Module type designation (e.g., XP130, XP230, XP24).
+        link_number: Link number for the module.
+        outputs: Output states as space-separated binary values. Empty string for modules without outputs.
+        auto_report: Auto-report enabled status (Y/N).
+        error_status: Module status ("OK" or error code like "E10").
+        last_update: Last communication timestamp. None if never updated.
+    """
+
+    name: str
+    serial_number: str
+    module_type: str
+    link_number: int
+    outputs: str
+    auto_report: bool
+    error_status: str
+    last_update: Optional[datetime]

conson_xp-1.29.0/src/xp/services/server/client_buffer_manager.py

@@ -0,0 +1,69 @@
+"""Client buffer manager for broadcasting telegrams to connected clients.
+
+This module provides thread-safe management of per-client telegram queues,
+enabling broadcast of telegrams from device services to all connected clients.
+"""
+
+import queue
+import socket
+import threading
+from typing import Dict, Optional
+
+
+class ClientBufferManager:
+    """
+    Thread-safe manager for client telegram queues.
+
+    Manages individual queues for each connected client, providing thread-safe
+    operations for client registration, unregistration, and telegram broadcasting.
+    """
+
+    def __init__(self) -> None:
+        """Initialize the client buffer manager."""
+        self._buffers: Dict[socket.socket, queue.Queue[str]] = {}
+        self._lock = threading.Lock()
+
+    def register_client(self, client_socket: socket.socket) -> queue.Queue[str]:
+        """Register a new client and create its telegram queue.
+
+        Args:
+            client_socket: The socket of the connecting client.
+
+        Returns:
+            The newly created queue for this client.
+        """
+        with self._lock:
+            client_queue: queue.Queue[str] = queue.Queue()
+            self._buffers[client_socket] = client_queue
+            return client_queue
+
+    def unregister_client(self, client_socket: socket.socket) -> None:
+        """Unregister a client and remove its telegram queue.
+
+        Args:
+            client_socket: The socket of the disconnecting client.
+        """
+        with self._lock:
+            self._buffers.pop(client_socket, None)
+
+    def broadcast(self, telegram: str) -> None:
+        """Broadcast a telegram to all connected clients.
+
+        Args:
+            telegram: The telegram string to broadcast.
+        """
+        with self._lock:
+            for client_queue in self._buffers.values():
+                client_queue.put(telegram)
+
+    def get_queue(self, client_socket: socket.socket) -> Optional[queue.Queue[str]]:
+        """Retrieve the queue for a specific client.
+
+        Args:
+            client_socket: The socket of the client.
+
+        Returns:
+            The client's queue if registered, None otherwise.
+        """
+        with self._lock:
+            return self._buffers.get(client_socket)

{conson_xp-1.27.0 → conson_xp-1.29.0}/src/xp/services/server/server_service.py

@@ -5,6 +5,7 @@ Discover Request telegrams with configurable device information.
 """
 
 import logging
+import queue
 import socket
 import threading
 from pathlib import Path
@@ -15,6 +16,7 @@ from xp.models.homekit.homekit_conson_config import (
     ConsonModuleListConfig,
 )
 from xp.services.server.base_server_service import BaseServerService
+from xp.services.server.client_buffer_manager import ClientBufferManager
 from xp.services.server.device_service_factory import DeviceServiceFactory
 from xp.services.telegram.telegram_discover_service import TelegramDiscoverService
 from xp.services.telegram.telegram_service import TelegramService
@@ -68,7 +70,7 @@ class ServerService:
             None  # Background thread for storm
         )
         self.collector_stop_event = threading.Event()  # Event to stop thread
-        self.collector_buffer: list[str] = []  # All collected buffers
+        self.client_buffers = ClientBufferManager()  # Per-client queue manager
 
         # Set up logging
         self.logger = logging.getLogger(__name__)
@@ -191,6 +193,9 @@ class ServerService:
         self, client_socket: socket.socket, client_address: tuple[str, int]
     ) -> None:
         """Handle individual client connection."""
+        # Register client and get its dedicated queue
+        client_queue = self.client_buffers.register_client(client_socket)
+
         try:
 
             idle_timeout = 300
@@ -202,11 +207,14 @@ class ServerService:
 
             while True:
 
-                # send waiting buffer
-                for i in range(len(self.collector_buffer)):
-                    buffer = self.collector_buffer.pop()
-                    client_socket.send(buffer.encode("latin-1"))
-                    self.logger.debug(f"Sent buffer to {client_address}")
+                # send waiting buffer from client's dedicated queue
+                while not client_queue.empty():
+                    try:
+                        buffer = client_queue.get_nowait()
+                        client_socket.send(buffer.encode("latin-1"))
+                        self.logger.debug(f"Sent buffer to {client_address}")
+                    except queue.Empty:
+                        break
 
                 # Receive data from client
                 data = None
@@ -230,11 +238,8 @@ class ServerService:
 
                 # Process request (discover or data request)
                 responses = self._process_request(message)
-
-                # Send responses
                 for response in responses:
-                    client_socket.send(response.encode("latin-1"))
-                    self.logger.debug(f"Sent to {client_address}: {response[:-1]}")
+                    self.client_buffers.broadcast(response)
 
         except socket.timeout:
             self.logger.debug(f"Client {client_address} timed out")
@@ -242,6 +247,8 @@ class ServerService:
             self.logger.error(f"Error handling client {client_address}: {e}")
         finally:
             try:
+                # Unregister client before closing socket
+                self.client_buffers.unregister_client(client_socket)
                 client_socket.close()
                 self.logger.info(f"Client {client_address} disconnected")
             except Exception as e:
@@ -330,6 +337,8 @@ class ServerService:
                 self.logger.warning(f"Failed to parse telegram: {telegram}")
                 return responses
 
+            self.client_buffers.broadcast(parsed_telegram.raw_telegram)
+
             # Handle discover requests
             if self.discover_service.is_discover_request(parsed_telegram):
                 for device_service in self.device_services.values():
@@ -421,7 +430,8 @@ class ServerService:
             collected = 0
             for device_service in self.device_services.values():
                 telegram_buffer = device_service.collect_telegram_buffer()
-                self.collector_buffer.extend(telegram_buffer)
+                for telegram in telegram_buffer:
+                    self.client_buffers.broadcast(telegram)
                 collected += len(telegram_buffer)
 
             # Wait a bit before checking again

{conson_xp-1.27.0 → conson_xp-1.29.0}/src/xp/services/server/xp24_server_service.py

@@ -161,10 +161,7 @@ class XP24ServerService(BaseServerService):
 
         data_value = handler()
         data_part = (
-            f"R{self.serial_number}"
-            f"F02D{datapoint_type.value}"
-            f"{self.module_type_code.value:02}"
-            f"{data_value}"
+            f"R{self.serial_number}" f"F02D{datapoint_type.value}" f"{data_value}"
         )
         telegram = self._build_response_telegram(data_part)
 

{conson_xp-1.27.0 → conson_xp-1.29.0}/src/xp/services/server/xp33_server_service.py

@@ -226,10 +226,7 @@ class XP33ServerService(BaseServerService):
 
         data_value = handler()
         data_part = (
-            f"R{self.serial_number}"
-            f"F02D{datapoint_type.value}"
-            f"{self.module_type_code.value:02}"
-            f"{data_value}"
+            f"R{self.serial_number}" f"F02D{datapoint_type.value}" f"{data_value}"
         )
         telegram = self._build_response_telegram(data_part)
 

{conson_xp-1.27.0 → conson_xp-1.29.0}/src/xp/services/telegram/telegram_output_service.py

@@ -320,3 +320,36 @@ class TelegramOutputService:
             f"Timestamp: {telegram.timestamp}\n"
             f"Checksum: {telegram.checksum}{checksum_status}"
         )
+
+    @staticmethod
+    def format_output_state(data_value: str) -> str:
+        """Format module output state data value for display.
+
+        Algorithm:
+        1. Remove 'x' characters
+        2. Format to 4 chars with space padding on the right
+        3. Invert order
+        4. Add spaces between characters
+
+        Args:
+            data_value: Raw data value from module output state datapoint (e.g., "xxxx0101", "xx1110").
+
+        Returns:
+            Formatted output string with spaces (e.g., "1 0 1 0", "0 1 1 1").
+
+        Examples:
+            >>> TelegramOutputService.format_output_state("xxxx0101")
+            "1 0 1 0"
+            >>> TelegramOutputService.format_output_state("xx1110")
+            "0 1 1 1"
+            >>> TelegramOutputService.format_output_state("xxxx01")
+            "  1 0"
+        """
+        # Remove 'x' characters
+        cleaned = data_value.replace("x", "").replace("X", "")
+        # Format to 4 chars with space padding on the right
+        padded = cleaned.ljust(4)[:4]
+        # Invert order
+        inverted = padded[::-1]
+        # Add spaces between characters
+        return " ".join(inverted)

conson_xp-1.29.0/src/xp/services/term/__init__.py

@@ -0,0 +1,6 @@
+"""Terminal interface services."""
+
+from xp.services.term.protocol_monitor_service import ProtocolMonitorService
+from xp.services.term.state_monitor_service import StateMonitorService
+
+__all__ = ["ProtocolMonitorService", "StateMonitorService"]