python-mobius 0.4.1__py3-none-any.whl → 0.4.3__py3-none-any.whl

mobius/__init__.py

@@ -65,7 +65,7 @@ from .discovery import (
     discover_tank,
 )
 
-__version__ = "0.4.1"
+__version__ = "0.4.3"
 
 __all__ = [
     "__version__",

mobius/device.py

@@ -843,9 +843,11 @@ class MobiusDevice:
         build_rloc_address(), which is for the different case of only
         having a 2-byte short address to encode into the prefix's last 2
         bytes -- here the full 8-byte suffix is already present in the
-        entry, so it's used as-is); bytes 8-11 are a 4-byte "age" value
-        (see MeshPeer's own docstring for the important caveat that its
-        exact meaning isn't confirmed); bytes 12-13 are the 2-byte model
+        entry, so it's used as-is); bytes 8-11 are a 4-byte unsigned
+        "age" value in milliseconds -- confirmed to mean time since this
+        peer was last heard from over the mesh, a resetting value, not
+        time since first discovered (see MeshPeer's own docstring for
+        the full detail); bytes 12-13 are the 2-byte model
         ID; bytes 14-27 are the 14-byte ASCII serial number, matching the
         SerialNumberArray format used elsewhere in this library. All
         multi-byte numeric fields are read little-endian -- confirmed
@@ -888,7 +890,13 @@ class MobiusDevice:
             if len(entry) != 28:
                 continue
             address = prefix + entry[0:8]
-            age = struct.unpack("<i", entry[8:12])[0]
+            # Unsigned -- confirmed via reverse engineering the app's own
+            # network-troubleshooting screen, which explicitly treats this
+            # same 4-byte field as an unsigned value before ever using it
+            # for anything else. See MeshPeer's own docstring for the full,
+            # now-confirmed meaning (milliseconds since this peer was last
+            # heard from over the mesh).
+            age = struct.unpack("<I", entry[8:12])[0]
             model_raw = struct.unpack("<h", entry[12:14])[0]
             try:
                 serial = entry[14:28].decode("ascii").rstrip("\x00")

mobius/device_status.py

@@ -130,18 +130,27 @@ class MeshPeer:
     `age` is only ever set by discover_networked_thread_devices() --
     None from every other source of MeshPeer, including
     discover_mesh_peers() and discover_mesh_peers_via_direct_connect().
-    Confirmed present as a raw 4-byte field in the wire format, but its
-    exact unit/meaning (freshness of the gateway's own knowledge of this
-    peer, most likely, given the name -- but not confirmed against real
-    hardware) is not confirmed; treat it as an opaque, larger-is-probably-
-    less-fresh value rather than a specific unit of time unless verified.
+    Confirmed via reverse engineering the app's own network-
+    troubleshooting screen: milliseconds since this specific peer was
+    last heard from over the Thread mesh, as far as the connected
+    gateway currently knows -- NOT time since it was first discovered
+    or added to the tank. A RESETTING value, not a monotonic one: it
+    legitimately drops back toward zero whenever the mesh genuinely
+    receives fresh activity from that peer, which happens on its own
+    schedule, independent of whenever this is read. Two checks in
+    quick succession can validly show a SMALLER age the second time --
+    that's expected, not a parsing error. The app's own troubleshooting
+    screen treats anything over roughly 5 minutes (300000) as long
+    enough to flag that peer as currently unreachable/failed, which is
+    a reasonable rule of thumb for interpreting this value generally,
+    though not enforced by this library itself.
     """
     serial: str
     model_raw: int
     model: Optional[Model]  # None if model_raw doesn't match a known Model value
     short_address: int
     address: bytes  # 16-byte Thread mesh-local IPv6, ready to pass to encode_coap_request()
-    age: Optional[int] = None  # see docstring -- only set by discover_networked_thread_devices()
+    age: Optional[int] = None  # milliseconds since last heard from on the mesh -- see docstring above
 
 
 @dataclass

mobius/relay.py

@@ -177,12 +177,52 @@ class RelayedMobiusDevice(MobiusDevice):
         embedded in its payload (confirmed via reverse engineering:
         coapRequest.getToken() == coapResponse.getToken()) -- never by
         this outer frame's own message ID.
+
+        Retries exactly once on a timeout before actually raising --
+        confirmed via reverse engineering the app's own request-timeout
+        handling: it never treats a single timed-out relay round-trip as
+        a real failure, always transparently retrying (fresh send, same
+        request) once first, only surfacing a failure if the retry ALSO
+        times out. A relayed round-trip crosses BLE (to the gateway) and
+        then the Thread mesh itself (gateway to target and back) -- a
+        single dropped/delayed packet somewhere in that longer path is
+        evidently common enough that the app was built assuming it will
+        happen regularly, not as an edge case. Each attempt gets its own
+        fresh CoAP token (this library generates one per call already,
+        not tied to a single request object the way the app's own retry
+        reuses one) -- deliberately, so a late, delayed response to the
+        first, abandoned attempt can never be mismatched against the
+        retry's own, separate wait.
         """
         if not self.gateway.is_connected:
             raise IOError(
                 f"gateway device is not connected -- cannot relay to {self.peer.serial!r} through it"
             )
 
+        last_timeout_token: Optional[int] = None
+        for attempt in (1, 2):
+            try:
+                return await self._relay_attempt(inner_request_frame, is_retry=(attempt == 2))
+            except asyncio.TimeoutError as err:
+                last_timeout_token = err.args[0] if err.args else None
+                if attempt == 1 and self.debug:
+                    print(f"    [relay debug] timed out waiting {self.timeout}s for "
+                          f"{self.peer.serial!r} -- retrying once before giving up")
+                continue
+
+        raise IOError(
+            f"timed out waiting {self.timeout}s for a relayed response from target "
+            f"{self.peer.serial!r} (no CoAP indication received for token {last_timeout_token}, "
+            f"even after one retry)"
+        )
+
+    async def _relay_attempt(self, inner_request_frame: bytes, is_retry: bool) -> ParsedFrame:
+        """One full send-and-await cycle for _relay() -- split out so
+        _relay() itself can retry it once on a timeout without
+        duplicating this whole body. Raises asyncio.TimeoutError itself
+        (not wrapped in IOError) specifically so _relay() can catch just
+        that case to decide whether to retry; every other exception here
+        propagates as-is, unwrapped, straight out of _relay() too."""
         token = next_coap_token()
         # Confirmed always GET regardless of the inner operation -- see
         # this module's docstring for why.
@@ -193,7 +233,8 @@ class RelayedMobiusDevice(MobiusDevice):
         outer_frame = build_frame(OPGROUP_C2CI_REQUEST, COAP_OPCODE, coap_payload, outer_message_id)
 
         if self.debug:
-            print(f"    [relay debug] inner request frame ({len(inner_request_frame)}B): "
+            retry_note = " (retry)" if is_retry else ""
+            print(f"    [relay debug] inner request frame{retry_note} ({len(inner_request_frame)}B): "
                   f"{inner_request_frame.hex()}")
             print(f"    [relay debug] target address: {self.peer.address.hex()}  token: {token}")
             print(f"    [relay debug] outer request frame ({len(outer_frame)}B): {outer_frame.hex()}")
@@ -220,10 +261,7 @@ class RelayedMobiusDevice(MobiusDevice):
             coap_response = await asyncio.wait_for(coap_future, timeout=self.timeout)
         except asyncio.TimeoutError:
             self.gateway._pending_coap_tokens.pop(token, None)
-            raise IOError(
-                f"timed out waiting {self.timeout}s for a relayed response from target "
-                f"{self.peer.serial!r} (no CoAP indication received for token {token})"
-            )
+            raise asyncio.TimeoutError(token) from None
         finally:
             if self.debug:
                 self.gateway.on_any_frame = previous_hook

mobius/schedule.py

@@ -235,6 +235,16 @@ class PumpSchedulePoint:
             return None
         return cls(time_minutes, flags, PumpPrimitiveValue.parse(data[3:]))
 
+    def has(self, flag: int) -> bool:
+        # Same flags field, same bit meanings as SchedulePoint's own
+        # has() (see this class's own docstring: identical wire format,
+        # just different primitiveData) -- an earlier version of this
+        # class omitted this entirely, which crashed mobius.cli's own
+        # --dump-schedule for pumps specifically (its own _format_flags()
+        # helper is shared between the light and pump branches, calling
+        # point.has() either way).
+        return (self.flags & flag) == flag
+
 
 def get_active_pump_block(points: list[PumpSchedulePoint], minute_of_day: int) -> Optional[PumpSchedulePoint]:
     """

{python_mobius-0.4.1.dist-info → python_mobius-0.4.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: python-mobius
-Version: 0.4.1
+Version: 0.4.3
 Summary: Reverse-engineered Python client for the Mobius BLE protocol (EcoTech Marine VorTech/Radion, AquaIllumination, Neptune Systems, NYOS)
 Project-URL: Homepage, https://code.r3pek.org/r3pek/python-mobius
 Project-URL: Documentation, https://code.r3pek.org/r3pek/python-mobius/src/branch/main/documentation

{python_mobius-0.4.1.dist-info → python_mobius-0.4.3.dist-info}/RECORD

@@ -1,10 +1,10 @@
-mobius/__init__.py,sha256=JtPqSR-tQWJR9NA4fRAdqZiSvapwQyk6AI-cKu5tKSc,5722
+mobius/__init__.py,sha256=7MOkrkQcDD7HLG5C7hKh5BTzUp0PmB5ZfIa3esYn2Nc,5722
 mobius/cli.py,sha256=8XH-pVTX4KObzd0IOGXicT7KrcNEjm5xYZS8JOWfHDA,30726
 mobius/coap.py,sha256=eXf_-9heQD1UjLyqZU9KA-c0jB50NGzAd8D7d6kFMb0,10750
 mobius/constants.py,sha256=z_KrFev5vGD9-9lKn4J0nGVtzTmelGQ13bYlVcCdjm0,25217
 mobius/crc.py,sha256=kLtAYWZvLbo5_p9ep08ZlLg5Yah8Q2qq0IwTvqbBGW0,2700
-mobius/device.py,sha256=Ln3LFWIMUQVhcCnAKXxZ3JiKuEDqmFJVHWQvikCQTyM,78538
-mobius/device_status.py,sha256=4mHpwr3v4TvMtNXsLCoz5uOVsmsERC-u6RIha8ss9v4,7797
+mobius/device.py,sha256=H5JGFtV90xu69jEOydMPqpj53e-5ws6TUVej0xd7WSg,79078
+mobius/device_status.py,sha256=p1l6RpCcg_G4p9nudhSo8MzBSgqkH8m5_0qrnjsFQ2k,8374
 mobius/discovery.py,sha256=LqHOEA_j1ZROuounn3PPmy8IEbpL6-N1TOW1MpoKg6A,11619
 mobius/frame.py,sha256=UNLTHuzVue5b6L4nv1hWJTSbn5k8lETWdsiL_52yI0Q,6141
 mobius/manufacturer.py,sha256=8-vBzckN8xmsPSMj5EWtOCXenbyQueoY5pnZHePgb_k,1937
@@ -12,10 +12,10 @@ mobius/mesh_address.py,sha256=PKQ-mm7Z4bY11ZnVmeWZO9EmOiAHp8hNtXceMGMs2tk,5940
 mobius/modifiers.py,sha256=zWJCsjaJ4TtwS1QgQoRFH-ve1mykuPWn5KX4YQpNqco,7215
 mobius/power.py,sha256=5l9ehjNCDrSsJjQkaU4M6pYnSMqw2FVF8Ogg6KIE5vQ,3844
 mobius/pump_status.py,sha256=RWTl8ZViCFDbiFU2mX-WAIH_cWhZOZ0M2B0oYXnPx3Y,1598
-mobius/relay.py,sha256=tMpV_67CYt9A1L_DPERzbqOgy3BOdG4NZpAG_IlefhY,16587
-mobius/schedule.py,sha256=3p7uZ8iYu_g7GUUy3S8X85qZHMNOMpwULhFw8SCnuls,10430
-python_mobius-0.4.1.dist-info/METADATA,sha256=VLOuzyUhBqful8QD76B2xjyAjIRRcGNVNGMtEmzJIfw,5952
-python_mobius-0.4.1.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_mobius-0.4.1.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
-python_mobius-0.4.1.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
-python_mobius-0.4.1.dist-info/RECORD,,
+mobius/relay.py,sha256=bo2uUV6HhHD_-LuH4CkuPJtnKGQGM6crmB6kLAU8i4E,18857
+mobius/schedule.py,sha256=d5iAHvKuFDwfbrSptPx6viiA_lj2qGfWhsZwM_Bpr1k,10974
+python_mobius-0.4.3.dist-info/METADATA,sha256=Iht60XXLlvjteO-wjyLMwUlzeKGlDKRL-mgIlv-sHx8,5952
+python_mobius-0.4.3.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+python_mobius-0.4.3.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
+python_mobius-0.4.3.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
+python_mobius-0.4.3.dist-info/RECORD,,

{python_mobius-0.4.1.dist-info → python_mobius-0.4.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.31.0
+Generator: hatchling 1.32.0
 Root-Is-Purelib: true
 Tag: py3-none-any