goodwe 0.4.3__py3-none-any.whl → 0.4.5__py3-none-any.whl

goodwe/modbus.py

@@ -221,10 +221,11 @@ def validate_modbus_tcp_response(data: bytes, cmd: int, offset: int, value: int)
     if len(data) <= 8:
         logger.debug("Response is too short.")
         return False
-    expected_length = int.from_bytes(data[4:6], byteorder='big', signed=False) + 6
-    # The weird expected_length != 12 is work around Goodwe bug answering wrong (hardcoded 6) length.
-    if len(data) < expected_length and expected_length != 12:
-        raise PartialResponseException(len(data), expected_length)
+
+    # The Modbus/TCP message length check is completely ignore due to Goodwe bugs
+    # expected_length = int.from_bytes(data[4:6], byteorder='big', signed=False) + 6
+    # if len(data) < expected_length:
+    #    raise PartialResponseException(len(data), expected_length)
 
     if data[7] == MODBUS_READ_CMD:
         expected_length = data[8] + 9
@@ -235,8 +236,8 @@ def validate_modbus_tcp_response(data: bytes, cmd: int, offset: int, value: int)
             return False
     elif data[7] in (MODBUS_WRITE_CMD, MODBUS_WRITE_MULTI_CMD):
         if len(data) < 12:
-            logger.debug("Response has unexpected length: %d, expected %d.", len(data), 14)
-            raise PartialResponseException(len(data), expected_length)
+            logger.debug("Response has unexpected length: %d, expected %d.", len(data), 12)
+            return False
         response_offset = int.from_bytes(data[8:10], byteorder='big', signed=False)
         if response_offset != offset:
             logger.debug("Response has wrong offset: %X, expected %X.", response_offset, offset)

goodwe/protocol.py

@@ -42,6 +42,7 @@ class InverterProtocol:
         self.response_future: Future | None = None
         self.command: ProtocolCommand | None = None
         self._partial_data: bytes | None = None
