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

atomicshop/mitm/connection_thread_worker.py

@@ -362,12 +362,6 @@ def thread_worker_main(
                     #               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)}")
 
@@ -404,6 +398,14 @@ def thread_worker_main(
                     if side == 'Client':
                         # Send to requester.
                         bytes_to_send_list: list[bytes] = create_requester_request(client_message)
+
+                        # If we're in offline mode, then we'll put the request to the responder right away.
+                        if config_static.MainConfig.offline:
+                            print_api("Offline Mode, sending to responder directly.", logger=network_logger,
+                                      logger_method='info')
+                            process_client_raw_data(bytes_to_send_list[0], error_message, client_message)
+                            client_message.action = 'client_responder'
+                            bytes_to_send_list = create_responder_response(client_message)
                     elif side == 'Service':
                         bytes_to_send_list: list[bytes] = create_responder_response(client_message)
                         print_api(f"Got responses from responder, count: [{len(bytes_to_send_list)}]",
@@ -430,9 +432,16 @@ def thread_worker_main(
 
                     record_and_statistics_write(client_message)
 
-                    error_on_send: str = sender.Sender(
-                        ssl_socket=sending_socket, class_message=bytes_to_send_single,
-                        logger=network_logger).send()
+                    # If we're in offline mode, it means we're in the client thread, and we'll send the
+                    # bytes back to the client socket.
+                    if config_static.MainConfig.offline:
+                        error_on_send: str = sender.Sender(
+                            ssl_socket=receiving_socket, class_message=bytes_to_send_single,
+                            logger=network_logger).send()
+                    else:
+                        error_on_send: str = sender.Sender(
+                            ssl_socket=sending_socket, class_message=bytes_to_send_single,
+                            logger=network_logger).send()
 
                     if error_on_send:
                         client_message.reinitialize_dynamic_vars()
@@ -599,20 +608,25 @@ def thread_worker_main(
             client_thread = threading.Thread(
                 target=receive_send_start,
                 args=(client_socket, service_socket_instance, client_exception_queue, None),
-                name=f"Thread-{thread_id}-Client")
-            client_thread.daemon = True
+                name=f"Thread-{thread_id}-Client",
+                daemon=True)
             client_thread.start()
 
             service_exception_queue: queue.Queue = queue.Queue()
-            service_thread = threading.Thread(
-                target=receive_send_start,
-                args=(service_socket_instance, client_socket, service_exception_queue, client_message_connection),
-                name=f"Thread-{thread_id}-Service")
-            service_thread.daemon = True
-            service_thread.start()
+            if not config_static.MainConfig.offline:
+                service_thread = threading.Thread(
+                    target=receive_send_start,
+                    args=(service_socket_instance, client_socket, service_exception_queue, client_message_connection),
+                    name=f"Thread-{thread_id}-Service",
+                    daemon=True)
+                service_thread.start()
 
             client_thread.join()
-            service_thread.join()
+            # If we're in offline mode, then there is no service thread.
+            if not config_static.MainConfig.offline:
+                # If we're not in offline mode, then we'll wait for the service thread to finish.
+                # noinspection PyUnboundLocalVariable
+                service_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/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='blue')
+
+
     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.12.dist-info → atomicshop-3.1.14.dist-info}/METADATA

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

{atomicshop-3.1.12.dist-info → atomicshop-3.1.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=c8m_Gh0h9hfNm9ePH6o00XYoYEtAE6ZAFRagc98X2aE,123
+atomicshop/__init__.py,sha256=51cQhVAb57yTXRlohpUAwbJggyE5xJPvP9tWPDiTCP8,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=r3yKhT96oh_vyFIi858gYrpFyqIpoDwxIMAOo2S8Jl4,29385
+atomicshop/mitm/connection_thread_worker.py,sha256=Fqb2OfhM0GVpPSV-6luba4eaMQ68VqwFb0eB2vrtE4E,30477
 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=GgPSvXxJj15kZ-LPiaHLl8aekof53sSP_U-vUMUe7_8,10639
 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.12.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-3.1.12.dist-info/METADATA,sha256=CML7ZknJI9npNHvo4ZJ7XE9sb2xMKnhoQUREbKqIvx0,10671
-atomicshop-3.1.12.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-3.1.12.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-3.1.12.dist-info/RECORD,,
+atomicshop-3.1.14.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-3.1.14.dist-info/METADATA,sha256=lhw9Eozk9CfUi_0d053WbgebwXaDpZq1gfNAqaEvmUU,10671
+atomicshop-3.1.14.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-3.1.14.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-3.1.14.dist-info/RECORD,,