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

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

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

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

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

{python_jebao-0.1.2 → python_jebao-0.1.5}/jebao/device.py

@@ -34,11 +34,18 @@ class JebaoDevice:
         self.device_id = device_id
         self.model = model
 
-        self._protocol = JebaoProtocol(host, port)
+        self._protocol = JebaoProtocol(host, port, device_id=device_id)
         self._state: Optional[DeviceState] = None
         self._speed: Optional[int] = None
         self._last_update: Optional[float] = None
 
+    @property
+    def device_identifier(self) -> str:
+        """Get device identifier for logging."""
+        if self.device_id:
+            return f"[{self.device_id}]"
+        return f"[{self.host}]"
+
     @property
     def is_connected(self) -> bool:
         """Check if device is connected."""
@@ -90,7 +97,7 @@ class JebaoDevice:
             JebaoAuthenticationError: Authentication failed
         """
         await self._protocol.connect(timeout)
-        _LOGGER.info("Connected to %s (%s)", self.host, self.model or "Unknown")
+        _LOGGER.info("%s Connected (%s)", self.device_identifier, self.model or "Unknown")
 
         # Get initial status
         await self.update()
@@ -98,7 +105,7 @@ class JebaoDevice:
     async def disconnect(self) -> None:
         """Disconnect from device."""
         await self._protocol.disconnect()
-        _LOGGER.info("Disconnected from %s", self.host)
+        _LOGGER.info("%s Disconnected", self.device_identifier)
 
     @async_retry(max_attempts=3, delay=0.5)
     async def update(self, timeout: float = DEFAULT_TIMEOUT) -> None:
@@ -124,12 +131,13 @@ class JebaoDevice:
             self._speed = status["speed"]
             self._last_update = time.time()
             _LOGGER.debug(
-                "Status updated: state=%s, speed=%d%%",
+                "%s Status updated: state=%s, speed=%d%%",
+                self.device_identifier,
                 self._state.name,
                 self._speed,
             )
         else:
-            _LOGGER.warning("Failed to parse status response")
+            _LOGGER.warning("%s Failed to parse status response", self.device_identifier)
 
     async def __aenter__(self):
         """Async context manager entry."""

{python_jebao-0.1.2 → python_jebao-0.1.5}/jebao/mdp20000.py

@@ -90,7 +90,7 @@ class MDP20000Device(JebaoDevice):
             This method automatically retries up to 3 times on transient
             failures (garbage bytes, connection issues).
         """
