atomicshop 2.18.1__py3-none-any.whl → 2.18.2__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.18.1'
+__version__ = '2.18.2'

atomicshop/mitm/connection_thread_worker.py

@@ -291,6 +291,11 @@ def thread_worker_main(
         try:
             while True:
                 client_message = responder_queue.get()
+
+                # If the message is not a ClientMessage object, then we'll break the loop, since it is the exit signal.
+                if not isinstance(client_message, ClientMessage):
+                    return
+
                 raw_responses: list[bytes] = create_responder_response(client_message)
 
                 is_socket_closed: bool = False
@@ -377,10 +382,10 @@ def thread_worker_main(
                 # the close on the opposite socket.
                 record_and_statistics_write(client_message)
 
-                if is_socket_closed:
-                    exception_or_close_in_receiving_thread = True
-                    finish_thread()
-                    return
+                # if is_socket_closed:
+                #     exception_or_close_in_receiving_thread = True
+                #     finish_thread()
+                #     return
 
                 # If we're in response mode, execute responder.
                 if config_static.TCPServer.server_response_mode:
@@ -404,9 +409,10 @@ def thread_worker_main(
 
                         record_and_statistics_write(client_message)
 
-                    # If the socket was closed, then we'll break the loop.
+                    # If the socket was closed on message receive, then we'll break the loop only after send.
                     if is_socket_closed or error_on_send:
                         exception_or_close_in_receiving_thread = True
+                        responder_queue.put('exit')
                         finish_thread()
                         return
         except Exception as exc:
@@ -437,6 +443,7 @@ def thread_worker_main(
         #     record_and_statistics_write(client_message)
 
         finish_thread()
+        responder_queue.put('exit')
         exception_queue.put(exc)
 
     def handle_exceptions_on_main_connection_thread(
@@ -512,6 +519,9 @@ def thread_worker_main(
             responder_thread: threading.Thread = threading.Thread(
                 target=responder_thread_worker, name=f"Thread-{thread_id}-Responder", daemon=True)
             responder_thread.start()
+        else:
+            # noinspection PyTypeChecker
+            responder_thread = None
 
         service_client = None
         client_receive_count: int = 0
@@ -557,6 +567,8 @@ def thread_worker_main(
 
             client_thread.join()
             service_thread.join()
+            if config_static.TCPServer.server_response_mode:
+                responder_thread.join()
 
             # If there was an exception in any of the threads, then we'll raise it here.
             if not client_exception_queue.empty():

{atomicshop-2.18.1.dist-info → atomicshop-2.18.2.dist-info}/METADATA

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

{atomicshop-2.18.1.dist-info → atomicshop-2.18.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=sd-5MCzdxJLvLvlvBmT3hqetHRPabTPPEglAUqrWUSo,123
+atomicshop/__init__.py,sha256=EPl1ua1q9CfR8reaw61h0P-bol2bj9D-p6to1iUifSY,123
 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
@@ -127,7 +127,7 @@ atomicshop/file_io/xmls.py,sha256=zh3SuK-dNaFq2NDNhx6ivcf4GYCfGM8M10PcEwDSpxk,21
 atomicshop/mitm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/mitm/config_static.py,sha256=HIzxyMEj7DZksYvJsN5VuKpB-_HSVvuR6U59ztS9gi0,7871
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=NHRa_f7k12JH9eDuGmr_-eCPRQVjO77RgCmLe9K2lWA,26073
+atomicshop/mitm/connection_thread_worker.py,sha256=d7XMZoXbXm9IUywg-IIVApad-NKpSdErLWgHtK8A4F4,26623
 atomicshop/mitm/import_config.py,sha256=0Ij14aISTllTOiWYJpIUMOWobQqGofD6uafui5uWllE,9272
 atomicshop/mitm/initialize_engines.py,sha256=NWz0yBErSrYBn0xWkJDBcHStBJ-kcsv9VtorcSP9x5M,8258
 atomicshop/mitm/message.py,sha256=mNo4Lphr_Jo6IlNX5mPJzABpogWGkjOhwI4meAivwHw,2987
@@ -319,8 +319,8 @@ atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0L
 atomicshop/wrappers/socketw/statistics_csv.py,sha256=fgMzDXI0cybwUEqAxprRmY3lqbh30KAV-jOpoFKT-m8,3395
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_network.py,sha256=zZQfps-CdODQaTUADbHAwKHr5RUg7BLafnKWBbKaLN4,8728
-atomicshop-2.18.1.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.18.1.dist-info/METADATA,sha256=udb7ZbArHpKHBqBMXmBZbJw4FBWF0EVZeWc3yVZHeak,10499
-atomicshop-2.18.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.18.1.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.18.1.dist-info/RECORD,,
+atomicshop-2.18.2.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.18.2.dist-info/METADATA,sha256=jeXe5N1uxADb9T7GA5B10ENn-cmKa6WN6RywG1h3WgY,10499
+atomicshop-2.18.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.18.2.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.18.2.dist-info/RECORD,,