+        self._partial_missing: int = 0
 
     def _ensure_lock(self) -> asyncio.Lock:
         """Validate (or create) asyncio Lock.
@@ -125,28 +126,28 @@ class UdpInverterProtocol(InverterProtocol, asyncio.DatagramProtocol):
             self._timer.cancel()
             self._timer = None
         try:
-            if self._partial_data:
-                logger.debug("Received another response fragment: %s.", data.hex())
+            if self._partial_data and self._partial_missing == len(data):
+                logger.debug("Composed fragmented response: %s + %s", self._partial_data.hex(), data.hex())
                 data = self._partial_data + data
-            if self.command.validator(data):
-                if self._partial_data:
-                    logger.debug("Composed fragmented response: %s", data.hex())
-                else:
-                    logger.debug("Received: %s", data.hex())
                 self._partial_data = None
+                self._partial_missing = 0
+            if self.command.validator(data):
+                logger.debug("Received: %s", data.hex())
                 self.response_future.set_result(data)
             else:
                 logger.debug("Received invalid response: %s", data.hex())
                 asyncio.get_running_loop().call_soon(self._retry_mechanism)
-        except PartialResponseException:
-            logger.debug("Received response fragment: %s", data.hex())
+        except PartialResponseException as ex:
+            logger.debug("Received response fragment (%d of %d): %s", ex.length, ex.expected, data.hex())
             self._partial_data = data
-            return
+            self._partial_missing = ex.expected - ex.length
+            self._timer = asyncio.get_running_loop().call_later(self.timeout, self._retry_mechanism)
         except asyncio.InvalidStateError:
             logger.debug("Response already handled: %s", data.hex())
         except RequestRejectedException as ex:
             logger.debug("Received exception response: %s", data.hex())
-            self.response_future.set_exception(ex)
+            if self.response_future and not self.response_future.done():
+                self.response_future.set_exception(ex)
             self._close_transport()
 
     def error_received(self, exc: Exception) -> None:
@@ -169,6 +170,8 @@ class UdpInverterProtocol(InverterProtocol, asyncio.DatagramProtocol):
         """Send message via transport"""
         self.command = command
         self.response_future = response_future
+        self._partial_data = None
+        self._partial_missing = 0
         payload = command.request_bytes()
         if self._retry > 0:
             logger.debug("Sending: %s - retry #%s/%s", self.command, self._retry, self.retries)
@@ -266,30 +269,30 @@ class TcpInverterProtocol(InverterProtocol, asyncio.Protocol):
         if self._timer:
             self._timer.cancel()
         try:
-            if self._partial_data:
-                logger.debug("Received another response fragment: %s.", data.hex())
+            if self._partial_data and self._partial_missing == len(data):
+                logger.debug("Composed fragmented response: %s + %s", self._partial_data.hex(), data.hex())
                 data = self._partial_data + data
+                self._partial_data = None
+                self._partial_missing = 0
             if self.command.validator(data):
-                if self._partial_data:
-                    logger.debug("Composed fragmented response: %s", data.hex())
-                else:
-                    logger.debug("Received: %s", data.hex())
+                logger.debug("Received: %s", data.hex())
                 self._retry = 0
-                self._partial_data = None
                 self.response_future.set_result(data)
             else:
                 logger.debug("Received invalid response: %s", data.hex())
                 self.response_future.set_exception(RequestRejectedException())
                 self._close_transport()
-        except PartialResponseException:
-            logger.debug("Received response fragment: %s", data.hex())
+        except PartialResponseException as ex:
+            logger.debug("Received response fragment (%d of %d): %s", ex.length, ex.expected, data.hex())
             self._partial_data = data
-            return
+            self._partial_missing = ex.expected - ex.length
+            self._timer = asyncio.get_running_loop().call_later(self.timeout, self._timeout_mechanism)
         except asyncio.InvalidStateError:
             logger.debug("Response already handled: %s", data.hex())
         except RequestRejectedException as ex:
             logger.debug("Received exception response: %s", data.hex())
-            self.response_future.set_exception(ex)
+            if self.response_future and not self.response_future.done():
+                self.response_future.set_exception(ex)
             # self._close_transport()
 
     def error_received(self, exc: Exception) -> None:
@@ -335,6 +338,8 @@ class TcpInverterProtocol(InverterProtocol, asyncio.Protocol):
         """Send message via transport"""
         self.command = command
         self.response_future = response_future
+        self._partial_data = None
+        self._partial_missing = 0
         payload = command.request_bytes()
         if self._retry > 0:
             logger.debug("Sending: %s - retry #%s/%s", self.command, self._retry, self.retries)
@@ -468,7 +473,7 @@ class Aa55ProtocolCommand(ProtocolCommand):
     Quite probably it is some variation of the protocol used on RS-485 serial link,
     extended/adapted to UDP transport layer.
 
-    Each request starts with header of 0xAA, 0x55, then 0xC0, 0x7F (probably some sort of address/command)
+    Each request starts with header of 0xAA, 0x55, then 0xC0, 0x7F (client addr, inverter addr)
     followed by actual payload data.
     It is suffixed with 2 bytes of plain checksum of header+payload.
 
@@ -484,7 +489,7 @@ class Aa55ProtocolCommand(ProtocolCommand):
                 + payload
                 + self._checksum(bytes.fromhex("AA55C07F" + payload)).hex()
             ),
-            lambda x: self._validate_response(x, response_type),
+            lambda x: self._validate_aa55_response(x, response_type),
         )
 
     @staticmethod
@@ -495,7 +500,7 @@ class Aa55ProtocolCommand(ProtocolCommand):
         return checksum.to_bytes(2, byteorder="big", signed=False)
 
     @staticmethod
-    def _validate_response(data: bytes, response_type: str) -> bool:
+    def _validate_aa55_response(data: bytes, response_type: str) -> bool:
         """
         Validate the response.
         data[0:3] is header
