Merge remote-tracking branch 'origin/main'

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

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')
     }
 }
 

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')