DLMS-SPODES-client 0.19.20__py3-none-any.whl → 0.19.21__py3-none-any.whl

DLMS_SPODES_client/client.py

@@ -260,12 +260,12 @@ class Client:
             case _:         raise ValueError(F"can't calculate channel index by media: {self.media}")
 
     def get_frame(self, read_data: bytearray, reply: GXReplyData) -> frame.Frame | None:
+        reply.complete = False
         while len(read_data) != 0:
             new_frame = frame.Frame.try_from(read_data)
-            reply.complete = True
-            if new_frame is None:
-                reply.complete = False
+            if not isinstance(new_frame, frame.Frame):
                 return None
+            reply.complete = True
             if new_frame.is_for_me(self.DA, self.SA):
                 self.received_frames.append(new_frame)
                 if new_frame.is_segmentation:
@@ -319,7 +319,7 @@ class Client:
         len_ = _GXCommon.getObjectCount(reply.data)
         if len_ > reply.data.size - reply.data.position:
             reply.complete = False
-            return
+            return result.Error.from_e(RuntimeError("not enouth reply data size"))
         GXDLMS.getDataFromBlock(reply.data, index)
         if (bc & 0x80) == 0:
             reply.moreData = (RequestTypes(reply.moreData | RequestTypes.GBT))
@@ -758,22 +758,19 @@ class Client:
                 self.log(logL.INFO, F"TX: {send_frame.content.hex(" ")}")
             attempt: int = 1
             while attempt < 3:
-                try:
-                    await asyncio.wait_for(                 # todo: don't work exception!!!! Why????
-                        fut=self.media.receive(recv_buf),
-                        timeout=self.com_profile.parameters.inactivity_time_out)  # todo: only for HDLC
-                    if self.__is_frame(notify, recv_buf, reply):
-                        break
-                    elif notify.data.size != 0:
-                        if not notify.isMoreData():
-                            notify.clear()
-                        continue
-                    else:
-                        """our frame not was found"""
-                except TimeoutError as e:
-                    self.log(logL.WARN, F'Data send failed: {e}.  Try to resend {attempt+1}/3. RX_buffer: {recv_buf.hex(" ")}')
+                if not await self.media.receive(recv_buf):  # todo: make for BLE
+                    self.log(logL.WARN, F'Data receive failed: Try to resend {attempt + 1}/3. RX_buffer: {recv_buf.hex(" ")}')
                     await self.media.send(send_frame.content)
                     attempt += 1
+                    continue
+                if self.__is_frame(notify, recv_buf, reply):
+                    break
+                if notify.data.size != 0:
+                    if not notify.isMoreData():
+                        notify.clear()
+                    continue
+                else:
+                    """our frame not was found"""
             else:
                 return result.Error.from_e(TimeoutError("Failed to receive reply from the device in given time"), "read data block")
             recv_buf.clear()

{dlms_spodes_client-0.19.20.dist-info → dlms_spodes_client-0.19.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: DLMS_SPODES_client
-Version: 0.19.20
+Version: 0.19.21
 Summary: dlms-spodes
 Author-email: Serj Kotilevski <youserj@outlook.com>
 Project-URL: Source, https://github.com/youserj/SPODESclient_prj

{dlms_spodes_client-0.19.20.dist-info → dlms_spodes_client-0.19.21.dist-info}/RECORD

@@ -1,6 +1,6 @@
 DLMS_SPODES_client/FCS16.py,sha256=RhoN4fX7eesKWfWCkRT_uWNfiQHqFd3T6lRwxfamUqw,2697
 DLMS_SPODES_client/__init__.py,sha256=6wphXvqkodng7h4nKNmkfldbaxf--IDVGfT0yNbas-o,449
-DLMS_SPODES_client/client.py,sha256=T_8nI6_tCWK6Us74gjIM_2I8EtETs4dQX4ygFmnV70A,112333
+DLMS_SPODES_client/client.py,sha256=lsMLRLfgbISLOpaUPJme0-4631A0ZgQBOAVqjkQjvH4,112156
 DLMS_SPODES_client/logger.py,sha256=zAbihLloMU99w8Sw3djQ0cwItzyGq0Fz8DI9_suazv4,1913
 DLMS_SPODES_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 DLMS_SPODES_client/services.py,sha256=xM_-h322V1bGBcw9cJh7XOSUMTL3_E-GX89-z3YwIYw,3909
@@ -54,8 +54,8 @@ DLMS_SPODES_client/gurux_dlms/enums/Task.py,sha256=chuOL6-IMxBvABUZtoFcaYaQQB4GZ
 DLMS_SPODES_client/gurux_dlms/enums/VdeStateError.py,sha256=qT87LMbIYEs3TYPIp3N-dR2Tcg9KhKyiELwhVl5U-tw,233
 DLMS_SPODES_client/gurux_dlms/enums/__init__.py,sha256=F_sgGwNmmdpbKvP1klJQUNiLXxU2BtZ-LgEI9e6xP8g,1314
 DLMS_SPODES_client/gurux_dlms/internal/_GXCommon.py,sha256=7D9EYcfiZxwbk8sfpHv7s2nYqrbmGf-Tbwv2T-gqmgk,53226
-dlms_spodes_client-0.19.20.dist-info/METADATA,sha256=o-1ik4JJ14TuhPbklYvCiHTxj6JxlKMrlM3eliI_ypY,986
-dlms_spodes_client-0.19.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dlms_spodes_client-0.19.20.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
-dlms_spodes_client-0.19.20.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
-dlms_spodes_client-0.19.20.dist-info/RECORD,,
+dlms_spodes_client-0.19.21.dist-info/METADATA,sha256=diEibtEXXEZhLaSqJgunuNJ2uMuN5pjSTAtl3QSPVqU,986
+dlms_spodes_client-0.19.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dlms_spodes_client-0.19.21.dist-info/entry_points.txt,sha256=Z6UTeQjjCf2k1Y3Bjs0s7yr-UYSWb-TvJMuG2K2MApw,70
+dlms_spodes_client-0.19.21.dist-info/top_level.txt,sha256=rh_3Uig5bc6J_lKni01btol7dX_IgIJulNtGjGehmBE,19
+dlms_spodes_client-0.19.21.dist-info/RECORD,,