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

goodwe/protocol.py

@@ -141,11 +141,13 @@ class UdpInverterProtocol(InverterProtocol, asyncio.DatagramProtocol):
             logger.debug("Received response fragment (%d of %d): %s", ex.length, ex.expected, data.hex())
             self._partial_data = data
             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:
@@ -284,11 +286,13 @@ class TcpInverterProtocol(InverterProtocol, asyncio.Protocol):
             logger.debug("Received response fragment (%d of %d): %s", ex.length, ex.expected, data.hex())
             self._partial_data = data
             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:
@@ -469,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.
 
@@ -485,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
@@ -496,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
@@ -504,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.4.dist-info → goodwe-0.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: goodwe
-Version: 0.4.4
+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.4.dist-info → goodwe-0.4.5.dist-info}/RECORD

@@ -7,10 +7,10 @@ goodwe/exceptions.py,sha256=dKMLxotjoR1ic8OVlw1joIJ4mKWD6oFtUMZ86fNM5ZE,1403
 goodwe/inverter.py,sha256=86aMJzJjNOr1I_tCF5H6mBwzDTjLbGDKUL2hbi0XSxg,10459
 goodwe/modbus.py,sha256=Mg_s_v8kbZgqXZM6ZUUxkZx2boAG8LkuDG5OiFKK2X4,8402
 goodwe/model.py,sha256=dWBjMFJMnhZoUdDd9fGT54DERDANz4TirK0Wy8kWMbk,2068
-goodwe/protocol.py,sha256=bOieJx6jbgSPYvwk8tSGkmRE586HgeCUGKezAkzNSsA,28563
+goodwe/protocol.py,sha256=Ry1B-kki5F-AnsmpeUWuhP3eCCH1wrKKfDuT9BKfmvE,29140
 goodwe/sensor.py,sha256=buPG8BcgZmRDqaMrLQUACLHB85U134qG6qo_ggsu48A,37679
-goodwe-0.4.4.dist-info/LICENSE,sha256=aZAhk3lRdYT1YZV-IKRHISEcc_KNUmgfuNO3QhRamNM,1073
-goodwe-0.4.4.dist-info/METADATA,sha256=QQS2Kydn9eELSDLYpWLzibdXB1x9WON9wmLJXCT7KYw,3376
-goodwe-0.4.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-goodwe-0.4.4.dist-info/top_level.txt,sha256=kKoiqiVvAxDaDJYMZZQLgHQj9cuWT1MXLfXElTDuf8s,7
-goodwe-0.4.4.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,,