conson-xp 1.28.0__py3-none-any.whl → 1.29.0__py3-none-any.whl

{conson_xp-1.28.0.dist-info → conson_xp-1.29.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.28.0
+Version: 1.29.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License

{conson_xp-1.28.0.dist-info → conson_xp-1.29.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-conson_xp-1.28.0.dist-info/METADATA,sha256=vm3hTbH67pUIRDsWHMEsHM4UGNUw3ZNL6V5Xh3KZxPE,10312
-conson_xp-1.28.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
-conson_xp-1.28.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
-conson_xp-1.28.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
-xp/__init__.py,sha256=Ww_plPH2wL8n-IB9Qn1--AEu9xjpxIPxX53TpCchpnM,181
+conson_xp-1.29.0.dist-info/METADATA,sha256=k_I_mYoEaWaCsYx4kk3JOZ5FaBuAFkggSTKk28JMyGk,10312
+conson_xp-1.29.0.dist-info/WHEEL,sha256=tsUv_t7BDeJeRHaSrczbGeuK-TtDpGsWi_JfpzD255I,90
+conson_xp-1.29.0.dist-info/entry_points.txt,sha256=1OcdIcDM1hz3ljCXgybaPUh1IOFEwkaTgLIW9u9zGeg,50
+conson_xp-1.29.0.dist-info/licenses/LICENSE,sha256=rxj6woMM-r3YCyGq_UHFtbh7kHTAJgrccH6O-33IDE4,1419
+xp/__init__.py,sha256=CTv0SXJngPEN2pQxHNESqU87b-94c8Ke6ShS2yRsqDA,181
 xp/cli/__init__.py,sha256=QjnKB1KaI2aIyKlzrnvCwfbBuUj8HNgwNMvNJVQofbI,81
 xp/cli/__main__.py,sha256=l2iKwMdat5rTGd3JWs-uGksnYYDDffp_Npz05QdKEeU,117
 xp/cli/commands/__init__.py,sha256=noh8fdZAWq-ihJEboP8WugbIgq4LJ3jUWMRA7720xWE,4909
@@ -106,7 +106,7 @@ xp/models/telegram/telegram_type.py,sha256=GhqKP63oNMyh2tIvCPcsC5RFp4s4JjhmEqCLC
 xp/models/telegram/timeparam_type.py,sha256=Ar8xvSfPmOAgR2g2Je0FgvP01SL7bPvZn5_HrVDpmJM,1137
 xp/models/term/__init__.py,sha256=aFvzGZHr_dI6USb8MJuYLSLMvxi_ZWMVtokHDt8428s,263
 xp/models/term/connection_state.py,sha256=floDRMeMcfgMrYIVsyoVHBXHtxd3hqm-xOdr3oXtaHY,1793
-xp/models/term/module_state.py,sha256=p9pXCVRDIdMEbAf5jhAHoZ2dnqhpu2rli_ThA1WUCj0,864
+xp/models/term/module_state.py,sha256=tg5V3HNicXhXE10WuDSCN8OleVrorXrOosXOEgEAVE0,934
 xp/models/term/protocol_keys_config.py,sha256=CTujcfI2_NOeltjvHy_cnsHzxLSVsGFXieMZlD-zj0Q,1204
 xp/models/term/status_message.py,sha256=DOmzL0dbig5mP1UEoXdgzGT4UG2RyAXa_yRVo5c4x8w,394
 xp/models/term/telegram_display.py,sha256=RJDrJh4tqRmT0i1-tfYy17paEmVb3HY3DMuFPsEhZyc,533
@@ -162,9 +162,10 @@ xp/services/protocol/telegram_protocol.py,sha256=Ki5DrXsKxiaqLcdP9WWUuhUI7cPu2Df
 xp/services/reverse_proxy_service.py,sha256=BUOlcLlTU-R5iuC_96rasug21xo19wK9_4fMQXxc0QM,15061
 xp/services/server/__init__.py,sha256=QEcCj-jK0goAukJCe15TKYFQfSAzWsduPT_wW0HxZU8,48
 xp/services/server/base_server_service.py,sha256=B-ntxp3swbwuri-9_2EuvBDi-4Uo9AH-AA4iAFGWIS4,12682
+xp/services/server/client_buffer_manager.py,sha256=1d_MqfzuUqBwaQUiC1n5K76WwSxrdngYAmNH7he6u3o,2235
 xp/services/server/cp20_server_service.py,sha256=SXdI6Jt400T9sLdw86ovEqKRGeV3nYVaHEA9Gcj6W2A,2041
 xp/services/server/device_service_factory.py,sha256=Y4TvSFALeq0zYzHfCwcbikSpmIyYbLcvm9756n5Jm7Q,3744
-xp/services/server/server_service.py,sha256=JPRFMto2l956dW7vfSclQugu2vdF0fssxxUOYjHNtA4,15833
+xp/services/server/server_service.py,sha256=2t3guPVX3YUyNJo7B5b1U80eRMyEgE7irT2X8MMQMag,16302
 xp/services/server/xp130_server_service.py,sha256=YnvetDp72-QzkyDGB4qfZZIwFs03HuibUOz2zb9XR0c,2191
 xp/services/server/xp20_server_service.py,sha256=1wJ7A-bRkN9O5Spu3q3LNDW31mNtNF2eNMQ5E6O2ltA,2928
 xp/services/server/xp230_server_service.py,sha256=k9ftCY5tjLFP31mKVCspq283RVaPkGx-Yq61Urk8JLs,1815
@@ -181,7 +182,7 @@ xp/services/telegram/telegram_service.py,sha256=XrP1CPi0ckxoKBaNwLA6lo-TogWxXgmX
 xp/services/telegram/telegram_version_service.py,sha256=M5HdOTsLdcwo122FP-jW6R740ktLrtKf2TiMDVz23h8,10528
 xp/services/term/__init__.py,sha256=BIeOK042bMR-0l6MA80wdW5VuHlpWOXtRER9IG5ilQA,245
 xp/services/term/protocol_monitor_service.py,sha256=PhEzLNzWf1XieQw94ua-hJu9ccwrAzhdxSZGe4kHghs,9945
-xp/services/term/state_monitor_service.py,sha256=gLvNdFMQ8TKX_fAu27TaIyCiEmf-hepkt7zYgFVTvng,12337
+xp/services/term/state_monitor_service.py,sha256=PgwCH8nce1RODV33aJefiX3on-pSGEgP_4FDAoU5Trc,16218
 xp/term/__init__.py,sha256=Xg2DhBeI3xQJLfc7_BPWI1por-rUXemyer5OtOt9Cus,51
 xp/term/protocol.py,sha256=oLJAExvIaOSpy75A5TaYB_7R9skTTtNtPx8hiJLdy_U,3425
 xp/term/protocol.tcss,sha256=r_KfxrbpycGHLVXqZc6INBBcUJME0hLrAZkF1oqnab4,2126
@@ -189,7 +190,7 @@ xp/term/state.py,sha256=sR7I6t4gJSkO2YS3TwonAnGPR_f43coCk4xKdWETus0,3233
 xp/term/state.tcss,sha256=Njp7fc16cCunLq7hi5RvXjPi4jSCGi5aPDnusb9dq1Y,1401
 xp/term/widgets/__init__.py,sha256=ftWmN_fmjxy2E8Qfm-YSRmzKfgL0KTBCTpgvYWCPbUY,274
 xp/term/widgets/help_menu.py,sha256=w2NjwiC_s16St0rigZ9ef9S0V9Y4v0J5eCVCHAdRKF4,1789
-xp/term/widgets/modules_list.py,sha256=_B46p8lCOH4jr1kVqphS7Rixr6bobg6c_pD4RCj_NRE,7321
+xp/term/widgets/modules_list.py,sha256=DD0PUnY4gv05hkCVxThWULHg1ZNNY8xr1XFaZrv9kS4,7666
 xp/term/widgets/protocol_log.py,sha256=CJUpckWj7GC1kVqixDadteyGnI4aHyzd4kkH-pSbzno,2600
 xp/term/widgets/status_footer.py,sha256=bxrcqKzJ9V0aPSn_WwraVpJz7NxBUh3yIjA3fwv5nVA,3256
 xp/utils/__init__.py,sha256=_avMF_UOkfR3tNeDIPqQ5odmbq5raKkaq1rZ9Cn1CJs,332
@@ -200,4 +201,4 @@ xp/utils/logging.py,sha256=rZDXwlBrYK8A6MPq5StsMNpgsRowzJXM6fvROPwJdGM,3750
 xp/utils/serialization.py,sha256=RWHHk86feaB4ZP7rjE4qOWK0900yg2joUBDkP76gfOY,4618
 xp/utils/state_machine.py,sha256=Oe2sLwCh9z_vr1tF6X0ZRGTeuckRQAGzmef7xc9CNdc,2413
 xp/utils/time_utils.py,sha256=dEyViDlAG9GWU-J3D_YVa-sGma6yiyyMTgN4h2x3PY4,3781
-conson_xp-1.28.0.dist-info/RECORD,,
+conson_xp-1.29.0.dist-info/RECORD,,

xp/__init__.py

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

xp/models/term/module_state.py

@@ -13,6 +13,7 @@ class ModuleState:
         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").
@@ -22,6 +23,7 @@ class ModuleState:
     name: str
     serial_number: str
     module_type: str
+    link_number: int
     outputs: str
     auto_report: bool
     error_status: str

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)

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

xp/services/term/state_monitor_service.py

@@ -2,13 +2,14 @@
 
 import logging
 from datetime import datetime
-from typing import Dict, List
+from typing import Dict, List, Optional
 
 from psygnal import Signal
 
 from xp.models.homekit.homekit_conson_config import ConsonModuleListConfig
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.datapoint_type import DataPointType
+from xp.models.telegram.module_type_code import ModuleTypeCode
 from xp.models.telegram.system_function import SystemFunction
 from xp.models.telegram.telegram_type import TelegramType
 from xp.models.term.connection_state import ConnectionState
@@ -78,6 +79,7 @@ class StateMonitorService:
                 name=module_config.name,
                 serial_number=module_config.serial_number,
                 module_type=module_config.module_type,
+                link_number=module_config.link_number,
                 outputs="",  # Empty initially
                 auto_report=auto_report,
                 error_status="OK",
@@ -239,15 +241,24 @@ class StateMonitorService:
     def _on_telegram_received(self, event: TelegramReceivedEvent) -> None:
         """Handle telegram received event.
 
-        Parse output states from telegram and update module state.
+        Routes telegrams to appropriate handlers based on type.
+        Processes reply telegrams for datapoint queries and event telegrams for state changes.
 
         Args:
             event: Telegram received event.
         """
-        # Only process reply telegrams
-        if event.telegram_type != TelegramType.REPLY:
-            return
+        # Route based on telegram type
+        if event.telegram_type == TelegramType.REPLY:
+            self._handle_reply_telegram(event)
+        elif event.telegram_type == TelegramType.EVENT:
+            self._handle_event_telegram(event)
+
+    def _handle_reply_telegram(self, event: TelegramReceivedEvent) -> None:
+        """Handle reply telegram for datapoint queries.
 
+        Args:
+            event: Telegram received event.
+        """
         serial_number = event.serial_number
         if not serial_number or serial_number not in self._module_states:
             return
@@ -289,6 +300,95 @@ class StateMonitorService:
             self.on_connection_state_changed.emit(self._connection_state)
             self.on_status_message.emit(f"Protocol error: {failure}")
 
+    def _find_module_by_link(self, link_number: int) -> Optional[ModuleState]:
+        """Find module state by link number.
+
+        Args:
+            link_number: Link number to search for.
+
+        Returns:
+            ModuleState if found, None otherwise.
+        """
+        for module_state in self._module_states.values():
+            if module_state.link_number == link_number:
+                return module_state
+        return None
+
+    def _update_output_bit(
+        self, module_state: ModuleState, output_number: int, output_state: bool
+    ) -> None:
+        """Update a single output bit in module state.
+
+        Args:
+            module_state: Module state to update.
+            output_number: Output number (0-3 for XP24).
+            output_state: True for ON, False for OFF.
+        """
+        # Parse existing outputs string "0 1 0 0" → [0, 1, 0, 0]
+        outputs = module_state.outputs.split() if module_state.outputs else []
+
+        # Ensure we have enough outputs
+        while len(outputs) <= output_number:
+            outputs.append("0")
+
+        # Update the specific output
+        outputs[output_number] = "1" if output_state else "0"
+
+        # Convert back to string format
+        module_state.outputs = " ".join(outputs)
+
+    def _handle_event_telegram(self, event: TelegramReceivedEvent) -> None:
+        """Handle event telegram for output state changes.
+
+        Processes XP24 output event telegrams to update module state in real-time.
+        Output events use input_number field with values 80-83 to represent outputs 0-3.
+
+        Args:
+            event: Telegram received event containing event telegram.
+        """
+        # Parse the event telegram
+        event_telegram = self._telegram_service.parse_event_telegram(event.frame)
+        if not event_telegram:
+            self.logger.debug("Failed to parse event telegram")
+            return
+
+        # Only process XP24 output events
+        if event_telegram.module_type != ModuleTypeCode.XP24.value:
+            self.logger.debug(
+                f"Ignoring event from module type {event_telegram.module_type}"
+            )
+            return
+
+        # Validate output number range (80-83 for XP24 outputs 0-3)
+        if not (80 <= event_telegram.input_number <= 83):
+            self.logger.debug(
+                f"Ignoring input event I{event_telegram.input_number:02d}"
+            )
+            return
+
+        # Find module by link number
+        module_state = self._find_module_by_link(event_telegram.link_number)
+        if not module_state:
+            self.logger.debug(
+                f"Module not found for link number {event_telegram.link_number}"
+            )
+            return
+
+        # Convert input_number to output_number (80→0, 81→1, 82→2, 83→3)
+        output_number = event_telegram.input_number - 80
+        output_state = event_telegram.is_button_press  # M=True, B=False
+
+        # Update output state
+        self._update_output_bit(module_state, output_number, output_state)
+        module_state.last_update = datetime.now()
+
+        # Emit signal for UI update
+        self.on_module_state_changed.emit(module_state)
+        self.logger.debug(
+            f"Updated {module_state.name} output {output_number} to "
+            f"{'ON' if output_state else 'OFF'}"
+        )
+
     def cleanup(self) -> None:
         """Clean up service resources."""
         self._disconnect_signals()

xp/term/widgets/modules_list.py

@@ -3,6 +3,7 @@
 from datetime import datetime
 from typing import Any, List, Optional
 
+from rich.text import Text
 from textual.app import ComposeResult
 from textual.widgets import DataTable, Static
 
@@ -14,7 +15,7 @@ class ModulesListWidget(Static):
     """Widget displaying module states in a data table.
 
     Shows module information with real-time updates from StateMonitorService.
-    Table displays: name, serial_number, module_type, outputs, report, status, last_update.
+    Table displays: name, serial_number, module_type, link_number, outputs, report, status, last_update.
 
     Attributes:
         service: StateMonitorService for module state updates.
@@ -54,11 +55,9 @@ class ModulesListWidget(Static):
         self.border_title = "Modules"
 
         if self.table:
-            # Set table to full width
-            self.table.styles.width = "100%"
-
             # Setup table columns
             self.table.add_column("name", key="name")
+            self.table.add_column("link", key="link_number")
             self.table.add_column("serial number", key="serial_number")
             self.table.add_column("module type", key="module_type")
             self.table.add_column("outputs", key="outputs")
@@ -115,13 +114,17 @@ class ModulesListWidget(Static):
                 row_key, "outputs", self._format_outputs(module_state.outputs)
             )
             self.table.update_cell(
-                row_key, "report", self._format_report(module_state.auto_report)
+                row_key,
+                "report",
+                Text(self._format_report(module_state.auto_report), justify="center"),
             )
             self.table.update_cell(row_key, "status", module_state.error_status)
             self.table.update_cell(
                 row_key,
                 "last_update",
-                self._format_last_update(module_state.last_update),
+                Text(
+                    self._format_last_update(module_state.last_update), justify="center"
+                ),
             )
         else:
             # Add new row
@@ -138,12 +141,13 @@ class ModulesListWidget(Static):
 
         row_key = self.table.add_row(
             module_state.name,
+            Text(str(module_state.link_number), justify="right"),
             module_state.serial_number,
             module_state.module_type,
             self._format_outputs(module_state.outputs),
-            self._format_report(module_state.auto_report),
+            Text(self._format_report(module_state.auto_report), justify="center"),
             module_state.error_status,
-            self._format_last_update(module_state.last_update),
+            Text(self._format_last_update(module_state.last_update), justify="center"),
         )
         self._row_keys[module_state.serial_number] = row_key
 
@@ -213,5 +217,8 @@ class ModulesListWidget(Static):
                 self.table.update_cell(
                     row_key,
                     "last_update",
-                    self._format_last_update(module_state.last_update),
+                    Text(
+                        self._format_last_update(module_state.last_update),
+                        justify="center",
+                    ),
                 )