Fix imports and remove redundancy

Remove unused functions

Author: dormant-user

CHANGELOG

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+0.4.2 (05/01/2022)
+------------------
+- Fix imports and remove redundancy
+- Remove unused functions
+
 0.4.1 (01/19/2022)
 ------------------
 - Check for app running on port before initiating tunneling

docs/genindex.html

@@ -209,10 +209,6 @@ <h2 id="M">M</h2>
 
 <h2 id="P">P</h2>
 <table style="width: 100%" class="indextable genindextable"><tr>
-  <td style="width: 33%; vertical-align: top;"><ul>
-      <li><a href="index.html#helpers.auxiliary.prefix">prefix() (in module helpers.auxiliary)</a>
-</li>
-  </ul></td>
   <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="index.html#helpers.server.print_warning">print_warning() (in module helpers.server)</a>
 </li>

docs/index.html

@@ -452,23 +452,6 @@ <h1>Welcome to Expose’s documentation!<a class="headerlink" href="#welcome-to-
 </dl>
 </dd></dl>
 
-<dl class="py function">
-<dt class="sig sig-object py" id="helpers.auxiliary.prefix">
-<span class="sig-prename descclassname"><span class="pre">helpers.auxiliary.</span></span><span class="sig-name descname"><span class="pre">prefix</span></span><span class="sig-paren">(</span><em class="sig-param"><span class="n"><span class="pre">level</span></span><span class="p"><span class="pre">:</span></span><span class="w"> </span><span class="n"><span class="pre">str</span></span><span class="w"> </span><span class="o"><span class="pre">=</span></span><span class="w"> </span><span class="default_value"><span class="pre">'DEBUG'</span></span></em><span class="sig-paren">)</span> <span class="sig-return"><span class="sig-return-icon">&#x2192;</span> <span class="sig-return-typehint"><span class="pre">str</span></span></span><a class="headerlink" href="#helpers.auxiliary.prefix" title="Permalink to this definition">¶</a></dt>
-<dd><p>Replicates the logging config to print colored statements accordingly.</p>
-<dl class="field-list simple">
-<dt class="field-odd">Parameters</dt>
-<dd class="field-odd"><p><strong>level</strong> – Takes the log level as an argument.</p>
-</dd>
-<dt class="field-even">Returns</dt>
-<dd class="field-even"><p>A well formatted prefix to be added before a print statement.</p>
-</dd>
-<dt class="field-odd">Return type</dt>
-<dd class="field-odd"><p>str</p>
-</dd>
-</dl>
-</dd></dl>
-
 </section>
 <section id="module-helpers.cert">
 <span id="expose-certificates"></span><h1>Expose - Certificates<a class="headerlink" href="#module-helpers.cert" title="Permalink to this headline">¶</a></h1>

docs/objects.inv

@@ -1,8 +1,6 @@
 import json
 import sys
-from datetime import datetime
-from inspect import currentframe, getframeinfo, getouterframes, stack
-from time import sleep
+import time
 from urllib.request import urlopen
 
 DATETIME_FORMAT = '%b-%d-%Y %I:%M:%S %p'
@@ -15,10 +13,10 @@ def sleeper(sleep_time: int) -> None:
     Args:
         sleep_time: Takes the time script has to sleep, as an argument.
     """
-    sleep(1)
+    time.sleep(1)
     for i in range(sleep_time):
         sys.stdout.write(f'\rRemaining: {sleep_time - i:0{len(str(sleep_time))}}s')
-        sleep(1)
+        time.sleep(1)
     sys.stdout.flush()
     sys.stdout.write('\r')
 
@@ -47,18 +45,3 @@ def time_converter(seconds: float) -> str:
         return f'{minutes} minutes, and {seconds} seconds'
     elif seconds:
         return f'{seconds} seconds'
-
-
-def prefix(level: str = 'DEBUG') -> str:
-    """Replicates the logging config to print colored statements accordingly.
-
-    Args:
-        level: Takes the log level as an argument.
-
-    Returns:
-        str:
-        A well formatted prefix to be added before a print statement.
-    """
-    calling_file = getouterframes(currentframe(), 2)[1][1].split('/')[-1].rstrip('.py')
-    return f"{datetime.now().strftime(DATETIME_FORMAT)} - {level} - [{calling_file}:" \
-           f"{getframeinfo(stack()[1][0]).lineno}] - {stack()[1].function} - "

docs/searchindex.js

@@ -1,15 +1,7 @@
-import logging
-
 import boto3
 from botocore.exceptions import ClientError
 
-LOGGER = logging.getLogger(__name__)
-handler = logging.StreamHandler()
-formatter = logging.Formatter(fmt='%(asctime)s - %(levelname)s - [%(module)s:%(lineno)d] - %(funcName)s - %(message)s',
-                              datefmt='%b-%d-%Y %I:%M:%S %p')
-handler.setFormatter(fmt=formatter)
-LOGGER.addHandler(hdlr=handler)
-LOGGER.setLevel(level=logging.DEBUG)
+from expose.helpers.logger import LOGGER
 
 client = boto3.client('route53')
 

expose/helpers/auxiliary.py

@@ -128,7 +128,7 @@ def _handler(self, channel: Channel, port: int) -> None:
             if socket_ in read:
                 if not (data := socket_.recv(1024)):
                     break
-                channel.send(data)
+                channel.send(data.decode(encoding='UTF-8'))
             if channel in read:
                 if not (data := channel.recv(1024)):
                     break
@@ -163,7 +163,6 @@ def initiate_tunnel(self, port: int) -> None:
                 Thread(target=self._handler, args=[channel, port], daemon=True).start()
         except KeyboardInterrupt:
             LOGGER.info("Tunneling interrupted")
-        LOGGER.info(f"Stopping reverse tunneling on {join(transport.getpeername())}")
         if host_keys := self.ssh_client.get_host_keys().keys():
             LOGGER.info(f"Closing SSH connection on {host_keys[0]}")
         else: