atomicshop 2.16.30__py3-none-any.whl → 2.16.31__py3-none-any.whl

atomicshop/__init__.py

@@ -1,4 +1,4 @@
 """Atomic Basic functions and classes to make developer life easier"""
 
 __author__ = "Den Kras"
-__version__ = '2.16.30'
+__version__ = '2.16.31'

atomicshop/wrappers/socketw/sender.py

@@ -68,39 +68,32 @@ class Sender:
 
             # At this point the sending loop finished successfully
             self.logger.info(f"Sent the message to destination.")
-        except ConnectionResetError as e:
-            destination_address, destination_port = base.get_destination_address_from_socket(self.ssl_socket)
-            if self.ssl_socket.server_hostname:
-                destination_address = self.ssl_socket.server_hostname
-            destination: str = f'{destination_address}:{destination_port}'
-
-            error_class_type = str(type(e)).replace("<class '", '').replace("'>", '')
-            exception_error = tracebacks.get_as_string(one_line=True)
-            error_message = (f"Socket Send: {destination}: Error, Couldn't reach the server - Connection was reset | "
-                             f"{error_class_type}: {exception_error}")
-        except (ssl.SSLEOFError, ssl.SSLZeroReturnError, ssl.SSLWantWriteError, TimeoutError) as e:
-            destination_address, destination_port = base.get_destination_address_from_socket(self.ssl_socket)
-            if self.ssl_socket.server_hostname:
-                destination_address = self.ssl_socket.server_hostname
-            destination: str = f'{destination_address}:{destination_port}'
-
-            error_class_type = str(type(e)).replace("<class '", '').replace("'>", '')
-            exception_error = tracebacks.get_as_string(one_line=True)
-            error_message = f"Socket Send: {destination}: {error_class_type}: {exception_error}"
         except Exception as e:
-            destination_address, destination_port = base.get_destination_address_from_socket(self.ssl_socket)
+            source_tuple, destination_tuple = base.get_source_destination(self.ssl_socket)
+            source_address, source_port = source_tuple
+            destination_address, destination_port = destination_tuple
             if self.ssl_socket.server_hostname:
                 destination_address = self.ssl_socket.server_hostname
-            destination: str = f'{destination_address}:{destination_port}'
+            destination: str = f'[{source_address}:{source_port}<->{destination_address}:{destination_port}]'
 
             error_class_type = str(type(e)).replace("<class '", '').replace("'>", '')
             exception_error = tracebacks.get_as_string(one_line=True)
+
             if 'ssl' in error_class_type.lower():
-                error_message = (f"Socket Send: {destination}: "
-                                 f"SSL UNDOCUMENTED Exception: {error_class_type}{exception_error}")
+                if error_class_type in ['ssl.SSLEOFError', 'ssl.SSLZeroReturnError', 'ssl.SSLWantWriteError']:
+                    error_message = f"Socket Send: {destination}: {error_class_type}: {exception_error}"
+                else:
+                    error_message = (f"Socket Send: {destination}: "
+                                     f"SSL UNDOCUMENTED Exception: {error_class_type}{exception_error}")
             else:
-                error_message = (f"Socket Send: {destination}: "
-                                 f"Error, UNDOCUMENTED Exception: {error_class_type}{exception_error}")
+                if error_class_type == 'ConnectionResetError':
+                    error_message = (f"Socket Send: {destination}: "
+                                     f"Error, Couldn't reach the server - Connection was reset | "
+                                     f"{error_class_type}: {exception_error}")
+                elif error_class_type in ['TimeoutError']:
+                    error_message = f"Socket Send: {destination}: {error_class_type}: {exception_error}"
+                else:
+                    raise e
 
         if error_message:
             print_api(error_message, logger=self.logger, logger_method='error')

{atomicshop-2.16.30.dist-info → atomicshop-2.16.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: atomicshop
-Version: 2.16.30
+Version: 2.16.31
 Summary: Atomic functions and classes to make developer life easier
 Author: Denis Kras
 License: MIT License

{atomicshop-2.16.30.dist-info → atomicshop-2.16.31.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=ZRwxdpiCNZUwHXRtBUzWN6sTrKE1qIh258JoD4OfSDc,124
+atomicshop/__init__.py,sha256=sCusnYw5eAOy-azyQImMCB9etQnC6WjnQr70CnWZluk,124
 atomicshop/_basics_temp.py,sha256=6cu2dd6r2dLrd1BRNcVDKTHlsHs_26Gpw8QS6v32lQ0,3699
 atomicshop/_create_pdf_demo.py,sha256=Yi-PGZuMg0RKvQmLqVeLIZYadqEZwUm-4A9JxBl_vYA,3713
 atomicshop/_patch_import.py,sha256=ENp55sKVJ0e6-4lBvZnpz9PQCt3Otbur7F6aXDlyje4,6334
@@ -300,7 +300,7 @@ atomicshop/wrappers/socketw/dns_server.py,sha256=F-t2ZOrMAS0hZ5AaoTsIEbe7jj0tUat
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
 atomicshop/wrappers/socketw/get_process.py,sha256=zKEqh98cB9UDLFhtxVpperfXsCjyIMNANHilDD06p0U,6094
 atomicshop/wrappers/socketw/receiver.py,sha256=XVvWOoeCo3vA0O5p19ryi-hcDIyx382WNG7WzMNVeYk,9322
-atomicshop/wrappers/socketw/sender.py,sha256=DIkseEsgrcT3wU-orZ4falPTQPG9tsGt4ASQCnXTG5s,5620
+atomicshop/wrappers/socketw/sender.py,sha256=5HPrgTS2pA1g-jbG1TUtR7drHT1Z_8UevlRCTwW7dgY,5007
 atomicshop/wrappers/socketw/sni.py,sha256=J1kPnQ77XwKN1pO5aOI1c_VfhuivCm95OOaQxMpPuZ0,17627
 atomicshop/wrappers/socketw/socket_client.py,sha256=XC-YaqA1wu0rvWQ9Q99DWLxcycKPkPc72pSnflzalfo,20320
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
@@ -309,8 +309,8 @@ atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0L
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=w1AH-zf4mBuT4euf28UKij9ihM-b1BRU9Qfby0QDdqI,2957
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=bQ8Jql8bVGBJ0dt3VQ56lga_1LBOMLI3Km_otvvbU6c,7138
-atomicshop-2.16.30.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.30.dist-info/METADATA,sha256=TE56Q_3IHpOLBlD1Tp4N45ZpofIIs0cJmWDd9y4o6mQ,10473
-atomicshop-2.16.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.30.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.30.dist-info/RECORD,,
+atomicshop-2.16.31.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.31.dist-info/METADATA,sha256=qf8gXgqyW9JhWKob2yEkM118Kt1OcfQyVeqTrz9nj-0,10473
+atomicshop-2.16.31.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.31.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.31.dist-info/RECORD,,