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

atomicshop/a_installs/ubuntu/mongodb.py

@@ -0,0 +1,12 @@
+#! /usr/bin/env python3
+import sys
+
+from atomicshop.wrappers.mongodbw import install_mongodb_ubuntu
+
+
+def main():
+    install_mongodb_ubuntu.install_main(compass=True)
+
+
+if __name__ == "__main__":
+    sys.exit(main())

atomicshop/a_installs/ubuntu/pycharm.py

@@ -1,3 +1,4 @@
+#! /usr/bin/env python3
 import sys
 
 from atomicshop.wrappers.pycharmw import ubuntu

atomicshop/a_installs/win/mongodb.py

@@ -1,8 +1,8 @@
-from atomicshop.wrappers.mongodbw import install_mongodb
+from atomicshop.wrappers.mongodbw import install_mongodb_win
 
 
 def main():
-    install_mongodb.download_install_latest_main()
+    install_mongodb_win.download_install_latest_main()
 
 
 if __name__ == "__main__":

atomicshop/basics/exceptions.py

@@ -1,4 +1,3 @@
-# v1.0.3 - 28.03.2023 17:20
 import sys
 
 from .threads import current_thread_id
@@ -15,3 +14,8 @@ def print_exception() -> None:
     exc_type, exc_value, exc_traceback = sys.exc_info()
 
     print(f"{error_log_prefix} Thread {thread_id}: * Details: {exc_type}, {exc_value}")
+
+
+def get_exception_type_string(exception: Exception) -> str:
+    """ Get exception type string """
+    return type(exception).__name__

atomicshop/mitm/connection_thread_worker.py

