python-mobius 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

mobius/__init__.py

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

mobius/device.py

@@ -709,12 +709,22 @@ class MobiusDevice:
         ShortAddressArray/SerialNumberArray/DeviceModelArray
         (3700/3701/3702, the same "get all elements" pattern used
         elsewhere in this library) from THIS connected device, acting as
-        a Thread mesh gateway, and returns every OTHER device it knows
-        about over the mesh -- not devices we necessarily have (or even
-        can have) a direct BLE connection to. See documentation/
+        a Thread mesh gateway, and returns what it reports about devices
+        over the mesh -- not devices we necessarily have (or even can
+        have) a direct BLE connection to. See documentation/
         09-thread-coap-relay.md for the full protocol trace this is
         based on.
 
+        Whether this includes the connected device's own entry
+        alongside others isn't confirmed either way -- unlike
+        discover_networked_thread_devices() (whose sibling docstring
+        this once matched, until a real capture disproved it there),
+        real hardware evidence specific to THIS older mechanism was
+        never gathered. Callers that also separately add the connected
+        device's own entry (e.g. mobius.discovery.discover_tank()) treat
+        this as a real possibility and deduplicate by serial regardless,
+        rather than assuming either way.
+
         **Confirmed via real hardware testing to be Cowboy-hub-specific.**
         These three arrays were originally found being fetched as part of
         the app's own network-setup logic for a dedicated Cowboy hub device,
