renamed onionr dir and bugfixes/linting progress

src/httpapi/directconnections/__init__.py

@@ -0,0 +1,69 @@
+'''
+    Onionr - Private P2P Communication
+
+    Misc client API endpoints too small to need their own file and that need access to the client api inst
+'''
+'''
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+'''
+import threading # For the client creation thread
+
+from flask import Response # For direct connection management HTTP endpoints
+from flask import Blueprint # To make the direct connection management blueprint in the webUI
+from flask import g # Mainly to access the shared toomanyobjs object
+import deadsimplekv
+
+import filepaths
+import onionrservices
+from onionrservices import pool
+
+def _get_communicator(g):
+    while True:
+        try:
+            return g.too_many.get_by_string("OnionrCommunicatorDaemon")
+        except KeyError:
+            pass
+
+class DirectConnectionManagement:
+    def __init__(self, client_api):
+        direct_conn_management_bp = Blueprint('direct_conn_management', __name__)
+        self.direct_conn_management_bp = direct_conn_management_bp
+
+        cache = deadsimplekv.DeadSimpleKV(filepaths.cached_storage)
+
+        @direct_conn_management_bp.route('/dc-client/isconnected/<pubkey>')
+        def is_connected(pubkey):
+            communicator = _get_communicator(g)
+            resp = ""
+            if pubkey in communicator.direct_connection_clients:
+                resp = communicator.direct_connection_clients[pubkey]
+            return Response(resp)
+        
+        @direct_conn_management_bp.route('/dc-client/connect/<pubkey>')
+        def make_new_connection(pubkey):
+            communicator = _get_communicator(g)
+            resp = "pending"
+            if pubkey in communicator.shared_state.get(pool.ServicePool).bootstrap_pending:
+                return Response(resp)
+                
+            if pubkey in communicator.direct_connection_clients:
+                resp = communicator.direct_connection_clients[pubkey]
+            else:
+                """Spawn a thread that will create the client and eventually add it to the
+                communicator.active_services 
+                """
+                threading.Thread(target=onionrservices.OnionrServices().create_client, 
+                                 args=[pubkey, communicator], daemon=True).start()
+
+            return Response(resp)