ramses-rf 0.52.4__py3-none-any.whl → 0.52.5__py3-none-any.whl

ramses_tx/protocol.py

@@ -66,7 +66,7 @@ class _BaseProtocol(asyncio.Protocol):
         self._msg_handler = msg_handler
         self._msg_handlers: list[MsgHandlerT] = []
 
-        self._transport: RamsesTransportT = None  # type: ignore[assignment]
+        self._transport: RamsesTransportT | None = None
         self._loop = asyncio.get_running_loop()
 
         self._pause_writing = False  # FIXME: Start in R/O mode as no connection yet?
@@ -80,6 +80,9 @@ class _BaseProtocol(asyncio.Protocol):
 
         self._is_evofw3: bool | None = None
 
+        self._active_hgi: DeviceIdT | None = None
+        self._context: ProtocolContext | None = None
+
     @property
     def hgi_id(self) -> DeviceIdT:
         return HGI_DEV_ADDR.id
@@ -140,7 +143,16 @@ class _BaseProtocol(asyncio.Protocol):
         received or the connection was aborted or closed).
         """
 
-        assert self._wait_connection_lost  # mypy
+        # FIX: Check if _wait_connection_lost exists before asserting
+        # This handles cases where connection was never fully established (e.g. timeout)
+        if not self._wait_connection_lost:
+            _LOGGER.debug(
+                "connection_lost called but no connection was established (ignoring)"
+            )
+            # Reset the connection made future for next attempt
+            if self._wait_connection_made.done():
+                self._wait_connection_made = self._loop.create_future()
+            return
 
         if self._wait_connection_lost.done():  # BUG: why is callback invoked twice?
             return
@@ -199,6 +211,10 @@ class _BaseProtocol(asyncio.Protocol):
 
         self._pause_writing = False
 
+    async def _send_impersonation_alert(self, cmd: Command) -> None:
+        """Allow the Protocol to send an impersonation alert (stub)."""
+        return
+
     async def send_cmd(
         self,
         cmd: Command,
@@ -207,22 +223,64 @@ class _BaseProtocol(asyncio.Protocol):
         gap_duration: float = DEFAULT_GAP_DURATION,
         num_repeats: int = DEFAULT_NUM_REPEATS,
         priority: Priority = Priority.DEFAULT,
-        qos: QosParams = DEFAULT_QOS,
+        qos: QosParams = DEFAULT_QOS,  # max_retries, timeout, wait_for_reply
     ) -> Packet:
-        """This is the wrapper for self._send_cmd(cmd)."""
+        """Send a Command with Qos (with retries, until success or ProtocolError).
 
-        # if not self._transport:
-        #     raise exc.ProtocolSendFailed("There is no connected Transport")
+        Returns the Command's response Packet or the Command echo if a response is not
+        expected (e.g. sending an RP).
 
-        if _DBG_FORCE_LOG_PACKETS:
-            _LOGGER.warning(f"QUEUED:     {cmd}")
-        else:
-            _LOGGER.debug(f"QUEUED:     {cmd}")
+        If wait_for_reply is True, return the RQ's RP (or W's I), or raise an exception
+        if one doesn't arrive. If it is False, return the echo of the Command only. If
+        it is None (the default), act as True for RQs, and False for all other Commands.
 
