midefos/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-11-05 18:38:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix websocket url in docker container.

Browse Source
This commit is contained in:
tecnovert
2024-10-18 15:08:20 +02:00
parent 1eca1b60ab
commit 5e71367c21
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
basicswap/bin/run.py
View File

@@ -312,6 +312,7 @@ def runClient(fp, data_dir, chain, start_only_coins):
swap_client.log.info(f'Starting ws server at {ws_url}.') swap_client.log.info(f'Starting ws server at {ws_url}.')
swap_client.ws_server = WebsocketServer(host=settings['wshost'], port=settings['wsport']) swap_client.ws_server = WebsocketServer(host=settings['wshost'], port=settings['wsport'])
swap_client.ws_server.client_port = settings.get('wsclientport', settings['wsport'])
swap_client.ws_server.set_fn_new_client(ws_new_client) swap_client.ws_server.set_fn_new_client(ws_new_client)
swap_client.ws_server.set_fn_client_left(ws_client_left) swap_client.ws_server.set_fn_client_left(ws_client_left)
swap_client.ws_server.set_fn_message_received(ws_message_received) swap_client.ws_server.set_fn_message_received(ws_message_received)

2
basicswap/http_server.py
View File

@@ -135,7 +135,7 @@ class HttpHandler(BaseHTTPRequestHandler):
def render_template(self, template, args_dict, status_code=200, version=__version__): def render_template(self, template, args_dict, status_code=200, version=__version__):
swap_client = self.server.swap_client swap_client = self.server.swap_client
if swap_client.ws_server: if swap_client.ws_server:
args_dict['ws_url'] = swap_client.ws_server.url args_dict['ws_port'] = swap_client.ws_server.client_port
if swap_client.debug: if swap_client.debug:
args_dict['debug_mode'] = True args_dict['debug_mode'] = True
if swap_client.debug_ui: if swap_client.debug_ui:

4
basicswap/templates/header.html
View File

@@ -611,7 +611,7 @@ document.addEventListener('DOMContentLoaded', function() {
<!-- mobile sidebar --> <!-- mobile sidebar -->
</section> </section>
{% if ws_url %} {% if ws_port %}
<script> <script>
// Configuration object // Configuration object
const notificationConfig = { const notificationConfig = {
@@ -620,7 +620,7 @@ const notificationConfig = {
showBidAccepted: true showBidAccepted: true
}; };
var ws = new WebSocket("{{ ws_url }}"), var ws = new WebSocket("ws://" + window.location.hostname + ":{{ ws_port }}"),
floating_div = document.createElement('div'); floating_div = document.createElement('div');
floating_div.classList.add('floatright'); floating_div.classList.add('floatright');
messages = document.createElement('ul'); messages = document.createElement('ul');