@@ -503,13 +508,20 @@ class Aa55ProtocolCommand(ProtocolCommand):
         data[6] is response payload length
         data[-2:] is checksum (plain sum of response data incl. header)
         """
-        if len(data) <= 8 or len(data) != data[6] + 9:
+        if len(data) <= 8:
+            logger.debug("Response too short.")
+            return False
+        elif len(data) < data[6] + 9:
             raise PartialResponseException(len(data), data[6] + 9)
+        elif len(data) > data[6] + 9:
+            logger.debug("Response invalid - too long (%d).", len(data))
+            return False
         elif response_type:
             data_rt_int = int.from_bytes(data[4:6], byteorder="big", signed=True)
             if int(response_type, 16) != data_rt_int:
                 logger.debug("Response type unexpected: %04x, expected %s.", data_rt_int, response_type)
                 return False
+
         checksum = 0
         for each in data[:-2]:
             checksum += each

{goodwe-0.4.3.dist-info → goodwe-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goodwe
-Version: 0.4.3
+Version: 0.4.5
 Summary: Read data from GoodWe inverter via local network
 Home-page: https://github.com/marcelblijleven/goodwe
 Author: Martin Letenay, Marcel Blijleven

{goodwe-0.4.3.dist-info → goodwe-0.4.5.dist-info}/RECORD

@@ -5,12 +5,12 @@ goodwe/es.py,sha256=iVK8EMCaAJJFihZLntJZ_Eu4sQWoZTVtTROp9mHFG6o,22730
 goodwe/et.py,sha256=CiX-PE7wouDnj1RnPnOyqiNE4FELhOGdyPUOm9VCzUw,43890
 goodwe/exceptions.py,sha256=dKMLxotjoR1ic8OVlw1joIJ4mKWD6oFtUMZ86fNM5ZE,1403
 goodwe/inverter.py,sha256=86aMJzJjNOr1I_tCF5H6mBwzDTjLbGDKUL2hbi0XSxg,10459
-goodwe/modbus.py,sha256=qDFs8pMOtwgHPfwiZLd-P34vCLHc71-b8MQZMb8FJME,8488
+goodwe/modbus.py,sha256=Mg_s_v8kbZgqXZM6ZUUxkZx2boAG8LkuDG5OiFKK2X4,8402
 goodwe/model.py,sha256=dWBjMFJMnhZoUdDd9fGT54DERDANz4TirK0Wy8kWMbk,2068
-goodwe/protocol.py,sha256=JhWYzUtCwbhxXCfZMA_hPGGCHcEEhn0y9B4goJ2GyNo,28306
+goodwe/protocol.py,sha256=Ry1B-kki5F-AnsmpeUWuhP3eCCH1wrKKfDuT9BKfmvE,29140
 goodwe/sensor.py,sha256=buPG8BcgZmRDqaMrLQUACLHB85U134qG6qo_ggsu48A,37679
-goodwe-0.4.3.dist-info/LICENSE,sha256=aZAhk3lRdYT1YZV-IKRHISEcc_KNUmgfuNO3QhRamNM,1073
-goodwe-0.4.3.dist-info/METADATA,sha256=m3IqLUDf7Ae-ElSqvqJTNFmUu-ZaQWr1YWmjz7eqJaw,3376
-goodwe-0.4.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-goodwe-0.4.3.dist-info/top_level.txt,sha256=kKoiqiVvAxDaDJYMZZQLgHQj9cuWT1MXLfXElTDuf8s,7
-goodwe-0.4.3.dist-info/RECORD,,
+goodwe-0.4.5.dist-info/LICENSE,sha256=aZAhk3lRdYT1YZV-IKRHISEcc_KNUmgfuNO3QhRamNM,1073
+goodwe-0.4.5.dist-info/METADATA,sha256=9MoleSeCTePnmqw6x_u5WcBE0GXwVvCtxF-9s4hqEHw,3376
+goodwe-0.4.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+goodwe-0.4.5.dist-info/top_level.txt,sha256=kKoiqiVvAxDaDJYMZZQLgHQj9cuWT1MXLfXElTDuf8s,7
+goodwe-0.4.5.dist-info/RECORD,,