-        if self._pause_writing:
-            raise exc.ProtocolError("The Protocol is currently read-only/paused")
+        num_repeats is # of times to send the Command, in addition to the fist transmit,
+        with gap_duration seconds between each transmission. If wait_for_reply is True,
+        then num_repeats is ignored.
+
+        Commands are queued and sent FIFO, except higher-priority Commands are always
+        sent first.
+
+        Will raise:
+            ProtocolSendFailed: tried to Tx Command, but didn't get echo/reply
+            ProtocolError:      didn't attempt to Tx Command for some reason
+        """
 
-        return await self._send_cmd(
+        assert gap_duration == DEFAULT_GAP_DURATION
+        assert 0 <= num_repeats <= 3  # if QoS, only Tx x1, with no repeats
+
+        # FIX: Patch command with actual HGI ID if it uses the default placeholder
+        # NOTE: HGI80s (TI 3410) require the default ID (18:000730), or they will silent-fail
+        if (
+            self._active_hgi
+            and self._is_evofw3  # Only patch if using evofw3 (not HGI80)
+            and cmd._addrs[0].id == HGI_DEV_ADDR.id
+            and self._active_hgi != HGI_DEV_ADDR.id
+        ):
+            # The command uses the default 18:000730, but we know the real ID.
+            # Reconstruct the command string with the correct address.
+
+            # Get current addresses as strings
+            new_addrs = [a.id for a in cmd._addrs]
+
+            # ONLY patch the Source Address (Index 0).
+            # Leave Dest (Index 1/2) alone to avoid breaking tests that expect 18:000730 there.
+            new_addrs[0] = self._active_hgi
+
+            new_frame = f"{cmd.verb} {cmd.seqn} {new_addrs[0]} {new_addrs[1]} {new_addrs[2]} {cmd.code} {int(cmd.len_):03d} {cmd.payload}"
+            cmd = Command(new_frame)
+
+        if qos and not self._context:
+            _LOGGER.warning(f"{cmd} < QoS is currently disabled by this Protocol")
+
+        if cmd.src.id != self.hgi_id:  # Was HGI_DEV_ADDR.id
+            await self._send_impersonation_alert(cmd)
+
+        if qos.wait_for_reply and num_repeats:
+            _LOGGER.warning(f"{cmd} < num_repeats set to 0, as wait_for_reply is True")
+            num_repeats = 0  # the lesser crime over wait_for_reply=False
+
+        pkt = await self._send_cmd(  # may: raise ProtocolError/ProtocolSendFailed
             cmd,
             gap_duration=gap_duration,
             num_repeats=num_repeats,
@@ -230,6 +288,11 @@ class _BaseProtocol(asyncio.Protocol):
             qos=qos,
         )
 
+        if not pkt:  # HACK: temporary workaround for returning None
+            raise exc.ProtocolSendFailed(f"Failed to send command: {cmd} (REPORT THIS)")
+
+        return pkt
+
     async def _send_cmd(
         self,
         cmd: Command,
@@ -249,6 +312,10 @@ class _BaseProtocol(asyncio.Protocol):
         self, frame: str, num_repeats: int = 0, gap_duration: float = 0.0
     ) -> None:  # _send_frame() -> transport
         """Write to the transport."""
+
+        if self._transport is None:
+            raise exc.ProtocolSendFailed("Transport is not connected")
+
         await self._transport.write_frame(frame)
         for _ in range(num_repeats - 1):
             await asyncio.sleep(gap_duration)
@@ -555,8 +622,17 @@ class PortProtocol(_DeviceIdFilterMixin, _BaseProtocol):
         super().connection_made(transport)
         # TODO: needed? self.resume_writing()
 
-        self._set_active_hgi(self._transport.get_extra_info(SZ_ACTIVE_HGI))
-        self._is_evofw3 = self._transport.get_extra_info(SZ_IS_EVOFW3)
+        # ROBUSTNESS FIX: Ensure self._transport is set even if the wait future was cancelled
+        if self._transport is None:
+            _LOGGER.warning(
+                f"{self}: Transport bound after wait cancelled (late connection)"
+            )
+            self._transport = transport
+
+        # Safe access with check (optional but recommended)
+        if self._transport:
+            self._set_active_hgi(self._transport.get_extra_info(SZ_ACTIVE_HGI))
+            self._is_evofw3 = self._transport.get_extra_info(SZ_IS_EVOFW3)
 
         if not self._context:
             return
@@ -656,6 +732,8 @@ class PortProtocol(_DeviceIdFilterMixin, _BaseProtocol):
         #         f"{self}: Failed to send {cmd._hdr}: excluded by list"
         #     )
 
+        assert self._context
+
         try:
             return await self._context.send_cmd(send_cmd, cmd, priority, qos)
         # except InvalidStateError as err:  # TODO: handle InvalidStateError separately
@@ -701,9 +779,6 @@ class PortProtocol(_DeviceIdFilterMixin, _BaseProtocol):
         if qos and not self._context:
             _LOGGER.warning(f"{cmd} < QoS is currently disabled by this Protocol")
 
-        if cmd.src.id != HGI_DEV_ADDR.id:  # or actual HGI addr
-            await self._send_impersonation_alert(cmd)
-
         if qos.wait_for_reply and num_repeats:
             _LOGGER.warning(f"{cmd} < num_repeats set to 0, as wait_for_reply is True")
             num_repeats = 0  # the lesser crime over wait_for_reply=False

ramses_tx/transport.py

@@ -103,7 +103,7 @@ if TYPE_CHECKING:
 
 
 _DEFAULT_TIMEOUT_PORT: Final[float] = 3
-_DEFAULT_TIMEOUT_MQTT: Final[float] = 9
+_DEFAULT_TIMEOUT_MQTT: Final[float] = 60  # Updated from 9s to 60s for robustness
 
 _SIGNATURE_GAP_SECS = 0.05
 _SIGNATURE_MAX_TRYS = 40  # was: 24
@@ -1368,7 +1368,13 @@ class MqttTransport(_FullTransport, _MqttTransportAbstractor):
             )
         # FIXME: convert all dt early, and convert to aware, i.e. dt.now().astimezone()
 
-        self._frame_read(dtm.isoformat(), _normalise(payload["msg"]))
+        try:
+            self._frame_read(dtm.isoformat(), _normalise(payload["msg"]))
+        except exc.TransportError:
+            # If the transport is closing, we expect this error and can safely ignore it
+            # prevents "Uncaught thread exception" in paho.mqtt client
+            if not self._closing:
+                raise
 
     async def write_frame(self, frame: str, disable_tx_limits: bool = False) -> None:
         """Transmit a frame via the underlying handler (e.g. serial port, MQTT).
