fix: Remove some unnecessary logs

.gitignore

@@ -13,4 +13,6 @@ plugins/signatures.json
 
 user_data/
 customPlugins/
-cache/
+cache/
+build/
+dist/

account.py

@@ -436,7 +436,6 @@ def send(account,address,amount):
 def isOwnDomain(account,name: str):
     domains = getDomains(account)
     for domain in domains:
-        print(domain)
         if domain['name'] == name:
             return True
     return False
@@ -1139,7 +1138,6 @@ def getxPub(account):
     
 
     try:
-        print(account_name)
         response = hsw.getAccountInfo(account_name,"default")
         if 'error' in response:
             return {

main.py

@@ -1,6 +1,7 @@
 import io
 import json
 import random
+import sys
 from flask import Flask, make_response, redirect, request, jsonify, render_template, send_from_directory,send_file
 import os
 import dotenv
@@ -55,7 +56,7 @@ def index():
     commit = info['commit']
     if commit != latestVersion(branch):
         print("New version available",flush=True)
-        plugins += render_template('components/dashboard-plugin.html', name='Update', output='New version available') 
+        plugins += render_template('components/dashboard-alert.html', name='Update', output='A new version of FireWallet is available') 
 
     return render_template("index.html", account=account, plugins=plugins)
  
@@ -550,7 +551,6 @@ def finalize(domain: str):
         return redirect("/logout")
     
     domain = domain.lower()
-    print(domain)
     response = account_module.finalize(request.cookies.get("account"),domain)
     if response['error'] != None:
         print(response)
@@ -569,7 +569,6 @@ def cancelTransfer(domain: str):
         return redirect("/logout")
     
     domain = domain.lower()
-    print(domain)
     response = account_module.cancelTransfer(request.cookies.get("account"),domain)
     if 'error' in response:
         if response['error'] != None:
@@ -884,7 +883,6 @@ def auction(domain):
             # Get TX
             revealInfo = account_module.getRevealTX(reveal)
             reveal['bid'] = revealInfo
-            print(revealInfo)
         bids = render.bids(bids,reveals)
 
 
@@ -946,7 +944,6 @@ def rescan_auction(domain):
     domain = domain.lower()
     
     response = account_module.rescan_auction(account,domain)
-    print(response)    
     return redirect("/auction/" + domain)
 
 @app.route('/auction/<domain>/bid')
@@ -1022,7 +1019,7 @@ def bid_confirm(domain):
     response = account_module.bid(request.cookies.get("account"),domain,
                                   float(bid),
                                   float(blind))
-    print(response)
+
     if 'error' in response:
         return redirect("/auction/" + domain + "?error=" + response['error']['message'])
     
@@ -1044,7 +1041,7 @@ def open_auction(domain):
     if 'error' in response:
         if response['error'] != None:
             return redirect("/auction/" + domain + "?error=" + response['error']['message'])
-    print(response)
+
     return redirect("/success?tx=" + response['hash'])
 
 @app.route('/auction/<domain>/reveal')
@@ -1474,7 +1471,6 @@ def plugin_function(ptype,plugin,function):
         return render_template("plugin-output.html", account=account,name=data['name'],
                                description=data['description'],output=response)
 
-
     else:
         return jsonify({"error": "Function not found"})
 
@@ -1609,4 +1605,8 @@ def page_not_found(e):
 #endregion
 
 if __name__ == '__main__':
-    app.run(debug=True,host='0.0.0.0')
+    # Check to see if --debug is in the command line arguments
+    if "--debug" in sys.argv:
+        app.run(debug=True,host='0.0.0.0')
+    else:
+        app.run(host='0.0.0.0')

plugin.py

@@ -6,12 +6,19 @@ import hashlib
 import subprocess
 
 
+def import_module(module_name):
+    if module_name in sys.modules:
+        return importlib.reload(sys.modules[module_name])
+    else:
+        return importlib.import_module(module_name)
+
+
 def listPlugins(update=False):
     plugins = []
     for file in os.listdir("plugins"):
         if file.endswith(".py"):
             if file != "main.py":
-                plugin = importlib.import_module("plugins."+file[:-3])
+                plugin = import_module("plugins."+file[:-3])
                 if "info" not in dir(plugin):
                     continue
                 details = plugin.info
@@ -42,7 +49,7 @@ def listPlugins(update=False):
         for file in os.listdir(f"customPlugins/{importPath}"):
             if file.endswith(".py"):
                 if file != "main.py":
-                    plugin = importlib.import_module(f"customPlugins.{importPath}."+file[:-3])
+                    plugin = import_module(f"customPlugins.{importPath}."+file[:-3])
                     if "info" not in dir(plugin):
                         continue
                     details = plugin.info
@@ -106,7 +113,7 @@ def hashPlugin(plugin: str):
 
 
 def getPluginData(pluginStr: str):
-    plugin = importlib.import_module(pluginStr.replace("/","."))
+    plugin = import_module(pluginStr.replace("/","."))
 
     # Check if the plugin is verified
     signatures = []
@@ -141,12 +148,12 @@ def getPluginData(pluginStr: str):
 
 
 def getPluginFunctions(plugin: str):
-    plugin = importlib.import_module(plugin.replace("/","."))
+    plugin = import_module(plugin.replace("/","."))
     return plugin.functions
 
 
 def runPluginFunction(plugin: str, function: str, params: dict, authentication: str):
-    plugin_module = importlib.import_module(plugin.replace("/","."))
+    plugin_module = import_module(plugin.replace("/","."))
     if function not in plugin_module.functions:
         return {"error": "Function not found"}
 
@@ -182,12 +189,12 @@ def runPluginFunction(plugin: str, function: str, params: dict, authentication:
 
 
 def getPluginFunctionInputs(plugin: str, function: str):
-    plugin = importlib.import_module(plugin.replace("/","."))
+    plugin = import_module(plugin.replace("/","."))
     return plugin.functions[function]["params"]
 
 
 def getPluginFunctionReturns(plugin: str, function: str):
-    plugin = importlib.import_module(plugin.replace("/","."))
+    plugin = import_module(plugin.replace("/","."))
     return plugin.functions[function]["returns"]
 
 

requirements.txt

@@ -8,4 +8,5 @@ cryptography
 requests-doh
 Flask-QRcode
 PySocks
-python-git-info
+python-git-info
+waitress

server.py

@@ -1,38 +1,44 @@
-from flask import Flask
-from main import app
-import main
-from gunicorn.app.base import BaseApplication
 import os
+import sys
+import platform
+from main import app
+from waitress import serve
 
 
-class GunicornApp(BaseApplication):
+threads = 4
-    def __init__(self, app, options=None):
-        self.options = options or {}
-        self.application = app
-        super().__init__()
 
-    def load_config(self):
+def gunicornServer():
-        for key, value in self.options.items():
+    from gunicorn.app.base import BaseApplication
-            if key in self.cfg.settings and value is not None:
+    class GunicornApp(BaseApplication):
-                self.cfg.set(key.lower(), value)
+        def __init__(self, app, options=None):
+            self.options = options or {}
+            self.application = app
+            super().__init__()
 
-    def load(self):
+        def load_config(self):
-        return self.application
+            for key, value in self.options.items():
+                if key in self.cfg.settings and value is not None:
+                    self.cfg.set(key.lower(), value)
 
-if __name__ == '__main__':
+        def load(self):
-    workers = 1
+            return self.application
-    threads = 2
-    if workers is None:
-        workers = 1
-    if threads is None:
-        threads = 2
-    workers = int(workers)
-    threads = int(threads)
     options = {
         'bind': '0.0.0.0:5000',
-        'workers': workers,
+        'workers': 2,
         'threads': threads,
     }
     gunicorn_app = GunicornApp(app, options)
-    print('Starting server with ' + str(workers) + ' workers and ' + str(threads) + ' threads', flush=True)
+    print(f'Starting server with Gunicorn on {platform.system()} with {threads} threads...', flush=True)
     gunicorn_app.run()
+    
+
+if __name__ == '__main__':    
+    # Check if --gunicorn is in the command line arguments
+    if "--gunicorn" in sys.argv:
+        gunicornServer()
+        sys.exit()
+
+    print(f'Starting server with Waitress on {platform.system()} with {threads} threads...', flush=True)
+    print(f'Press Ctrl+C to stop the server', flush=True)
+    print(f'Serving on http://0.0.0.0:5000/', flush=True)
+    serve(app, host="0.0.0.0", port=5000, threads=threads)

templates/components/dashboard-alert.html

@@ -0,0 +1,8 @@
+<div class="col-md-6 col-xl-3 mb-4">
+    <div class="card shadow border-start-warning py-2">
+        <div class="card-body">
+            <div class="text-uppercase fw-bold text-xs mb-1"><span style="color: var(--bs-dark);">{{name}}</span></div>
+            <div class="text-dark fw-bold h5 mb-0"><span>{{output | safe}}</span></div>
+        </div>
+    </div>
+</div>

templates/plugin-output.html

@@ -64,7 +64,7 @@
                 </nav>
                 <div class="container-fluid" style="margin-bottom: 20px;">
                     <h3 class="text-dark mb-1">{{name}}</h3>
-                    <h4 class="text-dark mb-1">{{description}}</h4>{{output|safe}}
+                    <h4 class="text-dark mb-1">{{description|safe}}</h4>{{output|safe}}
                 </div>
             </div>
             <footer class="sticky-footer" style="background: var(--bs-primary-text-emphasis);">