diff --git a/.gitignore b/.gitignore index 5789dc0..590c6aa 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,6 @@ plugins/signatures.json user_data/ customPlugins/ -cache/ \ No newline at end of file +cache/ +build/ +dist/ diff --git a/FireWalletBrowser.bsdesign b/FireWalletBrowser.bsdesign index aab40d8..088fe6f 100644 Binary files a/FireWalletBrowser.bsdesign and b/FireWalletBrowser.bsdesign differ diff --git a/account.py b/account.py index f31c2e8..8d1e484 100644 --- a/account.py +++ b/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 { diff --git a/main.py b/main.py index cb76ed2..0d70baf 100644 --- a/main.py +++ b/main.py @@ -551,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) @@ -570,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: @@ -885,7 +883,6 @@ def auction(domain): # Get TX revealInfo = account_module.getRevealTX(reveal) reveal['bid'] = revealInfo - print(revealInfo) bids = render.bids(bids,reveals) @@ -947,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//bid') @@ -1023,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']) @@ -1045,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//reveal') @@ -1112,8 +1108,7 @@ def settings(): # import to time from format "2024-02-13 11:24:03" last_commit = datetime.datetime.strptime(last_commit, "%Y-%m-%d %H:%M:%S") version = f'{last_commit.strftime("%y-%m-%d")} {branch}' - - if info['commit'] != latestVersion(branch): + if info['commit'] != latestVersion(info['refs']): version += ' (New version available)' return render_template("settings.html", account=account, hsd_version=account_module.hsdVersion(False), @@ -1220,8 +1215,7 @@ def login_post(): if account.count(":") > 0: wallets = account_module.listWallets() wallets = render.wallets(wallets) - return render_template("login.html", - + return render_template("login.html", error="Invalid account",wallets=wallets) account = account + ":" + password diff --git a/requirements.txt b/requirements.txt index ef58b6f..af7ac34 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,5 @@ cryptography requests-doh Flask-QRcode PySocks -python-git-info \ No newline at end of file +python-git-info +waitress \ No newline at end of file diff --git a/server.py b/server.py index adc7f1a..b49ab0e 100644 --- a/server.py +++ b/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): - def __init__(self, app, options=None): - self.options = options or {} - self.application = app - super().__init__() +threads = 4 - def load_config(self): - for key, value in self.options.items(): - if key in self.cfg.settings and value is not None: - self.cfg.set(key.lower(), value) +def gunicornServer(): + from gunicorn.app.base import BaseApplication + class GunicornApp(BaseApplication): + def __init__(self, app, options=None): + self.options = options or {} + self.application = app + super().__init__() - def load(self): - return self.application + def load_config(self): + 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__': - workers = 1 - threads = 2 - if workers is None: - workers = 1 - if threads is None: - threads = 2 - workers = int(workers) - threads = int(threads) + def load(self): + return self.application 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) diff --git a/templates/assets/js/script.min.js b/templates/assets/js/script.min.js index 2400d9d..2294f33 100644 --- a/templates/assets/js/script.min.js +++ b/templates/assets/js/script.min.js @@ -1 +1 @@ -async function request(e){try{const t=await fetch(`/api/v1/${e}`);if(!t.ok)throw new Error(`HTTP error! Status: ${t.status}`);const n=await t.json();return void 0!==n.error?`Error: ${n.error}`:n.result}catch(e){return console.error("Request failed:",e),"Error"}}function sortTable(e,t=!1){const n=document.getElementById("data-table"),a=n.querySelector("tbody"),l=Array.from(a.querySelectorAll("tr")),r=n.querySelectorAll("th");let o=n.getAttribute("data-sort-order")||"asc",d=n.getAttribute("data-sort-column")||"-1";o=t||d!=e?"asc":"asc"===o?"desc":"asc",n.setAttribute("data-sort-order",o),n.setAttribute("data-sort-column",e),l.sort(((t,n)=>{let a=t.cells[e].innerText.trim(),l=n.cells[e].innerText.trim(),r=parseFloat(a.replace(/[^0-9.,]/g,"").replace(/,/g,"")),d=parseFloat(l.replace(/[^0-9.,]/g,"").replace(/,/g,""));return isNaN(r)||isNaN(d)?"asc"===o?a.localeCompare(l):l.localeCompare(a):"asc"===o?r-d:d-r})),a.innerHTML="",l.forEach((e=>a.appendChild(e))),updateSortIndicators(r,e,o)}function updateSortIndicators(e,t,n){e.forEach(((e,a)=>{let l=e.querySelector(".sort-indicator");l.innerHTML=a===t?"asc"===n?" ▲":" ▼":""}))}window.addEventListener("load",(async()=>{const e=["hsd-sync","hsd-version","hsd-height","wallet-sync","wallet-available","wallet-total","wallet-locked","wallet-pending","wallet-domainCount","wallet-bidCount","wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"],t=["wallet-available","wallet-total","wallet-locked"],n=["wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"];for(const a of e){const e=document.getElementById(a);if(e){const l=a.replace(/-/g,"/");let r=await request(l);n.includes(a)&&"Error"!=r&&(r=r.length),t.includes(a)&&(r=Number(r).toFixed(2)),r=r.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=r}}})),document.addEventListener("DOMContentLoaded",(function(){fetch("/api/v1/wallet/domains").then((e=>e.json())).then((e=>{const t=document.querySelector("#data-table tbody");t&&(t.innerHTML="",e.result.forEach((e=>{const n=document.createElement("tr"),a=document.createElement("td");a.textContent=e.name,n.appendChild(a);var l="Unknown";"stats"in e&&"daysUntilExpire"in e.stats&&(l=e.stats.daysUntilExpire);const r=document.createElement("td");r.textContent=`${l} days`,n.appendChild(r);const o=document.createElement("td");o.textContent=`${(e.value/1e6).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g,",")} HNS`,n.appendChild(o);const d=document.createElement("td");d.innerHTML=e.registered?"Manage":"Register",n.appendChild(d),t.appendChild(n)})),sortTable(0,!0))})).catch((e=>console.error("Error fetching data:",e)))})),setInterval((async function(){const e=["hsd-sync","hsd-height","wallet-sync","wallet-pending","wallet-available","wallet-total"];for(const t of e){const e=document.getElementById(t);if(e){const n=t.replace(/-/g,"/");let a=await request(n);["wallet-available","wallet-total"].includes(t)&&(a=Number(a).toFixed(2)),a=a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=a}}}),2e4),function(){"use strict";var e=document.querySelector(".sidebar"),t=document.querySelectorAll("#sidebarToggle, #sidebarToggleTop");if(e){e.querySelector(".collapse");var n=[].slice.call(document.querySelectorAll(".sidebar .collapse")).map((function(e){return new bootstrap.Collapse(e,{toggle:!1})}));for(var a of t)a.addEventListener("click",(function(t){if(document.body.classList.toggle("sidebar-toggled"),e.classList.toggle("toggled"),e.classList.contains("toggled"))for(var a of n)a.hide()}));window.addEventListener("resize",(function(){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)<768)for(var e of n)e.hide()}))}var l=document.querySelector("body.fixed-nav .sidebar");l&&l.on("mousewheel DOMMouseScroll wheel",(function(e){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)>768){var t=e.originalEvent,n=t.wheelDelta||-t.detail;this.scrollTop+=30*(n<0?1:-1),e.preventDefault()}}));var r=document.querySelector(".scroll-to-top");r&&window.addEventListener("scroll",(function(){var e=window.pageYOffset;r.style.display=e>100?"block":"none"}))}(); \ No newline at end of file +async function request(e){try{const t=await fetch(`/api/v1/${e}`);if(!t.ok)throw new Error(`HTTP error! Status: ${t.status}`);const n=await t.json();return void 0!==n.error?`Error: ${n.error}`:n.result}catch(e){return console.error("Request failed:",e),"Error"}}function sortTable(e,t=!1){const n=document.getElementById("data-table"),a=n.querySelector("tbody"),l=Array.from(a.querySelectorAll("tr")),r=n.querySelectorAll("th");let o=n.getAttribute("data-sort-order")||"asc",i=n.getAttribute("data-sort-column")||"-1";o=t||i!=e?"asc":"asc"===o?"desc":"asc",n.setAttribute("data-sort-order",o),n.setAttribute("data-sort-column",e);const c=determineColumnDataType(l,e);l.sort(((t,n)=>{let a=t.cells[e].innerText.trim(),l=n.cells[e].innerText.trim();if("number"===c){let e=parseFloat(a.replace(/[^0-9.,]/g,"").replace(/,/g,"")),t=parseFloat(l.replace(/[^0-9.,]/g,"").replace(/,/g,""));return"asc"===o?e-t:t-e}if("date"===c){let e=new Date(a),t=new Date(l);return"asc"===o?e-t:t-e}return"asc"===o?a.localeCompare(l,void 0,{sensitivity:"base"}):l.localeCompare(a,void 0,{sensitivity:"base"})})),a.innerHTML="",l.forEach((e=>a.appendChild(e))),updateSortIndicators(r,e,o)}function determineColumnDataType(e,t){const n=Math.min(5,e.length);let a=0,l=0;for(let r=0;r=e.length);r++){const n=e[r].cells[t].innerText.trim(),o=parseFloat(n.replace(/[^0-9.,]/g,"").replace(/,/g,""));if(!isNaN(o)&&n.replace(/[^0-9.,\s$%]/g,"").length===n.length){a++;continue}const i=new Date(n);isNaN(i)||"Invalid Date"===i.toString()||l++}return a>=n/2?"number":l>=n/2?"date":"text"}function updateSortIndicators(e,t,n){e.forEach(((e,a)=>{let l=e.querySelector(".sort-indicator");l.innerHTML=a===t?"asc"===n?" ▲":" ▼":""}))}window.addEventListener("load",(async()=>{const e=["hsd-sync","hsd-version","hsd-height","wallet-sync","wallet-available","wallet-total","wallet-locked","wallet-pending","wallet-domainCount","wallet-bidCount","wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"],t=["wallet-available","wallet-total","wallet-locked"],n=["wallet-pendingReveal","wallet-pendingRegister","wallet-pendingRedeem"];for(const a of e){const e=document.getElementById(a);if(e){const l=a.replace(/-/g,"/");let r=await request(l);n.includes(a)&&"Error"!=r&&(r=r.length),t.includes(a)&&(r=Number(r).toFixed(2)),r=r.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=r}}})),document.addEventListener("DOMContentLoaded",(function(){fetch("/api/v1/wallet/domains").then((e=>e.json())).then((e=>{const t=document.querySelector("#data-table tbody");t&&(t.innerHTML="",e.result.forEach((e=>{const n=document.createElement("tr"),a=document.createElement("td");a.textContent=e.name,n.appendChild(a);var l="Unknown";"stats"in e&&"daysUntilExpire"in e.stats&&(l=e.stats.daysUntilExpire);const r=document.createElement("td");r.textContent=`${l} days`,n.appendChild(r);const o=document.createElement("td");o.textContent=`${(e.value/1e6).toFixed(2).replace(/\B(?=(\d{3})+(?!\d))/g,",")} HNS`,n.appendChild(o);const i=document.createElement("td");i.innerHTML=e.registered?"Manage":"Register",n.appendChild(i),t.appendChild(n)})),sortTable(0,!0))})).catch((e=>console.error("Error fetching data:",e)))})),setInterval((async function(){const e=["hsd-sync","hsd-height","wallet-sync","wallet-pending","wallet-available","wallet-total"];for(const t of e){const e=document.getElementById(t);if(e){const n=t.replace(/-/g,"/");let a=await request(n);["wallet-available","wallet-total"].includes(t)&&(a=Number(a).toFixed(2)),a=a.toString().replace(/\B(?=(\d{3})+(?!\d))/g,","),e.innerHTML=a}}}),2e4),function(){"use strict";var e=document.querySelector(".sidebar"),t=document.querySelectorAll("#sidebarToggle, #sidebarToggleTop");if(e){e.querySelector(".collapse");var n=[].slice.call(document.querySelectorAll(".sidebar .collapse")).map((function(e){return new bootstrap.Collapse(e,{toggle:!1})}));for(var a of t)a.addEventListener("click",(function(t){if(document.body.classList.toggle("sidebar-toggled"),e.classList.toggle("toggled"),e.classList.contains("toggled"))for(var a of n)a.hide()}));window.addEventListener("resize",(function(){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)<768)for(var e of n)e.hide()}))}var l=document.querySelector("body.fixed-nav .sidebar");l&&l.on("mousewheel DOMMouseScroll wheel",(function(e){if(Math.max(document.documentElement.clientWidth||0,window.innerWidth||0)>768){var t=e.originalEvent,n=t.wheelDelta||-t.detail;this.scrollTop+=30*(n<0?1:-1),e.preventDefault()}}));var r=document.querySelector(".scroll-to-top");r&&window.addEventListener("scroll",(function(){var e=window.pageYOffset;r.style.display=e>100?"block":"none"}))}(); \ No newline at end of file diff --git a/templates/manage.html b/templates/manage.html index c29521f..f00c25a 100644 --- a/templates/manage.html +++ b/templates/manage.html @@ -74,7 +74,8 @@
-

DNS

Edit
+

DNS

+
diff --git a/templates/plugin-output.html b/templates/plugin-output.html index d968fd6..09d2684 100644 --- a/templates/plugin-output.html +++ b/templates/plugin-output.html @@ -64,7 +64,7 @@

{{name}}

-

{{description}}

{{output|safe}} +

{{description|safe}}

{{output|safe}}