Update app/routers/alerts.py

app/routers/alerts.py

@@ -1,33 +1,74 @@
-from fastapi import APIRouter, WebSocket, WebSocketDisconnect
-
-from app.services.alert_hub import alert_hub
-
-router = APIRouter(prefix="/alerts", tags=["alerts"])
-
-
-@router.websocket("/ws/admin")
-async def ws_admin(websocket: WebSocket) -> None:
-    await alert_hub.connect_admin(websocket)
-    try:
-        while True:
-            message = await websocket.receive_text()
-            if message == "ping":
-                await websocket.send_text("pong")
-    except WebSocketDisconnect:
-        alert_hub.disconnect_admin(websocket)
-    except Exception:
-        alert_hub.disconnect_admin(websocket)
-
-
-@router.websocket("/ws/device/{device_id}")
-async def ws_device(websocket: WebSocket, device_id: str) -> None:
-    await alert_hub.connect_device(device_id, websocket)
-    try:
-        while True:
-            message = await websocket.receive_text()
-            if message == "ping":
-                await websocket.send_text("pong")
-    except WebSocketDisconnect:
-        alert_hub.disconnect_device(device_id, websocket)
-    except Exception:
-        alert_hub.disconnect_device(device_id, websocket)
+from datetime import datetime, timezone
+
+from fastapi import APIRouter, Depends, WebSocket, WebSocketDisconnect
+
+from app.core.auth import AuthUser, get_current_web_user
+from app.models.schemas import DeviceMessageRequest, DeviceMessageResponse
+from app.services.alert_hub import alert_hub
+
+router = APIRouter(prefix="/alerts", tags=["alerts"])
+
+
+@router.websocket("/ws/admin")
+async def ws_admin(websocket: WebSocket) -> None:
+    await alert_hub.connect_admin(websocket)
+    try:
+        while True:
+            message = await websocket.receive_text()
+            if message == "ping":
+                await websocket.send_text("pong")
+    except WebSocketDisconnect:
+        alert_hub.disconnect_admin(websocket)
+    except Exception:
+        alert_hub.disconnect_admin(websocket)
+
+
+@router.websocket("/ws/device/{device_id}")
+async def ws_device(websocket: WebSocket, device_id: str) -> None:
+    await alert_hub.connect_device(device_id, websocket)
+    try:
+        while True:
+            message = await websocket.receive_text()
+            if message == "ping":
+                await websocket.send_text("pong")
+    except WebSocketDisconnect:
+        alert_hub.disconnect_device(device_id, websocket)
+    except Exception:
+        alert_hub.disconnect_device(device_id, websocket)
+
+
+@router.post("/device-message", response_model=DeviceMessageResponse)
+async def send_device_message(
+    payload: DeviceMessageRequest,
+    user: AuthUser = Depends(get_current_web_user),
+) -> DeviceMessageResponse:
+    text = payload.message.strip()
+    if not text:
+        return DeviceMessageResponse(queued=False, delivered_clients=0)
+
+    delivered_clients = alert_hub.device_connection_count(payload.device_id)
+
+    await alert_hub.send_device(
+        payload.device_id,
+        {
+            "type": "admin_message",
+            "device_id": payload.device_id,
+            "message": text,
+            "sender": user.username,
+            "role": user.role,
+            "created_at": datetime.now(timezone.utc).isoformat(),
+        },
+    )
+
+    await alert_hub.broadcast_admin(
+        {
+            "type": "info",
+            "device_id": payload.device_id,
+            "message": f"{user.username} sent message to {payload.device_id}",
+        }
+    )
+
+    return DeviceMessageResponse(
+        queued=True,
+        delivered_clients=delivered_clients,
+    )