@@ -789,9 +799,19 @@ class MobiusDevice:
         """
         Fetches MLPrefix (2128) plus NetworkedThreadDevices (1001, the
         same "get all elements" pattern used elsewhere in this library)
-        from THIS connected device, and returns every OTHER device it
-        knows about over the Thread mesh -- not devices we necessarily
-        have (or even can have) a direct BLE connection to.
+        from THIS connected device, and returns every device it knows
+        about over the Thread mesh -- not devices we necessarily have
+        (or even can have) a direct BLE connection to.
+
+        **Includes the connected device's own entry, not just others.**
+        An earlier version of this docstring claimed "every OTHER
+        device," an untested assumption rather than a confirmed one --
+        disproven by a real 4-device tank capture where a single
+        connected device's own NetworkedThreadDevices read returned all
+        4 real devices, necessarily including itself. Callers building
+        a peer list that also separately adds the connected device's own
+        entry (e.g. mobius.discovery.discover_tank()) need to
+        deduplicate by serial, or that device ends up listed twice.
 
         A second, better mesh-peer-discovery mechanism than
         discover_mesh_peers() -- confirmed via reverse engineering the
@@ -823,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
@@ -868,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/discovery.py

@@ -193,12 +193,28 @@ async def discover_tank(mdevice) -> "Tank":
     (not just serial/model, the way advertisement-only grouping like
     group_by_pan_id() can offer).
 
-    Calls mdevice.discover_mesh_peers_auto() (which only ever reports
-    OTHER devices) plus get_own_mesh_address()/get_device_info() (to
-    include the connected device itself in the result -- otherwise a
-    single-device tank would come back with zero peers, which would look
-    identical to "this device supports none of the discovery mechanisms"
-    rather than "this device IS the whole tank").
+    Calls mdevice.discover_mesh_peers_auto() plus
+    get_own_mesh_address()/get_device_info() to build the connected
+    device's own entry directly. These are deliberately DEDUPLICATED by
+    serial before returning, keeping the directly-built own entry over
+    whatever discover_mesh_peers_auto() reported for the same serial --
+    confirmed via a real 4-device tank capture that
+    discover_networked_thread_devices() (the mechanism
+    discover_mesh_peers_auto() tries first) is self-INCLUSIVE, not
+    self-exclusive as an earlier version of this docstring claimed
+    (based on an untested assumption, not a confirmed one): all 4 real
+    devices came back from a single connected device's own
+    NetworkedThreadDevices read, necessarily including whichever one was
+    actually connected to. Without deduplication, that connected
+    device's own peer would appear twice in the result -- once from this
+    function's own direct build, once from discover_mesh_peers_auto()'s
+    own report of it as "just another peer" on its own network. Not
+    confirmed whether the OLDER discover_mesh_peers() mechanism
+    (discover_mesh_peers_auto()'s own fallback) shares this same
+    self-inclusive behavior or not -- the deduplication here is
+    unconditional specifically so it's correct either way, rather than
+    depending on getting that confirmation for every code path that
+    could produce peers.
 
     tank.prefix is None if this device didn't report a valid mesh
     address at all (unsupported, or not currently part of an active
@@ -240,5 +256,13 @@ async def discover_tank(mdevice) -> "Tank":
     other_peers = await mdevice.discover_mesh_peers_auto()
     prefix = mesh_local_prefix_from_own_address(own_address)
 
-    return Tank(prefix=prefix, peers=[own_peer] + other_peers)
+    # own_peer always wins over whatever discover_mesh_peers_auto()
+    # separately reported for the same serial -- see this function's
+    # own docstring for why that duplicate is a real, confirmed
+    # possibility, not just a defensive guard against a hypothetical.
+    deduplicated = [own_peer] + [
+        peer for peer in other_peers if peer.serial != own_peer.serial
+    ]
+
+    return Tank(prefix=prefix, peers=deduplicated)
 

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.0.dist-info → python_mobius-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: python-mobius
-Version: 0.4.0
+Version: 0.4.2
 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.0.dist-info → python_mobius-0.4.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
-mobius/__init__.py,sha256=xZW-4m1biRKqDKuxJEWXcuhVAEfZnXsEJ_r5XIW_Kgk,5722
+mobius/__init__.py,sha256=BpkSMm-tv7BC2F_vWHd-jym24Hsmwfd_OSMeJa2FEfQ,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=4-7siTYYZ6iNjGFfa9X0NsLBz99B_bJfYx6nKKdfpq8,77337
-mobius/device_status.py,sha256=4mHpwr3v4TvMtNXsLCoz5uOVsmsERC-u6RIha8ss9v4,7797
-mobius/discovery.py,sha256=khPcvl_mDamgh1EY6R6xeR2CPFDtNiy_pMOe0qJIZD8,10240
+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
 mobius/mesh_address.py,sha256=PKQ-mm7Z4bY11ZnVmeWZO9EmOiAHp8hNtXceMGMs2tk,5940
@@ -13,9 +13,9 @@ 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.0.dist-info/METADATA,sha256=mAIIbuwjwTMkL9ljtgS5DnO4eOXys_reFlcuhT4mXDQ,5952
-python_mobius-0.4.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-python_mobius-0.4.0.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
-python_mobius-0.4.0.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
-python_mobius-0.4.0.dist-info/RECORD,,
+mobius/schedule.py,sha256=d5iAHvKuFDwfbrSptPx6viiA_lj2qGfWhsZwM_Bpr1k,10974
+python_mobius-0.4.2.dist-info/METADATA,sha256=PBqNDTyqaF-wG4Q8YUZsMqsQ2TkBTFfOoUNKe0yYZG4,5952
+python_mobius-0.4.2.dist-info/WHEEL,sha256=zOwg4jB6zX2kU910N-cMawjivD6tO8NEWvE12je1bVk,87
+python_mobius-0.4.2.dist-info/entry_points.txt,sha256=Q2hlcek-bWm70zvd12v32essflPgC2su-dKDHAqbPoE,48
+python_mobius-0.4.2.dist-info/licenses/LICENSE,sha256=7a72Msu2Q-TnoiFxemxEGkwafJGObk1W3rw9hzmyM_Y,17984
+python_mobius-0.4.2.dist-info/RECORD,,

{python_mobius-0.4.0.dist-info → python_mobius-0.4.2.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