FastAPI-websocket, two channels

2025-09-30 13:28:58 +02:00
parent 5a14ab7be0
commit 26da9259ea
2 changed files with 70 additions and 61 deletions
--- a/server.py
+++ b/server.py
@@ -1,71 +1,50 @@
+import logging
+
 from fastapi import FastAPI, WebSocket, WebSocketDisconnect
 from fastapi.responses import HTMLResponse

+logging.basicConfig(
+    level=logging.DEBUG,  # Use DEBUG or INFO for dev
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+    datefmt="%Y-%m-%d %H:%M:%S",
+)
+logger = logging.getLogger(__name__)
 app = FastAPI()

-html = """
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Chat</title>
-    </head>
-    <body>
-        <h1>WebSocket Chat</h1>
-        <h2>Your ID: <span id="ws-id"></span></h2>
-        <form action="" onsubmit="sendMessage(event)">
-            <input type="text" id="messageText" autocomplete="off"/>
-            <button>Send</button>
-        </form>
-        <ul id='messages'>
-        </ul>
-        <script>
-            var client_id = Date.now()
-            document.querySelector("#ws-id").textContent = client_id;
-            var ws = new WebSocket(`ws://localhost:8000/ws/${client_id}`);
-            ws.onmessage = function(event) {
-                var messages = document.getElementById('messages')
-                var message = document.createElement('li')
-                var content = document.createTextNode(event.data)
-                message.appendChild(content)
-                messages.appendChild(message)
-            };
-            function sendMessage(event) {
-                var input = document.getElementById("messageText")
-                ws.send(input.value)
-                input.value = ''
-                event.preventDefault()
-            }
-        </script>
-    </body>
-</html>
-"""
-

 class ConnectionManager:
    def __init__(self):
        self.active_connections: list[WebSocket] = []
+        self.logger = logging.getLogger(self.__class__.__name__)

    async def connect(self, websocket: WebSocket):
        await websocket.accept()
+        self.logger.info("connect")
        self.active_connections.append(websocket)

    def disconnect(self, websocket: WebSocket):
+        self.logger.info("disconnect")
        self.active_connections.remove(websocket)

    async def send_personal_message(self, message: str, websocket: WebSocket):
-        await websocket.send_text(message)
+        self.logger.info("send_personal_message")
+        print(f"send_personal_message: {message}")
+        await websocket.send_text(f"personal: {message}")

    async def broadcast(self, message: str):
+        self.logger.info("broadcast")
        for connection in self.active_connections:
            await connection.send_text(message)


 manager = ConnectionManager()
-
+manager2 = ConnectionManager()

@app.get("/")
 async def get():
-    return HTMLResponse(html)
+    with open("html/index.html") as html_index:
+        html = html_index.read()
+        return HTMLResponse(html)


@app.websocket("/ws/{client_id}")
@@ -74,8 +53,22 @@ async def websocket_endpoint(websocket: WebSocket, client_id: int):
    try:
        while True:
            data = await websocket.receive_text()
+            logger.info(f"channel 1: {data}")
            await manager.send_personal_message(f"You wrote: {data}", websocket)
            await manager.broadcast(f"Client #{client_id} says: {data}")
    except WebSocketDisconnect:
        manager.disconnect(websocket)
        await manager.broadcast(f"Client #{client_id} left the chat")
+
+@app.websocket("/ws1/{client_id}")
+async def websocket_endpoint1(websocket: WebSocket, client_id: int):
+    await manager2.connect(websocket)
+    try:
+        while True:
+            data = await websocket.receive_text()
+            logger.info(f"channel 2: {data}")
+            await manager2.send_personal_message(f"You wrote: {data}", websocket)
+            await manager2.broadcast(f"Client #{client_id} says: {data}")
+    except WebSocketDisconnect:
+        manager2.disconnect(websocket)
+        await manager2.broadcast(f"Client #{client_id} left the chat")