diff --git a/TWB/asgi.py b/TWB/asgi.py index ad656f2..2ebf5eb 100644 --- a/TWB/asgi.py +++ b/TWB/asgi.py @@ -22,11 +22,14 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TWB.settings') application = ProtocolTypeRouter({ 'http': get_asgi_application(), - "websocket": QueryAuthMiddleware( - URLRouter( - websocket_urlpatterns - ) - ), + "websocket": + # AllowedHostsOriginValidator( + QueryAuthMiddleware( + URLRouter( + websocket_urlpatterns + ) + # ) + ), # 'websocket': AuthMiddlewareStack( # URLRouter( # websocket_urlpatterns diff --git a/static/js/chat_sockets.js b/static/js/chat_sockets.js index e495418..8d78f19 100644 --- a/static/js/chat_sockets.js +++ b/static/js/chat_sockets.js @@ -1,16 +1,20 @@ function sendMessageSocket (data) { - if (chatSocket.readyState !== 1 && chatSocket.readyState !== 0){ - init_ws() - } - loader_show_message(data) - chatSocket.send(JSON.stringify(data)); - if (!data.ticket_id){ - let el_tab = document.querySelector(".tab_user_messanger.select") - if (el_tab !== null){ - el_tab.querySelector(".last-message-messenger-user-tab").innerHTML = data['text'] + if (chatSocket && chatSocket.readyState !== 0) { + if (chatSocket.readyState !== 1 && chatSocket.readyState !== 0){ + init_ws() } + loader_show_message(data) + chatSocket.send(JSON.stringify(data)); + if (!data.ticket_id){ + let el_tab = document.querySelector(".tab_user_messanger.select") + if (el_tab !== null){ + el_tab.querySelector(".last-message-messenger-user-tab").innerHTML = data['text'] + } + } + } else { + alert('Websoket connection failed') } } diff --git a/templates/tb_base.html b/templates/tb_base.html index bfba730..dbceb29 100644 --- a/templates/tb_base.html +++ b/templates/tb_base.html @@ -28,7 +28,7 @@