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

atomicshop/mitm/connection_thread_worker.py

@@ -353,6 +353,21 @@ def thread_worker_main(
                         server_receive_count += 1
                         current_count = server_receive_count
 
+                    # Getting current time of message received, either from client or service.
+                    client_message.timestamp = datetime.now()
+
+                    # # No need to receive on service socket if we're in offline mode, because there is no service to connect to.
+                    # if config_static.MainConfig.offline and side == 'Service':
+                    #     print_api("Offline Mode, skipping receiving on service socket.", logger=network_logger,
+                    #               logger_method='info')
+                    # else:
+
+                    # TODO
+                    # if config_static.MainConfig.offline:
+                    #     if side == 'Client':
+                    #         # If we're in offline mode, then we'll use the offline queue to put the data for the service socket.
+                    #         offline_client_service_queue.put()
+
                     network_logger.info(
                         f"Initializing Receiver for {side} cycle: {str(current_count)}")
 
@@ -360,9 +375,6 @@ def thread_worker_main(
                     received_raw_data, is_socket_closed, error_message = receiver.Receiver(
                         ssl_socket=receiving_socket, logger=network_logger).receive()
 
-                    # Getting current time of message received, either from client or service.
-                    client_message.timestamp = datetime.now()
-
                     # In case of client socket, we'll process the raw data specifically for the client.
                     if side == 'Client':
                         process_client_raw_data(received_raw_data, error_message, client_message)
@@ -383,6 +395,11 @@ 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
+
                     # Now send it to requester/responder.
                     if side == 'Client':
                         # Send to requester.
@@ -395,10 +412,6 @@ def thread_worker_main(
                     else:
                         raise ValueError(f"Unknown side [{side}] of the socket: {receiving_socket}")
 
-                    if is_socket_closed:
-                        exception_or_close_in_receiving_thread = True
-                        finish_thread()
-                        return
 
                 # If nothing was passed from the responder, and the client message is the connection message, then we'll skip to the next iteration.
                 if not bytes_to_send_list and client_connection_message:
@@ -511,6 +524,9 @@ def thread_worker_main(
     # websocket_unmasked_frame_parser = websocket_parse.WebsocketFrameParser()
     websocket_frame_parser = websocket_parse.WebsocketFrameParser()
 
+    # Offline queue between client and service threads.
+    offline_client_service_queue: queue.Queue = queue.Queue()
+
     # Loading parser by domain, if there is no parser for current domain - general reference parser is loaded.
     # These should be outside any loop and initialized only once entering the thread.
     found_domain_module = assign_class_by_domain(

atomicshop/wrappers/dockerw/dockerw.py

@@ -1,3 +1,5 @@
+import threading
+
 import docker
 from docker.models.containers import Container
 from docker import DockerClient
@@ -177,14 +179,31 @@ def stop_remove_containers_by_image_name(image_name: str):
     :param image_name: str, the name of the image.
     :return:
     """
+
+    def stop_remove_containers(container_instance: Container):
+        """
+        Stop and remove a container instance.
+        :param container_instance: Container, the docker container object.
+        """
+        if container_instance.status == "running":
+            print_api(f"Stopping container: [{container_instance.name}]. Short ID: [{container_instance.short_id}]")
+            container_instance.stop()
+        print_api(f"Removing container: [{container_instance.name}]. Short ID: [{container_instance.short_id}]")
+        container_instance.remove()
+        print_api(f"Container removed: [{container_instance.name}]. Short ID: [{container_instance.short_id}]", color='green')
+
+
     client = docker.from_env()
     all_containers = client.containers.list(all=True)
+
+    containers_to_remove: list[Container] = []
     for container in all_containers:
         if any(image_name in tag for tag in container.image.tags):
-            if container.status == "running":
-                print_api(f"Stopping container: [{container.name}]. Short ID: [{container.short_id}]")
-                container.stop()
-            container.remove()
+            containers_to_remove.append(container)
+
+    for removing_container in containers_to_remove:
+        threading.Thread(target=stop_remove_containers, args=(removing_container,), daemon=True).start()
+
     client.close()
 
 

{atomicshop-3.1.11.dist-info → atomicshop-3.1.13.dist-info}/METADATA

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

{atomicshop-3.1.11.dist-info → atomicshop-3.1.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=8u6hiKXHeheb_YkAYlFORxMIiYuSzHr0do9YConmyXA,123
+atomicshop/__init__.py,sha256=m7-cUoalFlb_P0L7dq5ZKqms-k_BdzctCtwbbLtMGyQ,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
@@ -136,7 +136,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=N3D06C_wUytwm80PQCL90ZGHLMHeQlCcI2XQQU2FZ1I,8145
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=Iea2XszWwqcvIq1eyRDBkIuW1uUQHVaAxfdA9EZolac,28507
+atomicshop/mitm/connection_thread_worker.py,sha256=r3yKhT96oh_vyFIi858gYrpFyqIpoDwxIMAOo2S8Jl4,29385
 atomicshop/mitm/import_config.py,sha256=gCH1hV-CxBAdwjeFJu1I5ntbm5hqzcB0y0vzRPkzra0,16936
 atomicshop/mitm/initialize_engines.py,sha256=Pj9k3iLdoE0KAl3QWG1Z10LHUHY8WQivSPFnQLhCWrc,7385
 atomicshop/mitm/message.py,sha256=CDhhm4BTuZE7oNZCjvIZ4BuPOW4MuIzQLOg91hJaxDI,3065
@@ -224,7 +224,7 @@ atomicshop/wrappers/ctyping/msi_windows_installer/cabs.py,sha256=htzwb2ROYI8yyc8
 atomicshop/wrappers/ctyping/msi_windows_installer/extract_msi_main.py,sha256=AEkjnqEhfCbCUcYaulv3uba5hZjTB03xm-puAINsZGM,5488
 atomicshop/wrappers/ctyping/msi_windows_installer/tables.py,sha256=tHsu0YfBgzuIk9L-PyqLgU_IzyVbCfy8L1EqelNnvWk,17674
 atomicshop/wrappers/dockerw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/dockerw/dockerw.py,sha256=mwQT8d1aUrn8FbMCwcmUjoP35UWexl8DztNSuJAHJQo,9865
+atomicshop/wrappers/dockerw/dockerw.py,sha256=DIhn3RTG3m7bJ-NTevoF1s1EeGHgi2y-m07oY5xJ_ls,10640
 atomicshop/wrappers/dockerw/install_docker.py,sha256=7NTMxCPBesr0QcqB0RZ5YU0I8FDPtNux_mYAX28wI0I,9982
 atomicshop/wrappers/elasticsearchw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/elasticsearchw/config_basic.py,sha256=fDujtrjEjbWiYh_WQ3OcYp_8mXhXPYeKLy4wSPL5qM0,1177
@@ -337,8 +337,8 @@ atomicshop/wrappers/socketw/statistics_csv.py,sha256=WcNyaqEZ82S5-f3kzqi1nllNT2N
 atomicshop/wrappers/winregw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/winregw/winreg_installed_software.py,sha256=Qzmyktvob1qp6Tjk2DjLfAqr_yXV0sgWzdMW_9kwNjY,2345
 atomicshop/wrappers/winregw/winreg_network.py,sha256=ih0BVNwByLvf9F_Lac4EdmDYYJA3PzMvmG0PieDZrsE,9905
-atomicshop-3.1.11.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.1.11.dist-info/METADATA,sha256=nanoa0C9_fa9ZwN1zyJxq_IsjcXhUGGWVSzn5Hm8AZQ,10671
-atomicshop-3.1.11.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.1.11.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.1.11.dist-info/RECORD,,
+atomicshop-3.1.13.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.1.13.dist-info/METADATA,sha256=5LMH6VMuu4OhGpNqI2y4YObNGBe0k0ZU-GeGaqZl-xM,10671
+atomicshop-3.1.13.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.1.13.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.1.13.dist-info/RECORD,,