@@ -1572,13 +1578,31 @@ async def transport_factory(
     assert port_config is not None  # mypy check
 
     # MQTT
-    if port_name[:4] == "mqtt":  # TODO: handle disable_sending
+    if port_name[:4] == "mqtt":
+        # Check for custom timeout in kwargs, fallback to constant
+        mqtt_timeout = kwargs.get("timeout", _DEFAULT_TIMEOUT_MQTT)
+
         transport = MqttTransport(
-            port_name, protocol, extra=extra, loop=loop, log_all=log_all, **kwargs
+            port_name,
+            protocol,
+            disable_sending=bool(
+                disable_sending
+            ),  # Feature Added: handled disable_sending
+            extra=extra,
+            loop=loop,
+            log_all=log_all,
+            **kwargs,
         )
 
-        # TODO: remove this? better to invoke timeout after factory returns?
-        await protocol.wait_for_connection_made(timeout=_DEFAULT_TIMEOUT_MQTT)
+        try:
+            # Robustness Fix: Wait with timeout, handle failure gracefully
+            await protocol.wait_for_connection_made(timeout=mqtt_timeout)
+        except Exception:
+            # CRITICAL FIX: Close the transport if setup fails to prevent "Zombie" callbacks
+            # This prevents the "AttributeError: 'NoneType'..." crash later on
+            transport.close()
+            raise
+
         return transport
 
     # Serial

ramses_tx/version.py

@@ -1,4 +1,4 @@
 """RAMSES RF - a RAMSES-II protocol decoder & analyser (transport layer)."""
 
-__version__ = "0.52.4"
+__version__ = "0.52.5"
 VERSION = __version__