conson-xp 1.14.0__tar.gz → 1.16.0__tar.gz

{conson_xp-1.14.0 → conson_xp-1.16.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conson-xp
-Version: 1.14.0
+Version: 1.16.0
 Summary: XP Protocol Communication Tools
 Author-Email: ldvchosal <ldvchosal@github.com>
 License: MIT License
@@ -47,6 +47,7 @@ Requires-Dist: HAP-python[QRCode]>=5.0.0
 Requires-Dist: punq>=0.7.0
 Requires-Dist: twisted>=25.5.0
 Requires-Dist: bubus>=1.5.6
+Requires-Dist: psygnal>=0.15.0
 Description-Content-Type: text/markdown
 
 # 🔌 XP Protocol Communication Tool

{conson_xp-1.14.0 → conson_xp-1.16.0}/pyproject.toml

@@ -17,10 +17,11 @@ dependencies = [
     "punq>=0.7.0",
     "twisted>=25.5.0",
     "bubus>=1.5.6",
+    "psygnal>=0.15.0",
 ]
 requires-python = ">=3.11"
 readme = "README.md"
-version = "1.14.0"
+version = "1.16.0"
 
 [project.license]
 file = "LICENSE"

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/__init__.py

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

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/cli/commands/conbus/conbus_discover_commands.py

@@ -9,6 +9,7 @@ from xp.cli.utils.decorators import (
     connection_command,
 )
 from xp.models import ConbusDiscoverResponse
+from xp.models.conbus.conbus_discover import DiscoveredDevice
 from xp.services.conbus.conbus_discover_service import (
     ConbusDiscoverService,
 )
@@ -36,6 +37,14 @@ def send_discover_telegram(ctx: click.Context) -> None:
         """
         click.echo(json.dumps(discovered_devices.to_dict(), indent=2))
 
+    def on_device_discovered(discovered_device: DiscoveredDevice) -> None:
+        """Handle discovery of sa single module.
+
+        Args:
+            discovered_device: Discover device.
+        """
+        click.echo(json.dumps(discovered_device, indent=2))
+
     def progress(_serial_number: str) -> None:
         """Handle progress updates during device discovery.
 
@@ -48,5 +57,5 @@ def send_discover_telegram(ctx: click.Context) -> None:
     service: ConbusDiscoverService = (
         ctx.obj.get("container").get_container().resolve(ConbusDiscoverService)
     )
-    with service:
-        service.start(progress, on_finish, 0.5)
+    service.run(progress, on_device_discovered, on_finish, 5)
+    service.start_reactor()

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/cli/main.py

@@ -56,7 +56,7 @@ def cli(ctx: click.Context) -> None:
 
     # xp
     logging.getLogger("xp").setLevel(logging.DEBUG)
-    logging.getLogger("xp.services.homekit").setLevel(logging.WARNING)
+    logging.getLogger("xp.services.homekit").setLevel(logging.DEBUG)
 
     # pyhap
     logging.getLogger("pyhap").setLevel(logging.WARNING)

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/models/homekit/homekit_config.py

@@ -55,6 +55,8 @@ class HomekitAccessoryConfig(BaseModel):
         output_number: Output number for the accessory.
         description: Description of the accessory.
         service: Service type for the accessory.
+        on_action: on code for the accessory.
+        off_action: off code for the accessory.
         hap_accessory: Optional HAP accessory identifier.
     """
 
@@ -64,6 +66,8 @@ class HomekitAccessoryConfig(BaseModel):
     output_number: int
     description: str
     service: str
+    on_action: str
+    off_action: str
     hap_accessory: Optional[int] = None
 
 

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/models/protocol/conbus_protocol.py

@@ -12,6 +12,7 @@ from xp.models.homekit.homekit_conson_config import ConsonModuleConfig
 from xp.models.telegram.datapoint_type import DataPointType
 
 if TYPE_CHECKING:
+    from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
     from xp.services.protocol.conbus_protocol import ConbusProtocol
     from xp.services.protocol.telegram_protocol import TelegramProtocol
 
@@ -61,11 +62,15 @@ class SendActionEvent(BaseEvent):
         serial_number: Serial number of the light bulb set.
         output_number: Output number of the light bulb set.
         value: Set light bulb On or Off (True/False).
+        on_action: On action E00L00I00.
+        off_action: On action E00L00I04.
     """
 
     serial_number: str = Field(description="Serial number of the light bulb set")
     output_number: int = Field(description="Output number of the light bulb set")
     value: bool = Field(description="Set light bulb On or Off (True/False)")
+    on_action: str = Field(description="on action")
+    off_action: str = Field(description="off action")
 
 
 class DatapointEvent(BaseEvent):
@@ -245,7 +250,7 @@ class TelegramEvent(BaseEvent):
         checksum_valid: Checksum valid true or false.
     """
 
-    protocol: Union[TelegramProtocol, ConbusProtocol] = Field(
+    protocol: Union[TelegramProtocol, ConbusProtocol, ConbusEventProtocol] = Field(
         description="TelegramProtocol instance"
     )
     frame: str = Field(description="Frame <S0123450001F02D12FK>")

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/services/conbus/conbus_datapoint_service.py

@@ -130,6 +130,7 @@ class ConbusDatapointService(ConbusProtocol):
         self.service_response.data_value = datapoint_telegram.data_value
         if self.datapoint_finished_callback:
             self.datapoint_finished_callback(self.service_response)
+        self._stop_reactor()
 
     def failed(self, message: str) -> None:
         """Handle failed connection event.

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/services/conbus/conbus_discover_service.py

@@ -7,49 +7,57 @@ discover telegrams to find modules on the network.
 import logging
 from typing import Callable, Optional
 
-from twisted.internet.posixbase import PosixReactorBase
-
-from xp.models import ConbusClientConfig, ConbusDiscoverResponse
+from xp.models import ConbusDiscoverResponse
 from xp.models.conbus.conbus_discover import DiscoveredDevice
 from xp.models.protocol.conbus_protocol import TelegramReceivedEvent
 from xp.models.telegram.datapoint_type import DataPointType
 from xp.models.telegram.module_type_code import MODULE_TYPE_REGISTRY
 from xp.models.telegram.system_function import SystemFunction
 from xp.models.telegram.telegram_type import TelegramType
-from xp.services.protocol.conbus_protocol import ConbusProtocol
+from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
 
 
-class ConbusDiscoverService(ConbusProtocol):
+class ConbusDiscoverService:
     """
     Service for discovering modules on Conbus servers.
 
     Uses ConbusProtocol to provide discovery functionality for finding
     modules connected to the Conbus network.
+
+    Attributes:
+        conbus_protocol: Protocol instance for Conbus communication.
     """
 
-    def __init__(
-        self,
-        cli_config: ConbusClientConfig,
-        reactor: PosixReactorBase,
-    ) -> None:
+    conbus_protocol: ConbusEventProtocol
+
+    def __init__(self, conbus_protocol: ConbusEventProtocol) -> None:
         """Initialize the Conbus discover service.
 
         Args:
-            cli_config: Conbus client configuration.
-            reactor: Twisted reactor instance.
+            conbus_protocol: ConbusProtocol.
         """
-        super().__init__(cli_config, reactor)
         self.progress_callback: Optional[Callable[[str], None]] = None
+        self.device_discover_callback: Optional[Callable[[DiscoveredDevice], None]] = (
+            None
+        )
         self.finish_callback: Optional[Callable[[ConbusDiscoverResponse], None]] = None
 
+        self.conbus_protocol: ConbusEventProtocol = conbus_protocol
+        self.conbus_protocol.on_connection_made.connect(self.connection_made)
+        self.conbus_protocol.on_telegram_sent.connect(self.telegram_sent)
+        self.conbus_protocol.on_telegram_received.connect(self.telegram_received)
+        self.conbus_protocol.on_timeout.connect(self.timeout)
+        self.conbus_protocol.on_failed.connect(self.failed)
+
         self.discovered_device_result = ConbusDiscoverResponse(success=False)
         # Set up logging
         self.logger = logging.getLogger(__name__)
 
-    def connection_established(self) -> None:
+    def connection_made(self) -> None:
         """Handle connection established event."""
-        self.logger.debug("Connection established, sending discover telegram")
-        self.send_telegram(
+        self.logger.debug("Connection established")
+        self.logger.debug("Sending discover telegram")
+        self.conbus_protocol.send_telegram(
             telegram_type=TelegramType.SYSTEM,
             serial_number="0000000000",
             system_function=SystemFunction.DISCOVERY,
@@ -83,7 +91,7 @@ class ConbusDiscoverService(ConbusProtocol):
             and telegram_received.payload[11:16] == "F01D"
             and len(telegram_received.payload) == 15
         ):
-            self.discovered_device(telegram_received.serial_number)
+            self.handle_discovered_device(telegram_received.serial_number)
 
         # Check for module type response (F02D07)
         elif (
@@ -109,7 +117,7 @@ class ConbusDiscoverService(ConbusProtocol):
         else:
             self.logger.debug("Not a discover or module type response")
 
-    def discovered_device(self, serial_number: str) -> None:
+    def handle_discovered_device(self, serial_number: str) -> None:
         """Handle discovered device event.
 
         Args:
@@ -128,22 +136,17 @@ class ConbusDiscoverService(ConbusProtocol):
         }
         self.discovered_device_result.discovered_devices.append(device)
 
+        if self.device_discover_callback:
+            self.device_discover_callback(device)
+
         # Send READ_DATAPOINT telegram to query module type
         self.logger.debug(f"Sending module type query for {serial_number}")
-        self.send_telegram(
+        self.conbus_protocol.send_telegram(
             telegram_type=TelegramType.SYSTEM,
             serial_number=serial_number,
             system_function=SystemFunction.READ_DATAPOINT,
             data_value=DataPointType.MODULE_TYPE.value,
         )
-
-        self.send_telegram(
-            telegram_type=TelegramType.SYSTEM,
-            serial_number=serial_number,
-            system_function=SystemFunction.READ_DATAPOINT,
-            data_value=DataPointType.MODULE_TYPE_CODE.value,
-        )
-
         if self.progress_callback:
             self.progress_callback(serial_number)
 
@@ -190,11 +193,27 @@ class ConbusDiscoverService(ConbusProtocol):
                 if device["serial_number"] == serial_number:
                     device["module_type_code"] = code
                     device["module_type_name"] = module_type_name
+
+                    if self.device_discover_callback:
+                        self.device_discover_callback(device)
+
                     self.logger.debug(
                         f"Updated device {serial_number} with module_type {module_type_name}"
                     )
                     break
 
+        if self.discovered_device_result.discovered_devices:
+            for device in self.discovered_device_result.discovered_devices:
+                if not (
+                    device["serial_number"]
+                    and device["module_type"]
+                    and device["module_type_code"]
+                    and device["module_type_name"]
+                ):
+                    return
+
+        self.succeed()
+
     def handle_module_type_response(self, serial_number: str, module_type: str) -> None:
         """Handle module type response and update discovered device.
 
@@ -212,19 +231,28 @@ class ConbusDiscoverService(ConbusProtocol):
                     self.logger.debug(
                         f"Updated device {serial_number} with module_type {module_type}"
                     )
+                    if self.device_discover_callback:
+                        self.device_discover_callback(device)
+
                     break
 
-    def timeout(self) -> bool:
-        """Handle timeout event to stop discovery.
+        self.conbus_protocol.send_telegram(
+            telegram_type=TelegramType.SYSTEM,
+            serial_number=serial_number,
+            system_function=SystemFunction.READ_DATAPOINT,
+            data_value=DataPointType.MODULE_TYPE_CODE.value,
+        )
 
-        Returns:
-            False to stop the reactor.
-        """
-        self.logger.info("Discovery stopped after: %ss", self.timeout_seconds)
-        self.discovered_device_result.success = True
+    def timeout(self) -> None:
+        """Handle timeout event to stop discovery."""
+        timeout = self.conbus_protocol.timeout_seconds
+        self.logger.info("Discovery stopped after: %ss", timeout)
+        self.discovered_device_result.success = False
+        self.discovered_device_result.error = "Discovered device timeout"
         if self.finish_callback:
             self.finish_callback(self.discovered_device_result)
-        return False
+
+        self.stop_reactor()
 
     def failed(self, message: str) -> None:
         """Handle failed connection event.
@@ -238,9 +266,32 @@ class ConbusDiscoverService(ConbusProtocol):
         if self.finish_callback:
             self.finish_callback(self.discovered_device_result)
 
-    def start(
+        self.stop_reactor()
+
+    def succeed(self) -> None:
+        """Handle discovered device success event."""
+        self.logger.debug("Succeed")
+        self.discovered_device_result.success = True
+        self.discovered_device_result.error = None
+        if self.finish_callback:
+            self.finish_callback(self.discovered_device_result)
+
+        self.stop_reactor()
+
+    def stop_reactor(self) -> None:
+        """Stop reactor."""
+        self.logger.info("Stopping reactor")
+        self.conbus_protocol.stop_reactor()
+
+    def start_reactor(self) -> None:
+        """Start reactor."""
+        self.logger.info("Starting reactor")
+        self.conbus_protocol.start_reactor()
+
+    def run(
         self,
         progress_callback: Callable[[str], None],
+        device_discover_callback: Callable[[DiscoveredDevice], None],
         finish_callback: Callable[[ConbusDiscoverResponse], None],
         timeout_seconds: Optional[float] = None,
     ) -> None:
@@ -248,12 +299,14 @@ class ConbusDiscoverService(ConbusProtocol):
 
         Args:
             progress_callback: Callback for each discovered device.
+            device_discover_callback: Callback for each discovered device.
             finish_callback: Callback when discovery completes.
             timeout_seconds: Optional timeout in seconds.
         """
         self.logger.info("Starting discovery")
+
         if timeout_seconds:
-            self.timeout_seconds = timeout_seconds
+            self.conbus_protocol.timeout_seconds = timeout_seconds
         self.progress_callback = progress_callback
+        self.device_discover_callback = device_discover_callback
         self.finish_callback = finish_callback
-        self.start_reactor()

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/services/homekit/homekit_conbus_service.py

@@ -12,7 +12,6 @@ from xp.models.protocol.conbus_protocol import (
     SendActionEvent,
     SendWriteConfigEvent,
 )
-from xp.models.telegram.action_type import ActionType
 from xp.models.telegram.datapoint_type import DataPointType
 from xp.models.telegram.system_function import SystemFunction
 from xp.services.protocol.telegram_protocol import TelegramProtocol
@@ -87,11 +86,8 @@ class HomeKitConbusService:
         """
         self.logger.debug(f"send_action_event {event}")
 
-        action_value = (
-            ActionType.ON_RELEASE.value if event.value else ActionType.OFF_PRESS.value
-        )
-        input_action = f"{event.output_number:02d}{action_value}"
-        telegram = (
-            f"S{event.serial_number}F{SystemFunction.ACTION.value}D{input_action}"
-        )
-        self.telegram_protocol.sendFrame(telegram.encode())
+        telegram = event.on_action if event.value else event.off_action
+        telegram_make = f"{telegram}M"
+        telegram_break = f"{telegram}B"
+        self.telegram_protocol.sendFrame(telegram_make.encode())
+        self.telegram_protocol.sendFrame(telegram_break.encode())

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/services/homekit/homekit_lightbulb_service.py

@@ -77,6 +77,8 @@ class HomeKitLightbulbService:
             serial_number=event.serial_number,
             output_number=event.output_number,
             value=event.value,
+            on_action=event.accessory.on_action,
+            off_action=event.accessory.off_action,
         )
 
         self.logger.debug(f"Dispatching SendActionEvent for {event.serial_number}")

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/services/homekit/homekit_outlet.py

@@ -134,19 +134,18 @@ class Outlet(Accessory):
             value: True to turn on, False to turn off.
         """
         # Emit set event
-        self.logger.debug(f"set_on {value}")
-
-        if value != self.is_on:
-            self.is_on = value
-            self.event_bus.dispatch(
-                OutletSetOnEvent(
-                    serial_number=self.accessory.serial_number,
-                    output_number=self.accessory.output_number,
-                    module=self.module,
-                    accessory=self.accessory,
-                    value=value,
-                )
+        self.logger.debug(f"set_on {value} {self.is_on}")
+
+        self.is_on = value
+        self.event_bus.dispatch(
+            OutletSetOnEvent(
+                serial_number=self.accessory.serial_number,
+                output_number=self.accessory.output_number,
+                module=self.module,
+                accessory=self.accessory,
+                value=value,
             )
+        )
 
     def get_on(self) -> bool:
         """Get the on/off state of the outlet.

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/services/homekit/homekit_outlet_service.py

@@ -85,6 +85,8 @@ class HomeKitOutletService:
             serial_number=event.serial_number,
             output_number=event.output_number,
             value=event.value,
+            on_action=event.accessory.on_action,
+            off_action=event.accessory.off_action,
         )
 
         self.logger.debug(f"Dispatching SendActionEvent for {event.serial_number}")

{conson_xp-1.14.0 → conson_xp-1.16.0}/src/xp/services/protocol/__init__.py

@@ -7,10 +7,11 @@ from xp.models.protocol.conbus_protocol import (
     ModuleDiscoveredEvent,
     TelegramReceivedEvent,
 )
+from xp.services.protocol.conbus_event_protocol import ConbusEventProtocol
 from xp.services.protocol.conbus_protocol import ConbusProtocol
 from xp.services.protocol.telegram_protocol import TelegramProtocol
 
-__all__ = ["TelegramProtocol", "ConbusProtocol"]
+__all__ = ["TelegramProtocol", "ConbusProtocol", "ConbusEventProtocol"]
 
 # Rebuild models after TelegramProtocol and ConbusProtocol are imported to resolve forward references
 ConnectionMadeEvent.model_rebuild()