@@ -273,6 +273,8 @@ def thread_worker_main(
 
                     # So if the socket was closed and there was an error we can break the loop
                     if not service_ssl_socket:
+                        record_and_statistics_write()
+                        recorded = True
                         break
 
                 # If there is a response, then send it.

atomicshop/wrappers/mongodbw/install_mongodb_ubuntu.py

@@ -0,0 +1,100 @@
+import subprocess
+import sys
+import os
+
+
+from ... import print_api, web
+from .. import ubuntu_terminal
+from ...permissions import ubuntu_permissions
+
+
+COMPASS_INSTALLATION_SCRIPT_URL: str = \
+    'https://raw.githubusercontent.com/mongodb/mongo/master/src/mongo/installer/compass/install_compass'
+
+
+def run_command(command):
+    """Run a system command and exit if the command fails."""
+    try:
+        subprocess.run(command, check=True, shell=True)
+    except subprocess.CalledProcessError as e:
+        print_api.print_api(f"Error: {e}", color='red')
+        sys.exit(1)
+
+
+def install_mongodb(version):
+    """Install the specified major version of MongoDB on Ubuntu."""
+
+    if not version.endswith(".0"):
+        version = f"{version}.0"
+
+    print_api.print_api(f"Installing MongoDB {version} on Ubuntu...")
+    print_api.print_api(f"Installing Prerequisites...")
+    ubuntu_terminal.update_system_packages()
+    ubuntu_terminal.install_packages(["wget", "curl", "gnupg"])
+
+    # Step 1: Import the MongoDB public GPG key
+    print_api.print_api("Step 1: Importing the MongoDB public GPG key...")
+    run_command(f"curl -fsSL https://pgp.mongodb.com/server-{version}.asc | "
+                f"sudo gpg --dearmor -o /usr/share/keyrings/mongodb-server-{version}.gpg")
+
+    # Step 2: Create the MongoDB list file for APT
+    print_api.print_api("Step 2: Creating MongoDB APT list file...")
+    distro_version = subprocess.check_output("lsb_release -sc", shell=True).decode('utf-8').strip()
+    run_command(
+        f"echo 'deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-{version}.gpg ] "
+        f"https://repo.mongodb.org/apt/ubuntu {distro_version}/mongodb-org/{version} multiverse' | "
+        f"sudo tee /etc/apt/sources.list.d/mongodb-org-{version}.list")
+
+    # Step 3: Update the APT package index
+    print_api.print_api("Step 3: Updating the APT package index...")
+    ubuntu_terminal.update_system_packages()
+
+    # Step 4: Install the latest version of MongoDB for the specified major version
+    print_api.print_api(f"Step 4: Installing MongoDB version {version}...")
+    ubuntu_terminal.install_packages(["mongodb-org"])
+
+    # Step 5: Start MongoDB service and enable it on startup
+    print_api.print_api("Step 5: Starting MongoDB service and enabling it on startup...")
+    ubuntu_terminal.start_enable_service_check_availability("mongod")
+
+    print_api.print_api(f"MongoDB {version} installation complete!", color='green')
+
+
+def install_main(
+        compass: bool = False,
+):
+    """
+    Install the latest minor version of MongoDB Community Server on Ubuntu by providing the major version.
+    :param compass: bool, if True, MongoDB Compass will be installed.
+    :return:
+    """
+    # Ensure the user provides a MongoDB major version as an argument.
+    if len(sys.argv) != 2:
+        message: str = ("Usage: python install_mongodb.py <mongo_major_version>\n"
+                        "Example: python install_mongodb.py 7")
+        print_api.print_api(message, color='red')
+        return 1
+
+    mongo_version = sys.argv[1]
+
+    # Call the 'install' function with the major version.
+    install_mongodb(mongo_version)
+
+    if not compass:
+        return 0
+
+    # It doesn't matter what you do with the MSI it will not install Compass, only if you run it manually.
+    # So we will use installation script from their GitHub.
+    print_api.print_api("Downloading MongoDB Compass installation script...")
+    compass_script_path: str = web.download(COMPASS_INSTALLATION_SCRIPT_URL)
+
+    print_api.print_api("Installing MongoDB Compass from script...")
+    ubuntu_permissions.set_executable(compass_script_path)
+    run_command(f'sudo -E python3 {compass_script_path}')
+
+    # Clean up the installer file
+    if os.path.exists(compass_script_path):
+        os.remove(compass_script_path)
+        print_api.print_api("Cleaned up the Compass installer file.")
+
+    return 0

atomicshop/wrappers/mongodbw/mongodbw.py

@@ -18,6 +18,18 @@ These are good examples to get you started, but can't really cover all the use c
 """
 
 
+class MongoDBReplaceOneError(Exception):
+    pass
+
+
+class MongoDBUpdateOneError(Exception):
+    pass
+
+
+class MongoDBUpdateManyError(Exception):
+    pass
+
+
 class MongoDBWrapper:
     def __init__(
             self,
@@ -80,13 +92,15 @@ class MongoDBWrapper:
 
     def delete(
             self,
-            object_instance: Union[list[dict], dict],
+            query_instance: Union[list[dict], dict],
             collection_name: str
     ):
         """
-        Remove a list of dictionaries or a dictionary from a MongoDB collection.
+        Remove a dict or list of dictionaries or a dictionary from a MongoDB collection.
+        For pure mongo, this is the list of queries to remove.
+        Each query for a single item.
 
-        :param object_instance: list of dictionaries, the list of dictionaries to remove from the collection.
+        :param query_instance: dict or list of dictionaries, the list of queries to remove from the collection.
         :param collection_name: str, the name of the collection.
 
         :return: None
@@ -95,7 +109,30 @@ class MongoDBWrapper:
         self.connect()
 
         delete(
-            object_instance=object_instance,
+            query_instance=query_instance,
+            database=self.db, collection_name=collection_name,
+            mongo_client=self.client, close_client=False)
+
+    def delete_many(
+            self,
+            query: dict,
+            collection_name: str
+    ):
+        """
+        Remove all entries that match the query from a MongoDB collection.
+
+        :param query: dict, the query to search for.
+            Example, search for all entries with column name 'name' equal to 'John':
+                query = {'name': 'John'}
+        :param collection_name: str, the name of the collection.
+
+        :return: result of the operation.
+        """
+
+        self.connect()
+
+        return delete_many(
+            query=query,
             database=self.db, collection_name=collection_name,
             mongo_client=self.client, close_client=False)
 
@@ -203,6 +240,69 @@ class MongoDBWrapper:
 
         return distinct_values
 
+    def update(
+            self,
+            collection_name: str,
+            query: dict,
+            update_instance: Union[dict, list[dict]],
+            add_timestamp: bool = False,
+            convert_mixed_lists_to_strings: bool = False
+    ):
+        """
+        Update one entry in a MongoDB collection by query.
+        :param collection_name: str, the name of the collection.
+        :param query: dict, the query to search for.
+            Example, search for all entries with column name 'name' equal to 'John':
+                query = {'name': 'John'}
+            Find by Object id:
+                query = {'_id': ObjectId('5f3e3b3b4b9f3b3b4b9f3b3b')}
+        :param update_instance: dict or list of dicts, the update to apply.
+            Get examples for operators for each dict in the docstring of the function 'update' below.
+        :param add_timestamp: bool, if True, a current time timestamp will be added to the object.
+        :param convert_mixed_lists_to_strings: bool, if True, mixed lists or tuples when entries are
+            strings and integers, the integers will be converted to strings.
+        :return: result of the operation.
+        """
+
+        self.connect()
+
+        return update(
+            database=self.db, collection_name=collection_name,
+            query=query, update_instance=update_instance, add_timestamp=add_timestamp,
+            convert_mixed_lists_to_strings=convert_mixed_lists_to_strings,
+            mongo_client=self.client, close_client=False)
+
+    def replace(
+            self,
+            collection_name: str,
+            query: dict,
+            replacement: dict,
+            add_timestamp: bool = False,
+            convert_mixed_lists_to_strings: bool = False
+    ):
+        """
+        Replace one entry in a MongoDB collection by query.
+        :param collection_name: str, the name of the collection.
+        :param query: dict, the query to search for.
+            Example, search for all entries with column name 'name' equal to 'John':
+                query = {'name': 'John'}
+            Find by Object id:
+                query = {'_id': ObjectId('5f3e3b3b4b9f3b3b4b9f3b3b')}
+        :param replacement: dict, the replacement to apply.
+        :param add_timestamp: bool, if True, a current time timestamp will be added to the object.
+        :param convert_mixed_lists_to_strings: bool, if True, mixed lists or tuples when entries are
+
+        :return: result of the operation.
+        """
+
+        self.connect()
+
+        return replace(
+            database=self.db, collection_name=collection_name,
+            query=query, replacement=replacement,
+            add_timestamp=add_timestamp, convert_mixed_lists_to_strings=convert_mixed_lists_to_strings,
+            mongo_client=self.client, close_client=False)
+
     def count_entries_in_collection(
             self,
             collection_name: str,
@@ -328,7 +428,11 @@ def index(
     collection = db[collection_name]
 
     if convert_mixed_lists_to_strings:
-        object_instance = dicts.convert_int_to_str_in_mixed_lists(object_instance)
+        if isinstance(object_instance, dict):
+            object_instance = dicts.convert_int_to_str_in_mixed_lists(object_instance)
+        elif isinstance(object_instance, list):
+            for doc_index, doc in enumerate(object_instance):
+                object_instance[doc_index] = dicts.convert_int_to_str_in_mixed_lists(doc)
 
     if add_timestamp:
         timestamp = datetime.datetime.now()
@@ -348,16 +452,18 @@ def index(
 
 
 def delete(
-        object_instance: Union[list[dict], dict],
+        query_instance: Union[list[dict], dict],
         database: Union[str, pymongo.database.Database],
         collection_name: str,
         mongo_client: pymongo.MongoClient = None,
         close_client: bool = False
 ):
     """
-    Remove a list of dictionaries or a dictionary from a MongoDB collection.
+    Remove a dict or list of dictionaries or a dictionary from a MongoDB collection.
 
-    :param object_instance: list of dictionaries, the list of dictionaries to remove from the collection.
+    :param query_instance: list of dictionaries, the list of dictionaries to remove from the collection.
+        For pure mongo, this is the list of queries to remove.
+        Each query for a single item.
     :param database: String or the database object.
         str - the name of the database. In this case the database object will be created.
         pymongo.database.Database - the database object that will be used instead of creating a new one.
@@ -369,7 +475,7 @@ def delete(
     :return: None
     """
 
-    _is_object_list_of_dicts_or_dict(object_instance)
+    _is_object_list_of_dicts_or_dict(query_instance)
 
     if not mongo_client:
         mongo_client = connect()
@@ -378,16 +484,55 @@ def delete(
     db = _get_pymongo_db_from_string_or_pymongo_db(database, mongo_client)
     collection = db[collection_name]
 
-    if isinstance(object_instance, dict):
-        collection.delete_one(object_instance)
-    elif isinstance(object_instance, list):
-        for doc in object_instance:
+    if isinstance(query_instance, dict):
+        collection.delete_one(query_instance)
+    elif isinstance(query_instance, list):
+        for doc in query_instance:
             collection.delete_one(doc)
 
     if close_client:
         mongo_client.close()
 
 
+def delete_many(
+        query: dict,
+        database: Union[str, pymongo.database.Database],
+        collection_name: str,
+        mongo_client: pymongo.MongoClient = None,
+        close_client: bool = False
+):
+    """
+    Remove all entries that match the query from a MongoDB collection.
+
+    :param query: dict, the query to search for.
+        Example, search for all entries with column name 'name' equal to 'John':
+            query = {'name': 'John'}
+    :param database: String or the database object.
+        str - the name of the database. In this case the database object will be created.
+        pymongo.database.Database - the database object that will be used instead of creating a new one.
+    :param collection_name: str, the name of the collection.
+    :param mongo_client: pymongo.MongoClient, the connection object.
+        If None, a new connection will be created to default URI.
+    :param close_client: bool, if True, the connection will be closed after the operation.
+
+    :return: result of the operation.
+    """
+
+    if not mongo_client:
+        mongo_client = connect()
+        close_client = True
+
+    db = _get_pymongo_db_from_string_or_pymongo_db(database, mongo_client)
+    collection = db[collection_name]
+
+    result = collection.delete_many(query)
+
+    if close_client:
+        mongo_client.close()
+
+    return result
+
+
 def find(
         database: Union[str, pymongo.database.Database],
         collection_name: str,
@@ -614,6 +759,145 @@ def distinct(
     return distinct_values
 
 
+def update(
+        database: Union[str, pymongo.database.Database],
+        collection_name: str,
+        query: dict,
+        update_instance: Union[dict, list[dict]],
+        add_timestamp: bool = False,
+        convert_mixed_lists_to_strings: bool = False,
+        mongo_client: pymongo.MongoClient = None,
+        close_client: bool = False
+):
+    """
+    Update one entry in a MongoDB collection by query.
+    :param database: String or the database object.
+        str - the name of the database. In this case the database object will be created.
+        pymongo.database.Database - the database object that will be used instead of creating a new one.
+    :param collection_name: str, the name of the collection.
+    :param query: dict, the query to search for.
+        Example, search for all entries with column name 'name' equal to 'John':
+            query = {'name': 'John'}
+        Find by Object id:
+            query = {'_id': ObjectId('5f3e3b3b4b9f3b3b4b9f3b3b')}
+    :param update_instance: dict or list of dicts, the update to apply.
+        If dict, the update will be applied to one entry using 'update_one'.
+        If list of dicts, the update will be applied to multiple entries using 'update_many'.
+
+        Examples for operators for each dict:
+        $set: update the column 'name' to 'Alice':
+            update_instance = {'$set': {'name': 'Alice'}}
+        $inc: increment the column 'age' by 1:
+            update_instance = {'$inc': {'age': 1}}
+        $unset: remove the column 'name':
+            update_instance = {'$unset': {'name': ''}}
+        $push: add a value to the list 'hobbies':
+            update_instance = {'$push': {'hobbies': 'swimming'}}
+        $pull: remove a value from the list 'hobbies':
+            update_instance = {'$pull': {'hobbies': 'swimming'}}
+    :param add_timestamp: bool, if True, a current time timestamp will be added to the object.
+    :param convert_mixed_lists_to_strings: bool, if True, mixed lists or tuples when entries are
+        strings and integers, the integers will be converted to strings.
+    :param mongo_client: pymongo.MongoClient, the connection object.
+        If None, a new connection will be created to default URI.
+    :param close_client: bool, if True, the connection will be closed after the operation.
+
+    :return: None
+    """
+
+    if not mongo_client:
+        mongo_client = connect()
+        close_client = True
+
+    db = _get_pymongo_db_from_string_or_pymongo_db(database, mongo_client)
+    collection = db[collection_name]
+
+    if convert_mixed_lists_to_strings:
+        if isinstance(update_instance, dict):
+            object_instance = dicts.convert_int_to_str_in_mixed_lists(update_instance)
+        elif isinstance(update_instance, list):
+            for doc_index, doc in enumerate(update_instance):
+                update_instance[doc_index] = dicts.convert_int_to_str_in_mixed_lists(doc)
+
+    if add_timestamp:
+        timestamp = datetime.datetime.now()
+        if isinstance(update_instance, dict):
+            update_instance['timestamp'] = timestamp
+        elif isinstance(update_instance, list):
+            for doc in update_instance:
+                doc['timestamp'] = timestamp
+
+    result = None
+    if isinstance(update_instance, dict):
+        result = collection.update_one(query, update_instance)
+    elif isinstance(update_instance, list):
+        result = collection.update_many(query, update_instance)
+
+    if result.matched_count == 0:
+        raise MongoDBUpdateOneError("No document found to update.")
+
+    if close_client:
+        mongo_client.close()
+
+    return result
+
+
+def replace(
+        database: Union[str, pymongo.database.Database],
+        collection_name: str,
+        query: dict,
+        replacement: dict,
+        add_timestamp: bool = False,
+        convert_mixed_lists_to_strings: bool = False,
+        mongo_client: pymongo.MongoClient = None,
+        close_client: bool = False
+):
+    """
+    Replace one entry in a MongoDB collection by query.
+    :param database: String or the database object.
+        str - the name of the database. In this case the database object will be created.
+        pymongo.database.Database - the database object that will be used instead of creating a new one.
+    :param collection_name: str, the name of the collection.
+    :param query: dict, the query to search for.
+        Example, search for all entries with column name 'name' equal to 'John':
+            query = {'name': 'John'}
+        Find by Object id:
+            query = {'_id': ObjectId('5f3e3b3b4b9f3b3b4b9f3b3b')}
+    :param replacement: dict, the replacement to apply.
+    :param add_timestamp: bool, if True, a current time timestamp will be added to the object.
+    :param convert_mixed_lists_to_strings: bool, if True, mixed lists or tuples when entries are strings and integers,
+        the integers will be converted to strings.
+    :param mongo_client: pymongo.MongoClient, the connection object.
+        If None, a new connection will be created to default URI.
+    :param close_client: bool, if True, the connection will be closed after the operation.
+
+    :return: None
+    """
+
+    if not mongo_client:
+        mongo_client = connect()
+        close_client = True
+
+    db = _get_pymongo_db_from_string_or_pymongo_db(database, mongo_client)
+    collection = db[collection_name]
+
+    if convert_mixed_lists_to_strings:
+        replacement = dicts.convert_int_to_str_in_mixed_lists(replacement)
+
+    if add_timestamp:
+        timestamp = datetime.datetime.now()
+        replacement['timestamp'] = timestamp
+
+    result = collection.replace_one(query, replacement)
+    if result.matched_count == 0:
+        raise MongoDBReplaceOneError("No document found to replace.")
+
+    if close_client:
+        mongo_client.close()
+
+    return result
+
+
 def count_entries_in_collection(
         database: Union[str, pymongo.database.Database],
         collection_name: str,

atomicshop/wrappers/socketw/sender.py

@@ -76,7 +76,7 @@ class Sender:
                 destination_address = self.ssl_socket.server_hostname
             destination: str = f'[{source_address}:{source_port}<->{destination_address}:{destination_port}]'
 
-            error_class_type = str(type(e)).replace("<class '", '').replace("'>", '')
+            error_class_type = type(e).__name__
             exception_error = tracebacks.get_as_string(one_line=True)
 
             if 'ssl' in error_class_type.lower():

atomicshop/wrappers/socketw/socket_client.py

@@ -18,6 +18,7 @@ from .. import cryptographyw
 from ..loggingw import loggingw
 from ...print_api import print_api
 from ...file_io import file_io
+from ...basics import tracebacks
 
 
 class SocketClient:
@@ -55,6 +56,12 @@ class SocketClient:
         self.connection_ip = connection_ip
         self.dns_servers_list = dns_servers_list
 
+        if logger:
+            # Create child logger for the provided logger with the module's name.
+            self.logger: logging.Logger = loggingw.get_logger_with_level(f'{logger.name}.{Path(__file__).stem}')
+        else:
+            self.logger: logging.Logger = logger
+
         self.socket_instance = None
 
         # If 'connection_ip' was specified, but no 'dns_servers_list', then this IP will be used for 'socket.connect()'.
@@ -68,12 +75,6 @@ class SocketClient:
         elif self.connection_ip and self.dns_servers_list:
             raise ValueError("Both 'connection_ip' and 'dns_servers_list' were specified.")
 
-        if logger:
-            # Create child logger for the provided logger with the module's name.
-            self.logger: logging.Logger = loggingw.get_logger_with_level(f'{logger.name}.{Path(__file__).stem}')
-        else:
-            self.logger: logging.Logger = logger
-
     # Function to create SSL socket to destination service
     def create_service_socket(self):
         # If TLS is enabled.
@@ -86,8 +87,18 @@ class SocketClient:
             return creator.wrap_socket_with_ssl_context_client___default_certs___ignore_verification(
                 socket_object, self.service_name)
 
-    def service_connection(self):
-        """ Function to establish connection to server """
+    def service_connection(
+            self
+    ) -> tuple[
+            Union[socket.socket, ssl.SSLSocket, None],
+            Union[str, None]]:
+        """
+        Function to establish connection to server
+
+        :return: Tuple with socket object and error string.
+        If connection was successful, the error string will be None.
+        If connection wasn't successful, the socket object will be None.
+        """
         # Check if socket to service domain exists.
         # If not
         if not self.socket_instance:
@@ -106,8 +117,8 @@ class SocketClient:
                 f"Socket already defined to [{self.service_name}:{self.service_port}]. "
                 f"Should be connected - Reusing.")
             # Since, restart the function each send_receive iteration, and there's still a connection we need to
-            # set it True, or the socket object will be nullified in the next step.
-            return True
+            # return the socket, or the socket object will be nullified in the next step.
+            return self.socket_instance
 
         # If 'dns_servers_list' was provided, we will resolve the domain to ip through these servers.
         if self.dns_servers_list:
@@ -125,11 +136,13 @@ class SocketClient:
                 # Get only the first entry of the list of IPs [0]
                 self.connection_ip = function_server_address[0].to_text()
                 self.logger.info(f"Resolved to [{self.connection_ip}]")
-            except dns.resolver.NXDOMAIN:
-                self.logger.error(f"Domain {self.service_name} doesn't exist - Couldn't resolve with "
-                                  f"{self.dns_servers_list}.")
-                pass
-                return None
+            except dns.resolver.NXDOMAIN as e:
+                exception_type: str = type(e).__name__
+                error_string = (
+                    f"Socket Client Connect: {exception_type}: "
+                    f"Domain {self.service_name} doesn't exist - Couldn't resolve with {self.dns_servers_list}.")
+                print_api(error_string, logger=self.logger, logger_method='error')
+                return None, error_string
 
         # If DNS was resolved correctly or DNS servers weren't specified - we can try connecting.
         # If 'connection_ip' was manually specified or resolved with 'dnspython' - the connection
@@ -144,43 +157,25 @@ class SocketClient:
         try:
             # "connect()" to the server using address and port
             self.socket_instance.connect((destination, self.service_port))
-        except ConnectionRefusedError:
-            message = f"Couldn't connect to: {self.service_name}. The server is unreachable - Connection refused."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except ConnectionAbortedError:
-            message = f"Connection was aborted (by the software on host) to {self.service_name}."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except socket.gaierror:
-            message = f"Couldn't resolve [{self.service_name}] to IP using default methods. " \
-                      f"Domain doesn't exist or there's no IP assigned to it."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except ssl.SSLError:
-            message = f"SSLError raised on connection to {self.service_name}."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except TimeoutError:
-            message = f"TimeoutError raised on connection to {self.service_name}."
-            print_api(message, logger=self.logger, logger_method='error', traceback_string=True, oneline=True)
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
-        except ValueError as e:
-            message = f'{str(e)} | on connect to [{self.service_name}].'
-            print_api(message, logger=self.logger, logger_method='error')
-            # Socket close will be handled in the thread_worker_main
-            pass
-            return None
+        except Exception as e:
+            exception_type: str = type(e).__name__
+            exception_error: str = tracebacks.get_as_string(one_line=True)
+            error_string: str = f"Socket Client Connect: {destination}: {exception_type}"
+
+            if exception_type in ['ConnectionRefusedError', 'ConnectionAbortedError', 'ConnectionResetError',
+                                  'ssl.SSLError', 'TimeoutError']:
+                error_message: str = f"{error_string}: {exception_error}"
+                print_api(error_message, logger=self.logger, logger_method='error')
+                return None, error_message
+            elif exception_type == 'socket.gaierror':
+                custom_error_message: str = (
+                    f"Couldn't resolve [{self.service_name}] to IP using default methods. "
+                    f"Domain doesn't exist or there's no IP assigned to it.")
+                error_message: str = f"{error_string}: {custom_error_message}"
+                print_api(error_message, logger=self.logger, logger_method='error')
+                return None, error_message
+            else:
+                raise e
 
         # If everything was fine, we'll log the connection.
         self.logger.info("Connected...")
@@ -200,14 +195,12 @@ class SocketClient:
     def send_receive_to_service(self, request_bytes: bytearray):
         # Define variables
         function_service_data = None
-        error_string = None
+        error_message = None
 
+        service_socket, error_message = self.service_connection()
         # If connection to service server wasn't successful
-        if not self.service_connection():
-            error_string = "Wasn't able to connect to service, closing the destination service socket"
-            print_api(error_string, logger=self.logger, logger_method='error')
-
-            # We'll close the socket and nullify the object
+        if error_message:
+            # Wasn't able to connect to service, closing the destination service socket and nullify the object.
             self.close_socket()
         # If the connection to the service was successful
         else:
@@ -227,7 +220,7 @@ class SocketClient:
 
             # If the socket disconnected on data send
             if error_on_send:
-                error_string = f"Service socket closed on data send: {error_on_send}"
+                error_message = f"Service socket closed on data send: {error_on_send}"
 
                 # We'll close the socket and nullify the object
                 self.close_socket()
@@ -238,12 +231,12 @@ class SocketClient:
 
                 # If data received is empty meaning the socket was closed on the other side
                 if not function_service_data:
-                    error_string = "Service server closed the connection on receive"
+                    error_message = "Service server closed the connection on receive"
 
                     # We'll close the socket and nullify the object
                     self.close_socket()
 
-        return function_service_data, error_string, self.connection_ip, self.socket_instance
+        return function_service_data, error_message, self.connection_ip, self.socket_instance
 
     def send_receive_message_list_with_interval(
             self, requests_bytes_list: list, intervals_list: list, intervals_defaults: int, cycles: int = 1):
@@ -316,15 +309,15 @@ class SocketClient:
                 # be passed.
                 # If there was connection error or socket close, then "ssl_socket" of the "service_client"
                 # will be empty.
-                response_raw_bytes, error_string, self.connection_ip, service_ssl_socket = \
+                response_raw_bytes, error_message, self.connection_ip, service_ssl_socket = \
                     self.send_receive_to_service(request_raw_bytes)
 
                 # Adding the response to responses list. Same for error.
                 responses_list.append(response_raw_bytes)
-                errors_list.append(error_string)
+                errors_list.append(error_message)
 
                 self.logger.info(f"Response: {response_raw_bytes}")
-                self.logger.info(f"Error: {error_string}")
+                self.logger.info(f"Error: {error_message}")
 
                 # So if the socket was closed and there was an error we can break the loop.
                 # This is needed for more complex operations
@@ -359,7 +352,7 @@ class SocketClient:
             raise ValueError("If 'save_as_file' is True, then 'cert_file_path' must be provided.")
 
         # Connect and get the connected socket.
-        server_socket_for_certificate = self.service_connection()
+        server_socket_for_certificate, error_message = self.service_connection()
         # Get the DER byte certificate from the socket.
         certificate_from_socket_der_bytes = ssl_base.get_certificate_from_socket(server_socket_for_certificate)
         print_api('Fetched certificate from socket.', logger=self.logger, **kwargs)

{atomicshop-2.16.34.dist-info → atomicshop-2.16.36.dist-info}/METADATA

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

{atomicshop-2.16.34.dist-info → atomicshop-2.16.36.dist-info}/RECORD

@@ -1,4 +1,4 @@
-atomicshop/__init__.py,sha256=CBAptMUJXJVgtdUNjx4iw5nayaXCSZahEQHtGmfl1oM,124
+atomicshop/__init__.py,sha256=OeOIovtO11WvqryrnXL0p8647yTwRAMmL0vtoDpvg5A,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
@@ -48,9 +48,10 @@ atomicshop/web.py,sha256=DkpdUYiwRu_Du5J8LlUyxLj-NAEnDLfEwfVlSI22trM,11642
 atomicshop/a_installs/ubuntu/docker_rootless.py,sha256=9IPNtGZYjfy1_n6ZRt7gWz9KZgR6XCgevjqq02xk-o0,281
 atomicshop/a_installs/ubuntu/docker_sudo.py,sha256=JzayxeyKDtiuT4Icp2L2LyFRbx4wvpyN_bHLfZ-yX5E,281
 atomicshop/a_installs/ubuntu/elastic_search_and_kibana.py,sha256=yRB-l1zBxdiN6av-FwNkhcBlaeu4zrDPjQ0uPGgpK2I,244
-atomicshop/a_installs/ubuntu/pycharm.py,sha256=eFk_JDIzJJhxCuYFkjxOYHYMnZBC62Q9n5ZaFt4z9cs,132
+atomicshop/a_installs/ubuntu/mongodb.py,sha256=xuRJS1qqOZ0EZp7of5R3tTjSu6CwBIxYg8-NaM7othE,230
+atomicshop/a_installs/ubuntu/pycharm.py,sha256=Ld7YQBwPxrjuZcTG1K4kZqjbBdt8aooCVRa15u5FOmE,157
 atomicshop/a_installs/win/fibratus.py,sha256=TU4e9gdZ_zI73C40uueJ59pD3qmN-UFGdX5GFoVf6cM,179
-atomicshop/a_installs/win/mongodb.py,sha256=5k9sFWM_9Zh5ShutH2IhGvAo7nrLkOIeUPzhoKvEsx8,171
+atomicshop/a_installs/win/mongodb.py,sha256=AqyItXu19aaoe49pppDxtEkXey6PMy0PoT2Y_RmPpPE,179
 atomicshop/a_installs/win/pycharm.py,sha256=j_RSd7aDOyC3yDd-_GUTMLlQTmDrqtVFG--oUfGLiZk,140
 atomicshop/a_installs/win/wsl_ubuntu_lts.py,sha256=dZbPRLNKFeMd6MotjkE6UDY9cOiIaaclIdR1kGYWI50,139
 atomicshop/a_mains/dns_gateway_setting.py,sha256=ncc2rFQCChxlNP59UshwmTonLqC6MWblrVAzbbz-13M,149
@@ -89,7 +90,7 @@ atomicshop/basics/dicts.py,sha256=DeYHIh940pMMBrFhpXt4dsigFVYzTrlqWymNo4Pq_Js,14
 atomicshop/basics/dicts_nested.py,sha256=StYxYnYPa0SEJr1lmEwAv5zfERWWqoULeyG8e0zRAwE,4107
 atomicshop/basics/enumerations.py,sha256=41VVQYh_vnVapggxKg2IRU5e_EiMpZzX1n1mtxvoSzM,1364
 atomicshop/basics/enums.py,sha256=aAk1jFeQLvrC4NOpk9kgyX1-DCBr2ArPhZ8Ad7cMAVA,3537
-atomicshop/basics/exceptions.py,sha256=-1Gu8bHA3hrf11mmeaPuVE73jWV3EOyRgh2vSpWfveg,504
+atomicshop/basics/exceptions.py,sha256=8mhhdQloYVz8D3u16I5O_cMeuIf5pPTXoi1iY94O9zw,616
 atomicshop/basics/guids.py,sha256=iRx5n18ATZWhpo748BwEjuLWLsu9y3OwF5-Adp-Dtik,403
 atomicshop/basics/hexs.py,sha256=i8CTG-J0TGGa25yFSbWEvpVyHFnof_qSWUrmXY-ylKM,1054
 atomicshop/basics/if_else.py,sha256=MakivJChofZCpr0mOVjwCthzpiaBxXVB-zv7GwMOqVo,202
@@ -124,7 +125,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=ROAtbibSWSsF3BraUbhu-QO3MPIFqYY5KUKgsQbiSkk,7813
 atomicshop/mitm/config_toml_editor.py,sha256=2p1CMcktWRR_NW-SmyDwylu63ad5e0-w1QPMa8ZLDBw,1635
-atomicshop/mitm/connection_thread_worker.py,sha256=fybUBcZckgF7TC_P1z2yIYGH6ATX7jQEfsQSBuddt2s,16531
+atomicshop/mitm/connection_thread_worker.py,sha256=YdPL2E2ZYV5nnuaXXtyBZssT4qDalVb05BVO62MwW0k,16627
 atomicshop/mitm/import_config.py,sha256=ZKQXxbtjVqzN9fpRrMwPNQREecH06RG8F_nXZAKTUJM,8182
 atomicshop/mitm/initialize_engines.py,sha256=VyJE8QnzlgD3QbX5inz5o6rC3zQ3is9CeTL7-B10g1w,8292
 atomicshop/mitm/message.py,sha256=URR5JKSuAT8XmGIkyprEjlPW2GW4ef_gfUz_GgcFseE,2184
@@ -253,9 +254,10 @@ atomicshop/wrappers/loggingw/loggers.py,sha256=mmM__XR3W4QC82wbsDRG_M4_0JYGGEP0Q
 atomicshop/wrappers/loggingw/loggingw.py,sha256=uLY7DJS-3xIYQBRvI--9eFvdcnvsWSXmtJKS-gTRfjM,20863
 atomicshop/wrappers/loggingw/reading.py,sha256=sCNlgqLNH5XdKqOOjjEox7CvViMHzs6h7-hwCnx4NKk,17566
 atomicshop/wrappers/mongodbw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atomicshop/wrappers/mongodbw/install_mongodb.py,sha256=3ZPqrXxj3lC-PnAKGXclylLuOqsbyXYeUpb5iGjdeUU,6626
+atomicshop/wrappers/mongodbw/install_mongodb_ubuntu.py,sha256=pmI9AwWJ2cv5h8GionSpSJkllg6kfp0M381pk6y4Y5U,4015
+atomicshop/wrappers/mongodbw/install_mongodb_win.py,sha256=3ZPqrXxj3lC-PnAKGXclylLuOqsbyXYeUpb5iGjdeUU,6626
 atomicshop/wrappers/mongodbw/mongo_infra.py,sha256=IjEF0jPzQz866MpTm7rnksnyyWQeUT_B2h2DA9ryAio,2034
-atomicshop/wrappers/mongodbw/mongodbw.py,sha256=oM2pS-M0EI7HhewWY0ri_Ri9U5GOBo0CehPmo4Yas3o,32736
+atomicshop/wrappers/mongodbw/mongodbw.py,sha256=DlKiZaB__OIkWNQgQxKD569qrzm1l7m1TWKH2NTe8qs,44278
 atomicshop/wrappers/nodejsw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 atomicshop/wrappers/nodejsw/install_nodejs.py,sha256=TKGa3jSlSqZTL2NA0nMkWDFtlkz7rxGGn44ywCg7MN8,5228
 atomicshop/wrappers/playwrightw/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -301,17 +303,17 @@ atomicshop/wrappers/socketw/dns_server.py,sha256=VHV6s7vd0zqqW3dhE6li-260YRzmEB5
 atomicshop/wrappers/socketw/exception_wrapper.py,sha256=B-X5SHLSUIWToihH2MKnOB1F4A81_X0DpLLfnYKYbEc,7067
 atomicshop/wrappers/socketw/get_process.py,sha256=aJC-_qFUv3NgWCSUzDI72E4z8_-VTZE9NVZ0CwUoNlM,5698
 atomicshop/wrappers/socketw/receiver.py,sha256=XVvWOoeCo3vA0O5p19ryi-hcDIyx382WNG7WzMNVeYk,9322
-atomicshop/wrappers/socketw/sender.py,sha256=5HPrgTS2pA1g-jbG1TUtR7drHT1Z_8UevlRCTwW7dgY,5007
+atomicshop/wrappers/socketw/sender.py,sha256=vjgU1TaADJjaYiZOkLzfxcdCbmkvjhEhVjSV5mmIbw8,4969
 atomicshop/wrappers/socketw/sni.py,sha256=J1kPnQ77XwKN1pO5aOI1c_VfhuivCm95OOaQxMpPuZ0,17627
-atomicshop/wrappers/socketw/socket_client.py,sha256=XC-YaqA1wu0rvWQ9Q99DWLxcycKPkPc72pSnflzalfo,20320
+atomicshop/wrappers/socketw/socket_client.py,sha256=TduqAFBHvPWojMnj4q6--1bQyLZpv8os0vYJ1sBupRM,19855
 atomicshop/wrappers/socketw/socket_server_tester.py,sha256=Qobmh4XV8ZxLUaw-eW4ESKAbeSLecCKn2OWFzMhadk0,6420
 atomicshop/wrappers/socketw/socket_wrapper.py,sha256=WtylpezgIIBuz-A6PfM0hO1sm9Exd4j3qhDXcFc74-E,35567
 atomicshop/wrappers/socketw/ssl_base.py,sha256=kmiif84kMhBr5yjQW17p935sfjR5JKG0LxIwBA4iVvU,2275
 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.34.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
-atomicshop-2.16.34.dist-info/METADATA,sha256=BKW8IYDADJjg7d-7-exeW7BZT5mboP95IsNtRy7lom4,10473
-atomicshop-2.16.34.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-atomicshop-2.16.34.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
-atomicshop-2.16.34.dist-info/RECORD,,
+atomicshop-2.16.36.dist-info/LICENSE.txt,sha256=lLU7EYycfYcK2NR_1gfnhnRC8b8ccOTElACYplgZN88,1094
+atomicshop-2.16.36.dist-info/METADATA,sha256=7WSrbRJAwsJH5uWhqieDDjUdx-uUgxLcqKzfV3nFCDE,10473
+atomicshop-2.16.36.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+atomicshop-2.16.36.dist-info/top_level.txt,sha256=EgKJB-7xcrAPeqTRF2laD_Np2gNGYkJkd4OyXqpJphA,11
+atomicshop-2.16.36.dist-info/RECORD,,