-        _LOGGER.info("Turning on pump")
+        _LOGGER.info("%s Turning on pump", self.device_identifier)
 
         await self._protocol.send_control_command(
             CommandOpcode.TURN_ON_OFF,
@@ -115,7 +115,7 @@ class MDP20000Device(JebaoDevice):
             This method automatically retries up to 3 times on transient
             failures (garbage bytes, connection issues).
         """
-        _LOGGER.info("Turning off pump")
+        _LOGGER.info("%s Turning off pump", self.device_identifier)
 
         await self._protocol.send_control_command(
             CommandOpcode.TURN_ON_OFF,
@@ -148,7 +148,7 @@ class MDP20000Device(JebaoDevice):
                 f"Speed must be between {MIN_SPEED} and {MAX_SPEED}, got {percentage}"
             )
 
-        _LOGGER.info("Setting speed to %d%%", percentage)
+        _LOGGER.info("%s Setting speed to %d%%", self.device_identifier, percentage)
 
         await self._protocol.send_control_command(
             CommandOpcode.SET_SPEED,

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

@@ -41,21 +41,26 @@ MSG_EXTENDED_DATA = 0x00
 class JebaoProtocol:
     """Low-level protocol implementation for Jebao devices."""
 
-    def __init__(self, host: str, port: int = 12416):
+    def __init__(self, host: str, port: int = 12416, device_id: Optional[str] = None):
         """Initialize protocol handler.
 
         Args:
             host: Device IP address
             port: TCP port (default 12416)
+            device_id: Device ID for logging (optional)
         """
         self.host = host
         self.port = port
+        self.device_id = device_id
         self._reader: Optional[asyncio.StreamReader] = None
         self._writer: Optional[asyncio.StreamWriter] = None
         self._sequence = 1
         self._keepalive_task: Optional[asyncio.Task] = None
         self._passcode: Optional[bytes] = None
-        self._read_lock = asyncio.Lock()
+
+        # Locks for thread-safe operation
+        self._request_lock = asyncio.Lock()  # Serialize entire request-response cycles
+        self._read_lock = asyncio.Lock()     # Low-level read serialization
 
         # Message dispatcher
         self._message_queues: Dict[int, asyncio.Queue] = {}
@@ -65,6 +70,13 @@ class JebaoProtocol:
         # Read buffer for handling garbage bytes
         self._read_buffer = bytearray()
 
+    @property
+    def device_identifier(self) -> str:
+        """Get device identifier for logging."""
+        if self.device_id:
+            return f"[{self.device_id}]"
+        return f"[{self.host}]"
+
     @property
     def is_connected(self) -> bool:
         """Check if connection is established."""
@@ -82,7 +94,7 @@ class JebaoProtocol:
             JebaoTimeoutError: Operation timed out
         """
         try:
-            _LOGGER.debug("Connecting to %s:%d", self.host, self.port)
+            _LOGGER.debug("%s Connecting to %s:%d", self.device_identifier, self.host, self.port)
             self._reader, self._writer = await asyncio.wait_for(
                 asyncio.open_connection(self.host, self.port), timeout=timeout
             )
@@ -114,7 +126,7 @@ class JebaoProtocol:
         Raises:
             JebaoAuthenticationError: Authentication failed
         """
-        _LOGGER.debug("Starting authentication")
+        _LOGGER.debug("%s Starting authentication", self.device_identifier)
 
         # Step 1: Request passcode
         request = self._build_passcode_request()
@@ -158,7 +170,7 @@ class JebaoProtocol:
             _LOGGER.error(f"Login failed - expected type 0x{MSG_LOGIN_SUCCESS:02x} at byte 7, got 0x{response[7]:02x}")
             raise JebaoAuthenticationError("Login failed")
 
-        _LOGGER.info("Authentication successful for %s", self.host)
+        _LOGGER.info("%s Authentication successful", self.device_identifier)
 
     async def disconnect(self) -> None:
         """Disconnect from device."""
@@ -185,7 +197,7 @@ class JebaoProtocol:
                 self._writer = None
                 self._reader = None
 
-        _LOGGER.debug("Disconnected from %s", self.host)
+        _LOGGER.debug("%s Disconnected", self.device_identifier)
 
     def _start_keepalive(self) -> None:
         """Start keepalive task."""
@@ -360,39 +372,41 @@ class JebaoProtocol:
             JebaoConnectionError: Not connected
             JebaoTimeoutError: Request timed out
         """
-        if not self.is_connected:
-            raise JebaoConnectionError("Not connected")
-
-        # Drain any unexpected leftover bytes as safety net (very short timeout)
-        # Normally padding is read explicitly, but this catches edge cases
-        await self._drain_garbage_bytes(timeout=0.01)
-
-        # Send simple status request (0x90)
-        # Format: 00 00 00 03 04 00 00 90 02
-        # The last byte (02) requests values, and response will be message type 91 or 0x00
-        request = bytes.fromhex("0000000304000090 02")
-        _LOGGER.debug(f"Sending status request: {request.hex()}")
-        await self._send_raw(request)
-        _LOGGER.debug("Status request sent, waiting for response...")
-
-        # Read response directly (no dispatcher)
-        try:
-            response = await asyncio.wait_for(self._read_raw(), timeout=timeout)
-        except asyncio.TimeoutError as err:
-            raise JebaoTimeoutError("Status request timed out") from err
+        # Serialize requests - only one operation at a time
+        async with self._request_lock:
+            if not self.is_connected:
+                raise JebaoConnectionError("Not connected")
+
+            # Drain any unexpected leftover bytes as safety net (very short timeout)
+            # Normally padding is read explicitly, but this catches edge cases
+            await self._drain_garbage_bytes(timeout=0.01)
+
+            # Send simple status request (0x90)
+            # Format: 00 00 00 03 04 00 00 90 02
+            # The last byte (02) requests values, and response will be message type 91 or 0x00
+            request = bytes.fromhex("0000000304000090 02")
+            _LOGGER.debug(f"Sending status request: {request.hex()}")
+            await self._send_raw(request)
+            _LOGGER.debug("Status request sent, waiting for response...")
+
+            # Read response directly (no dispatcher)
+            try:
+                response = await asyncio.wait_for(self._read_raw(), timeout=timeout)
+            except asyncio.TimeoutError as err:
+                raise JebaoTimeoutError("Status request timed out") from err
 
-        _LOGGER.debug(f"Status response length: {len(response)}, data: {response.hex()[:100]}...")
+            _LOGGER.debug(f"Status response length: {len(response)}, data: {response.hex()[:100]}...")
 
-        # Note: Don't drain here - pump may send unsolicited updates that we shouldn't consume
+            # Note: Don't drain here - pump may send unsolicited updates that we shouldn't consume
 
-        if len(response) < 10:
-            raise JebaoCommandError(f"Invalid status response: too short ({len(response)} bytes)")
+            if len(response) < 10:
+                raise JebaoCommandError(f"Invalid status response: too short ({len(response)} bytes)")
 
-        # Log the message type and first few bytes for debugging
-        msg_type = response[7] if len(response) > 7 else 0
-        _LOGGER.debug(f"Status response type: 0x{msg_type:02x}, bytes 10-12: {response[10:12].hex() if len(response) > 11 else 'N/A'}")
+            # Log the message type and first few bytes for debugging
+            msg_type = response[7] if len(response) > 7 else 0
+            _LOGGER.debug(f"Status response type: 0x{msg_type:02x}, bytes 10-12: {response[10:12].hex() if len(response) > 11 else 'N/A'}")
 
-        return response
+            return response
 
     async def send_control_command(
         self,
@@ -416,46 +430,49 @@ class JebaoProtocol:
             JebaoCommandError: Command failed
             JebaoTimeoutError: Command timed out
         """
-        if not self.is_connected:
-            raise JebaoConnectionError("Not connected")
+        # Serialize requests - only one operation at a time
+        async with self._request_lock:
+            if not self.is_connected:
+                raise JebaoConnectionError("Not connected")
 
-        # Drain any unexpected leftover bytes as safety net (very short timeout)
-        # Normally padding is read explicitly, but this catches edge cases
-        await self._drain_garbage_bytes(timeout=0.01)
-
-        command = self._build_control_command(opcode1, opcode2, param1, param2)
-        _LOGGER.debug(
-            "Sending control command: opcode1=0x%02x, opcode2=0x%02x, param1=%d, param2=%d",
-            opcode1,
-            opcode2,
-            param1,
-            param2,
-        )
-        await self._send_raw(command)
-
-        # Read ACK (message type 0x94) directly
-        # The pump sends an ACK for control commands
-        try:
-            ack = await asyncio.wait_for(self._read_raw(), timeout=timeout)
-            ack_type = ack[7] if len(ack) > 7 else 0
-            _LOGGER.debug("Control command ACK received: type=0x%02x, %d bytes", ack_type, len(ack))
+            # Drain any unexpected leftover bytes as safety net (very short timeout)
+            # Normally padding is read explicitly, but this catches edge cases
+            await self._drain_garbage_bytes(timeout=0.01)
+
+            command = self._build_control_command(opcode1, opcode2, param1, param2)
+            _LOGGER.debug(
+                "%s Sending control command: opcode1=0x%02x, opcode2=0x%02x, param1=%d, param2=%d",
+                self.device_identifier,
+                opcode1,
+                opcode2,
+                param1,
+                param2,
+            )
+            await self._send_raw(command)
 
-            # After ACK, pump may send unsolicited status update
-            # Try to read it with short timeout
+            # Read ACK (message type 0x94) directly
+            # The pump sends an ACK for control commands
             try:
-                status_update = await asyncio.wait_for(self._read_raw(), timeout=0.5)
-                status_type = status_update[7] if len(status_update) > 7 else 0
-                _LOGGER.info(
-                    "Pump sent unsolicited status update after control command: type=0x%02x",
-                    status_type,
-                )
-            except asyncio.TimeoutError:
-                # No status update sent, that's OK
-                _LOGGER.debug("No unsolicited status update after control command")
+                ack = await asyncio.wait_for(self._read_raw(), timeout=timeout)
+                ack_type = ack[7] if len(ack) > 7 else 0
+                _LOGGER.debug("Control command ACK received: type=0x%02x, %d bytes", ack_type, len(ack))
 
-        except asyncio.TimeoutError:
-            _LOGGER.warning("Control command sent but no ACK received (pump may still process it)")
-            # Don't raise - pump may still process the command even without ACK
+                # After ACK, pump may send unsolicited status update
+                # Try to read it with short timeout
+                try:
+                    status_update = await asyncio.wait_for(self._read_raw(), timeout=0.5)
+                    status_type = status_update[7] if len(status_update) > 7 else 0
+                    _LOGGER.info(
+                        "Pump sent unsolicited status update after control command: type=0x%02x",
+                        status_type,
+                    )
+                except asyncio.TimeoutError:
+                    # No status update sent, that's OK
+                    _LOGGER.debug("No unsolicited status update after control command")
+
+            except asyncio.TimeoutError:
+                _LOGGER.warning("Control command sent but no ACK received (pump may still process it)")
+                # Don't raise - pump may still process the command even without ACK
 
     def _build_control_command(
         self, opcode1: int, opcode2: int, param1: int, param2: int
@@ -582,6 +599,8 @@ class JebaoProtocol:
             self._writer.write(data)
             await self._writer.drain()
         except Exception as err:
+            _LOGGER.error("Send failed, closing connection: %s", err)
+            await self.disconnect()
             raise JebaoConnectionError(f"Send failed: {err}") from err
 
     async def _read_raw(self) -> bytes:
@@ -683,7 +702,9 @@ class JebaoProtocol:
                 )
                 return result
             except asyncio.IncompleteReadError as err:
-                _LOGGER.error("IncompleteReadError - connection closed by peer")
+                _LOGGER.error("%s IncompleteReadError - connection closed by peer", self.device_identifier)
+                # Mark connection as closed so reconnection can happen
+                await self.disconnect()
                 raise JebaoConnectionError("Connection closed") from err
             except JebaoConnectionError:
                 raise

{python_jebao-0.1.2 → python_jebao-0.1.5}/jebao/retry.py

@@ -41,27 +41,57 @@ def async_retry(
                     return await func(*args, **kwargs)
                 except exceptions as e:
                     if attempt == max_attempts:
+                        device_id = ""
+                        if args and hasattr(args[0], 'device_identifier'):
+                            device_id = args[0].device_identifier + " "
                         _LOGGER.error(
-                            f"{func.__name__} failed after {max_attempts} attempts: {e}"
+                            f"{device_id}{func.__name__} failed after {max_attempts} attempts: {e}"
                         )
                         raise
 
-                    # Check if error message indicates garbage issue
+                    # Check if error message indicates specific issues
                     error_msg = str(e).lower()
                     is_garbage_issue = (
                         "synchronization" in error_msg
                         or "garbage" in error_msg
                         or "invalid header" in error_msg
                     )
+                    is_not_connected = "not connected" in error_msg or "connection closed" in error_msg
+
+                    # Attempt reconnection if disconnected
+                    if is_not_connected and args and hasattr(args[0], 'connect'):
+                        device = args[0]
+                        # Check if device has is_connected property
+                        if hasattr(device, 'is_connected') and not device.is_connected:
+                            device_id = device.device_identifier if hasattr(device, 'device_identifier') else ""
+                            _LOGGER.info(
+                                f"{device_id} {func.__name__} attempt {attempt}/{max_attempts}: "
+                                f"Connection lost, attempting to reconnect..."
+                            )
+                            try:
+                                await device.connect()
+                                _LOGGER.info(f"{device_id} Reconnected successfully, retrying operation")
+                                # Don't sleep after successful reconnection - retry immediately
+                                attempt += 1
+                                continue
+                            except Exception as reconnect_err:
+                                _LOGGER.warning(
+                                    f"{device_id} Reconnection failed: {reconnect_err}, "
+                                    f"will retry in {current_delay}s"
+                                )
+
+                    device_id = ""
+                    if args and hasattr(args[0], 'device_identifier'):
+                        device_id = args[0].device_identifier + " "
 
                     if is_garbage_issue:
                         _LOGGER.warning(
-                            f"{func.__name__} attempt {attempt}/{max_attempts} failed "
+                            f"{device_id}{func.__name__} attempt {attempt}/{max_attempts} failed "
                             f"due to garbage bytes, retrying in {current_delay}s: {e}"
                         )
                     else:
                         _LOGGER.warning(
-                            f"{func.__name__} attempt {attempt}/{max_attempts} failed, "
+                            f"{device_id}{func.__name__} attempt {attempt}/{max_attempts} failed, "
                             f"retrying in {current_delay}s: {e}"
                         )
 

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

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

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

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