Mettre à jour WebSocketManager pour implémenter une structure de message améliorée, gérer les pings/pongs, et ajouter des ajustements de configuration pour les connexions WebSocket.

core/manager/websocket_manager.py

@@ -34,8 +34,9 @@ class WebSocketManager:
         await self._send(
             websocket,
             {
-                "type": "connection_established",
                 "session_id": session_id,
+                "type": "connection_established",
+                "title": "Connexion réussie",
                 "message": "Connexion au service de notifications établie",
                 "timestamp": current_utc_iso(),
             },
@@ -52,7 +53,7 @@ class WebSocketManager:
             self.logger.info(f"Connexion fermée: {session_id}")
 
     async def send_personal_message(
-        self, session_id: str, payload: Dict[str, Any]
+            self, session_id: str, payload: Dict[str, Any]
     ) -> None:
         """Envoie un message à un client spécifique"""
         if ws := self.active_connections.get(session_id):
@@ -152,8 +153,8 @@ class WebSocketManager:
             "timestamp": current_utc_iso(),
         }
 
-    # Méthodes internes
-    async def _send(self, websocket: WebSocket, payload: Dict[str, Any]) -> None:
+    @staticmethod
+    async def _send(websocket: WebSocket, payload: Dict[str, Any]) -> None:
         """Mécanisme d'envoi générique"""
         await websocket.send_json(payload)
 
@@ -164,9 +165,9 @@ class WebSocketManager:
 
     @staticmethod
     def _should_receive(
-        subscriptions: List[Subscription],
-        notification: Notification,
-        client: ClientInfo,
+            subscriptions: List[Subscription],
+            notification: Notification,
+            client: ClientInfo,
     ) -> bool:
         """Vérifie si un client doit recevoir une notification"""
         return any(

main.py

@@ -13,6 +13,7 @@ from fastapi import (
     Depends,
 )
 from fastapi.templating import Jinja2Templates
+from starlette.responses import HTMLResponse
 
 from core.manager.websocket_manager import WebSocketManager
 from core.settings.settings import Settings
@@ -61,6 +62,8 @@ app = FastAPI(
     lifespan=lifespan,
     docs_url="/docs",
     redoc_url="/redoc",
+    websocket_ping_interval=20,
+    websocket_timeout=60,
 )
 
 
@@ -83,16 +86,11 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
         session_id = await manager.connect(websocket, client_info)
 
         while True:
-            data = await websocket.receive_json()
-
-            await manager.send_personal_message(
-                session_id,
-                {
-                    "type": "message_ack",
-                    "message": f"Message reçu: {data}",
-                    "timestamp": current_utc_iso(),
-                },
-            )
+            message = await websocket.receive_text()
+            if message == "ping":
+                await websocket.send_text("pong")
+            else:
+                pass
 
     except WebSocketDisconnect:
         manager.disconnect(session_id)
@@ -103,24 +101,24 @@ async def websocket_endpoint(websocket: WebSocket, user_id: str):
 
 
 # Endpoints REST
-@app.get("/")
+@app.get("/", response_class=HTMLResponse)
 async def root(request: Request):
-    # """Page de test pour les connexions WebSocket"""
-    # return templates.TemplateResponse(
-    #     "dashboard.html",
-    #     {"request": request, "current_time": datetime.now()},
-    # )
-    return manager.get_stats()
+    """Page de test pour les connexions WebSocket"""
+    return templates.TemplateResponse(
+        "dashboard.html",
+        {"request": request, "current_time": current_utc_iso()},
+    )
 
 
 @app.post("/subscriptions/{session_id}")
 async def add_subscription(
-    session_id: str = Depends(validate_session),
-    subscription_request: Optional[SubscriptionRequest] = None,
+        session_id: str = Depends(validate_session),
+        subscription_request: Optional[SubscriptionRequest] = None,
 ):
     """Ajoute un nouvel abonnement pour une session"""
 
-    subscription =  Subscription(**subscription_request.model_dump()) if subscription_request else Subscription(type="default", target="default")
+    subscription = Subscription(**subscription_request.model_dump()) if subscription_request else Subscription(
+        type="default", target="default")
 
     if not manager.add_subscription(session_id, subscription):
         raise HTTPException(status_code=400, detail="Échec de l'ajout de l'abonnement")
@@ -133,8 +131,8 @@ async def add_subscription(
 
 @app.delete("/subscriptions/{session_id}/{subscription_id}")
 async def remove_subscription(
-    subscription_id: str,
-    session_id: str = Depends(validate_session),
+        subscription_id: str,
+        session_id: str = Depends(validate_session),
 ):
     """Supprime un abonnement existant"""
     if not manager.remove_subscription(session_id, subscription_id):
@@ -151,7 +149,7 @@ async def get_subscriptions(session_id: str = Depends(validate_session)):
 
 @app.post("/notifications/user/{user_id}")
 async def send_user_notification(
-    user_id: str, notification_request: NotificationRequest
+        user_id: str, notification_request: NotificationRequest
 ):
     """Envoie une notification à un utilisateur spécifique"""
     notification = Notification(**notification_request.model_dump())