python-jebao 0.1.5__tar.gz → 0.1.7__tar.gz

{python_jebao-0.1.5 → python_jebao-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jebao
-Version: 0.1.5
+Version: 0.1.7
 Summary: Python library for controlling Jebao aquarium pumps
 Home-page: https://github.com/jrigling/python-jebao
 Author: Justin Rigling

{python_jebao-0.1.5 → python_jebao-0.1.7}/jebao/__init__.py

@@ -16,7 +16,7 @@ from .const import (
     MODEL_MD44,
 )
 
-__version__ = "0.1.5"
+__version__ = "0.1.7"
 
 __all__ = [
     "JebaoDevice",

{python_jebao-0.1.5 → python_jebao-0.1.7}/jebao/const.py

@@ -31,8 +31,12 @@ CONTROL_COMMAND_SIZE = 323
 
 # Product keys
 PRODUCT_KEY_MDP20000 = "04020B28"
+PRODUCT_KEY_MDP20000_V2 = "04D30Q34"  # Newer MDP-20000 hardware revision
 PRODUCT_KEY_MD44 = "04020B27"  # Assumed, verify if needed
 
+# All known product keys that identify an MDP-20000 (across hardware revisions)
+PRODUCT_KEYS_MDP20000 = frozenset({PRODUCT_KEY_MDP20000, PRODUCT_KEY_MDP20000_V2})
+
 # Model identifiers
 MODEL_MDP20000 = "MDP-20000"
 MODEL_MD44 = "MD-4.4"

{python_jebao-0.1.5 → python_jebao-0.1.7}/jebao/discovery.py

@@ -12,7 +12,7 @@ from .const import (
     MODEL_MD44,
     MODEL_MDP20000,
     PRODUCT_KEY_MD44,
-    PRODUCT_KEY_MDP20000,
+    PRODUCT_KEYS_MDP20000,
     UDP_DISCOVERY_PORT,
     UDP_LISTEN_PORT,
 )
@@ -357,7 +357,7 @@ class JebaoDiscovery:
             product_key = data[product_key_start : product_key_start + 8].rstrip(b"\x00").decode("ascii")
 
             # Determine model from product key
-            if product_key == PRODUCT_KEY_MDP20000:
+            if product_key in PRODUCT_KEYS_MDP20000:
                 model = MODEL_MDP20000
             elif product_key == PRODUCT_KEY_MD44:
                 model = MODEL_MD44

{python_jebao-0.1.5 → python_jebao-0.1.7}/jebao/protocol.py

@@ -530,16 +530,22 @@ class JebaoProtocol:
         return bytes(buffer)
 
     async def _drain_garbage_bytes(self, timeout: float = 0.1) -> None:
-        """Drain any garbage/padding bytes from the socket buffer.
+        """Drain leftover bytes and unsolicited messages from the socket buffer.
 
-        The MDP-20000 pump appears to send extra padding bytes (0xee) after
-        valid responses. This method drains those bytes to prevent them from
-        corrupting subsequent reads.
+        The MDP-20000 pump emits two things we need to consume before a request:
+        - Padding bytes (0xee / 0x00) trailing some responses
+        - Unsolicited type 0x00 status broadcasts (header + body + 129-byte padding)
+
+        If an unsolicited type 0x00 frame is found and we only consume its body,
+        the trailing 129-byte padding remains in the buffer and corrupts the next
+        read (forcing a slow byte-by-byte resync that often races the pump's
+        connection close, surfacing as IncompleteReadError).
 
         Args:
-            timeout: How long to wait for garbage bytes (default 0.1s)
+            timeout: How long to wait for bytes (default 0.1s)
         """
-        if not self._reader:
+        reader = self._reader
+        if reader is None:
             return
 
         try:
@@ -548,7 +554,7 @@ class JebaoProtocol:
                 try:
                     # Try to read header of next message with short timeout
                     header = await asyncio.wait_for(
-                        self._reader.read(5), timeout=timeout
+                        reader.read(5), timeout=timeout
                     )
                     if not header:
                         # No more data
@@ -559,20 +565,21 @@ class JebaoProtocol:
                         continue
                     # Check if it's a valid header
                     if header[0:4] == b"\x00\x00\x00\x03":
-                        # Valid header found - this is a real message!
-                        # Put it back somehow... actually, we can't put it back easily
-                        # This is a problem - we've consumed a valid message header
-                        _LOGGER.warning(
-                            "Found valid header while draining - this shouldn't happen! "
-                            "Pump may have sent unsolicited message."
-                        )
-                        # Read the rest of this message to consume it
+                        # Pump sent an unsolicited message (e.g. periodic status broadcast).
+                        # Consume the full frame so we don't desync the stream.
                         length = header[4]
-                        remaining = await self._reader.read(length)
-                        _LOGGER.warning(
-                            "Consumed unsolicited message: type=0x%02x, %d bytes total",
-                            header[7] if len(header) > 7 else 0,
-                            len(header) + len(remaining),
+                        body = await reader.readexactly(length)
+                        msg_type = body[2] if len(body) > 2 else 0
+                        total = len(header) + len(body)
+                        # Type 0x00 messages carry an extra 129-byte padding frame
+                        # (same as _read_raw). Skip it or stale bytes corrupt the next read.
+                        if msg_type == MSG_EXTENDED_DATA:
+                            padding = await reader.readexactly(129)
+                            total += len(padding)
+                        _LOGGER.debug(
+                            "Drained unsolicited message: type=0x%02x, %d bytes total",
+                            msg_type,
+                            total,
                         )
                     else:
                         # Garbage header - log and continue draining
@@ -612,15 +619,21 @@ class JebaoProtocol:
         Raises:
             JebaoConnectionError: Read failed
         """
-        if not self._reader:
-            raise JebaoConnectionError("Not connected")
-
         async with self._read_lock:
+            # Bind the reader locally under the lock. disconnect() (called from
+            # our own IncompleteReadError handler, from _send_raw's error path,
+            # and from the coordinator) sets self._reader = None from another
+            # task; re-reading self._reader across the awaits below would raise
+            # AttributeError. Reading from a captured, closed StreamReader raises
+            # IncompleteReadError/ConnectionResetError instead, which we handle.
+            reader = self._reader
+            if reader is None:
+                raise JebaoConnectionError("Not connected")
             try:
                 # Read header (4 bytes) + length byte (1 byte) = 5 bytes total
                 # Format: 00 00 00 03 [LENGTH]
                 _LOGGER.debug("Reading next message header...")
-                header = await self._reader.readexactly(5)
+                header = await reader.readexactly(5)
 
                 # Validate header - if invalid, try to re-sync
                 max_resync_attempts = 50
@@ -644,7 +657,7 @@ class JebaoProtocol:
                         max_resync_attempts,
                     )
                     # Shift header left by 1 byte and read 1 new byte
-                    next_byte = await self._reader.readexactly(1)
+                    next_byte = await reader.readexactly(1)
                     header = header[1:] + next_byte
                 else:
                     # Failed to re-sync after max attempts
@@ -656,7 +669,7 @@ class JebaoProtocol:
                 _LOGGER.debug(f"Valid header found, reading {length} more bytes")
 
                 # Read the remaining bytes based on length field
-                remaining = await self._reader.readexactly(length)
+                remaining = await reader.readexactly(length)
 
                 result = header + remaining
                 msg_type = result[7] if len(result) > 7 else 0
@@ -666,7 +679,7 @@ class JebaoProtocol:
                 if msg_type == MSG_EXTENDED_DATA:
                     # Read fixed padding (129 bytes) that pump sends for extended responses
                     # The pump uses fixed-frame protocol with padding (0xee or 0x00)
-                    padding = await self._reader.readexactly(129)
+                    padding = await reader.readexactly(129)
 
                     # Validate padding - should be mostly 0xee or 0x00 patterns
                     # Check first 4 bytes and last byte
@@ -701,8 +714,15 @@ class JebaoProtocol:
                     f"Message complete: {len(result)} bytes, type=0x{msg_type:02x}"
                 )
                 return result
-            except asyncio.IncompleteReadError as err:
-                _LOGGER.error("%s IncompleteReadError - connection closed by peer", self.device_identifier)
+            except (asyncio.IncompleteReadError, ConnectionResetError) as err:
+                # Expected when the pump drops an idle connection. The reconnect
+                # is logged by the coordinator/retry layer, so keep this at debug
+                # to avoid flooding the log every poll.
+                _LOGGER.debug(
+                    "%s Connection closed by peer (%s) - will reconnect",
+                    self.device_identifier,
+                    type(err).__name__,
+                )
                 # Mark connection as closed so reconnection can happen
                 await self.disconnect()
                 raise JebaoConnectionError("Connection closed") from err

{python_jebao-0.1.5 → python_jebao-0.1.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-jebao"
-version = "0.1.5"
+version = "0.1.7"
 description = "Python library for controlling Jebao aquarium pumps"
 readme = "README.md"
 license = "MIT"

{python_jebao-0.1.5 → python_jebao-0.1.7}/python_jebao.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-jebao
-Version: 0.1.5
+Version: 0.1.7
 Summary: Python library for controlling Jebao aquarium pumps
 Home-page: https://github.com/jrigling/python-jebao
 Author: Justin Rigling