Merge remote-tracking branch 'origin/main'

TWB/asgi.py

@@ -22,10 +22,13 @@ os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'TWB.settings')
 
 application = ProtocolTypeRouter({
     'http': get_asgi_application(),
-    "websocket": QueryAuthMiddleware(
+    "websocket":
+        # AllowedHostsOriginValidator(
+            QueryAuthMiddleware(
                 URLRouter(
                     websocket_urlpatterns
                 )
+            # )
         ),
     # 'websocket': AuthMiddlewareStack(
     #     URLRouter(

static/js/chat_sockets.js

@@ -1,6 +1,7 @@
 
 
 function sendMessageSocket (data) {
+    if (chatSocket && chatSocket.readyState !== 0) {
         if (chatSocket.readyState !== 1 && chatSocket.readyState !== 0){
             init_ws()
         }
@@ -12,6 +13,9 @@ function sendMessageSocket (data) {
                 el_tab.querySelector(".last-message-messenger-user-tab").innerHTML = data['text']
             }
         }
+    } else {
+        alert('Websoket connection failed')
+    }
 }
 
 

templates/tb_base.html

@@ -28,7 +28,7 @@
         <script>
 
             {#var user_id = {{ user.id }}#}
-            ws_url = `ws://{% get_ws_address %}/ws/socket-server/?user_id={{ user.id }}`;
+            ws_url = `wss://{% get_ws_address %}/ws/socket-server/?user_id={{ user.id }}`;
             var chatSocket;
             init_ws()
             const beep = new Audio('/static/sounds/beep_2.mp3')